diff --git a/app/model/product.go b/app/model/product.go
index eb63f68..3c8faae 100644
--- a/app/model/product.go
+++ b/app/model/product.go
@@ -82,18 +82,27 @@ type ProductFilters struct {
 }
 
 type ScannedCategory struct {
-	CategoryID uint   `gorm:"column:ID;primaryKey"`
-	Name       string `gorm:"column:name"`
-	Active     uint   `gorm:"column:active"`
-	Position   uint   `gorm:"column:position"`
-	ParentID   uint   `gorm:"column:id_parent"`
-	IsRoot     uint   `gorm:"column:is_root_category"`
+	CategoryID  uint   `gorm:"column:ID;primaryKey"`
+	Name        string `gorm:"column:name"`
+	Active      uint   `gorm:"column:active"`
+	Position    uint   `gorm:"column:position"`
+	ParentID    uint   `gorm:"column:id_parent"`
+	IsRoot      uint   `gorm:"column:is_root_category"`
+	LinkRewrite string `gorm:"column:link_rewrite"`
+	IsoCode     string `gorm:"column:iso_code"`
 }
 type Category struct {
-	CategoryID    uint       `json:"category_id" form:"category_id"`
-	Name          string     `json:"name" form:"name"`
-	Active        uint       `json:"active" form:"active"`
-	Subcategories []Category `json:"subcategories" form:"subcategories"`
+	CategoryID uint   `json:"category_id" form:"category_id"`
+	Label      string `json:"label" form:"label"`
+	// Active     bool           `json:"active" form:"active"`
+	Params   CategpryParams `json:"params" form:"params"`
+	Children []Category     `json:"children" form:"children"`
+}
+
+type CategpryParams struct {
+	CategoryID  uint   `json:"category_id" form:"category_id"`
+	LinkRewrite string `json:"link_rewrite" form:"link_rewrite"`
+	Locale      string `json:"locale" form:"locale"`
 }
 
 type FeatVal = map[uint][]uint
diff --git a/app/repos/categoriesRepo/categoriesRepo.go b/app/repos/categoriesRepo/categoriesRepo.go
index 1713441..1556f59 100644
--- a/app/repos/categoriesRepo/categoriesRepo.go
+++ b/app/repos/categoriesRepo/categoriesRepo.go
@@ -26,15 +26,14 @@ func (repo *CategoriesRepo) GetAllCategories(id_lang uint) ([]model.ScannedCateg
 			ps_category.active AS active,
 			ps_category_shop.position AS position,
 			ps_category.id_parent AS id_parent,
-			ps_category.is_root_category AS is_root_category
+			ps_category.is_root_category AS is_root_category,
+			ps_category_lang.link_rewrite AS link_rewrite,
+			ps_lang.iso_code AS iso_code
 		FROM ps_category
-		LEFT JOIN ps_category_lang
-			ON ps_category_lang.id_category = ps_category.id_category
-			AND ps_category_lang.id_shop = ?
-			AND ps_category_lang.id_lang = ?
-		LEFT JOIN ps_category_shop
-			ON ps_category_shop.id_category = ps_category.id_category
-			AND ps_category_shop.id_shop = ?`,
+		LEFT JOIN ps_category_lang ON ps_category_lang.id_category = ps_category.id_category AND ps_category_lang.id_shop = ? AND ps_category_lang.id_lang = ?
+		LEFT JOIN ps_category_shop ON ps_category_shop.id_category = ps_category.id_category AND ps_category_shop.id_shop = ?
+		JOIN ps_lang ON ps_lang.id_lang = ps_category_lang.id_lang 
+		`,
 		constdata.SHOP_ID, id_lang, constdata.SHOP_ID).
 		Scan(&allCategories).Error
 
diff --git a/app/service/menuService/menuService.go b/app/service/menuService/menuService.go
index 13a6a89..1244075 100644
--- a/app/service/menuService/menuService.go
+++ b/app/service/menuService/menuService.go
@@ -64,7 +64,7 @@ func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCate
 	node := s.scannedToNormalCategory((*all_categories)[index])
 
 	for i := 0; i < len((*children_indices)[index]); i++ {
-		node.Subcategories = append(node.Subcategories, s.createTree((*children_indices)[index][i].Index, all_categories, children_indices))
+		node.Children = append(node.Children, s.createTree((*children_indices)[index][i].Index, all_categories, children_indices))
 	}
 
 	return node
@@ -72,10 +72,12 @@ func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCate
 
 func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) model.Category {
 	var normal model.Category
-	normal.Active = scanned.Active
+	// normal.Active = scanned.Active
 	normal.CategoryID = scanned.CategoryID
-	normal.Name = scanned.Name
-	normal.Subcategories = []model.Category{}
+	normal.Label = scanned.Name
+	// normal.Active = scanned.Active == 1
+	normal.Params = model.CategpryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
+	normal.Children = []model.Category{}
 	return normal
 }
 
diff --git a/bo/components.d.ts b/bo/components.d.ts
index 622aa17..3425316 100644
--- a/bo/components.d.ts
+++ b/bo/components.d.ts
@@ -41,6 +41,7 @@ declare module 'vue' {
     UInput: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Input.vue')['default']
     UInputNumber: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/InputNumber.vue')['default']
     UModal: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Modal.vue')['default']
+    UNavigationMenu: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/NavigationMenu.vue')['default']
     UPagination: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Pagination.vue')['default']
     USelect: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Select.vue')['default']
     USelectMenu: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/SelectMenu.vue')['default']
diff --git a/bo/src/layouts/default.vue b/bo/src/layouts/default.vue
index 1e86a0a..9f19d9e 100644
--- a/bo/src/layouts/default.vue
+++ b/bo/src/layouts/default.vue
@@ -1,14 +1,56 @@
 <script setup lang="ts">
 import TopBar from '@/components/TopBar.vue';
+import { getMenu } from '@/router/menu'
+import type { NavigationMenuItem } from '@nuxt/ui';
+import { on } from 'events';
+import { ref } from 'vue';
+let menu = await getMenu() as NavigationMenuItem[]
+
+function adaptMenu(menu) {
+  for (const item of menu) {
+    if (item.children && item.children.length > 0) {
+      adaptMenu(item.children);
+      // item.children.unshift({ label: item.label, icon: 'i-lucide-book-open', popover: item.label ,to: { name: 'category', params: item.params }})
+      // item.type = 'trigger'
+      // item.icon = 'i-lucide-book-open'
+      // item.onSelect(e){ console.log(e, 'adasdasdas'); }
+    } else {
+      // console.log(item.params);
+      item.to = { name: 'category', params: item.params };
+      item.icon = 'i-lucide-file-text'
+    }
+  }
+  return menu;
+}
+
+menu = adaptMenu(menu.children)
+
+console.log(menu);
+
+const items = ref<NavigationMenuItem[][]>([
+  [
+    
+    ...menu
+  ],
+ 
+])
+
 
 </script>
 
 <template>
   <div class="h-screen grid grid-rows-[auto_1fr_auto]">
-    <!-- <header class="w-full bg-gray-100 text-primary shadow border-b-gray-300 p-4 mb-8">Header</header> -->
-      <main class="p-10">
-        <TopBar/>
-        <router-view />
-      </main>
+    <main class="p-10">
+      <div class="mt-24 bg-accented w-1/5 rounded-2xl">
+        <UNavigationMenu orientation="vertical" type="single" :items="items" class="p-4">
+        </UNavigationMenu>
+
+      </div>
+      <!-- <template #item>{{ item }}</template> -->
+      
+
+      <TopBar/>
+      <slot></slot>
+    </main>
   </div>
 </template>
diff --git a/bo/src/layouts/empty.vue b/bo/src/layouts/empty.vue
index e8cfec0..e665e66 100644
--- a/bo/src/layouts/empty.vue
+++ b/bo/src/layouts/empty.vue
@@ -1,7 +1,7 @@
 <template>
   <main :key="i18n.locale.value">
     <TopBarLogin />
-    <router-view />
+    <slot></slot>
   </main>
 </template>
 <script setup lang="ts">
diff --git a/bo/src/router/index.ts b/bo/src/router/index.ts
index f205fa4..4b1df03 100644
--- a/bo/src/router/index.ts
+++ b/bo/src/router/index.ts
@@ -1,9 +1,9 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import Empty from '@/layouts/empty.vue'
 import { currentLang, langs } from './langs'
 import { getSettings } from './settings'
 import { useAuthStore } from '@/stores/auth'
 import Default from '@/layouts/default.vue'
+import { getMenu } from './menu'
 
 function isAuthenticated(): boolean {
   if (typeof document === 'undefined') return false
@@ -12,6 +12,7 @@ function isAuthenticated(): boolean {
 
 
 await getSettings()
+// await getMenu()
 
 
 const router = createRouter({
@@ -24,6 +25,7 @@ const router = createRouter({
     {
       path: '/:locale',
       children: [
+        { path: 'category/:category_id-:link_rewrite', component: () => import('../views/CategoryView.vue'), name: 'category' },
         {
           path: '',
           component: Default,
@@ -36,49 +38,88 @@ const router = createRouter({
             { path: 'cart', component: () => import('../components/customer/PageCart.vue'), name: 'cart' },
           ],
         },
+        { path: 'login', component: () => import('@/views/LoginView.vue'), name: 'login', meta: { guest: true, } },
+        { path: 'register', component: () => import('@/views/RegisterView.vue'), name: 'register', meta: { guest: true } },
+        { path: 'password-recovery', component: () => import('@/views/PasswordRecoveryView.vue'), name: 'password-recovery', meta: { guest: true } },
+        { path: 'reset-password', component: () => import('@/views/ResetPasswordForm.vue'), name: 'reset-password', meta: { guest: true } },
+        { path: 'verify-email', component: () => import('@/views/VerifyEmailView.vue'), name: 'verify-email', meta: { guest: true } },
+        // {
+        //   path: '',
+        //   component: Empty,
+        //   children: [
+        //   ],
+        // },
         {
-          path: '',
-          component: Empty,
-          children: [
-            { path: 'login', component: () => import('@/views/LoginView.vue'), name: 'login', meta: { guest: true } },
-            { path: 'register', component: () => import('@/views/RegisterView.vue'), name: 'register', meta: { guest: true } },
-            { path: 'password-recovery', component: () => import('@/views/PasswordRecoveryView.vue'), name: 'password-recovery', meta: { guest: true } },
-            { path: 'reset-password', component: () => import('@/views/ResetPasswordForm.vue'), name: 'reset-password', meta: { guest: true } },
-            { path: 'verify-email', component: () => import('@/views/VerifyEmailView.vue'), name: 'verify-email', meta: { guest: true } },
-          ],
+          path: '/:pathMatch(.*)*',
+          component: () => import('@/views/NotFoundView.vue'),
+          name: 'not-found',
         },
       ],
     },
+    {
+      path: '/:pathMatch(.*)*',
+      component: () => import('@/views/NotFoundView.vue'),
+      name: 'not-found',
+    },
   ],
 })
 
-router.beforeEach((to, from, next) => {
+// router.beforeEach((to, from, next) => {
+//   const locale = to.params.locale as string
+//   const localeLang = langs.find((x) => x.iso_code == locale)
+
+//   if (locale && langs.length > 0) {
+//     const authStore = useAuthStore()
+//     // console.log(authStore.isAuthenticated, to, from)
+//     // if()
+//     const validLocale = langs.find((l) => l.lang_code === locale)
+
+//     if (validLocale) {
+//       currentLang.value = localeLang
+//       if (!to.meta?.guest && !isAuthenticated()) {
+//         return next({ name: 'login', params: { locale } })
+//       }
+
+//       // return next()
+//       return next()
+//     } else if (locale) {
+//       return next(`/${currentLang.value?.iso_code}${to.path.replace(`/${locale}`, '') || '/'}`)
+//     }
+//   }
+
+//   if (!locale && to.path !== '/') {
+//     return next(`/${currentLang.value?.iso_code}${to.path}`)
+//   }
+
+//   next()
+// })
+
+router.beforeEach((to, from) => {
   const locale = to.params.locale as string
-  const localeLang = langs.find((x) => x.iso_code == locale)
+  const localeLang = langs.find((x) => x.iso_code === locale)
 
   if (locale && langs.length > 0) {
     const authStore = useAuthStore()
-    console.log(authStore.isAuthenticated, to, from)
-    // if()
     const validLocale = langs.find((l) => l.lang_code === locale)
 
     if (validLocale) {
       currentLang.value = localeLang
-      if (!to.meta?.guest && !isAuthenticated()) {
-        return next({ name: 'login', params: { locale } })
+
+      if (!to.meta?.guest && !authStore.isAuthenticated) {
+        return { name: 'login', params: { locale } }
       }
 
-      return next()
+      return true
     } else if (locale) {
-      return next(`/${currentLang.value?.iso_code}${to.path.replace(`/${locale}`, '') || '/'}`)
+      return `/${currentLang.value?.iso_code}${to.path.replace(`/${locale}`, '') || '/'}`
     }
   }
 
   if (!locale && to.path !== '/') {
-    return next(`/${currentLang.value?.iso_code}${to.path}`)
+    return `/${currentLang.value?.iso_code}${to.path}`
   }
 
-  next()
+  return true
 })
 
 export default router
diff --git a/bo/src/router/menu.ts b/bo/src/router/menu.ts
new file mode 100644
index 0000000..1edfdc1
--- /dev/null
+++ b/bo/src/router/menu.ts
@@ -0,0 +1,8 @@
+import { useFetchJson } from "@/composable/useFetchJson";
+
+export const getMenu = async () => {
+    const resp = await useFetchJson('/api/v1/restricted/menu/get-menu');
+
+    return resp.items
+    
+}
\ No newline at end of file
diff --git a/bo/src/views/CategoryView.vue b/bo/src/views/CategoryView.vue
new file mode 100644
index 0000000..b24a8e6
--- /dev/null
+++ b/bo/src/views/CategoryView.vue
@@ -0,0 +1,21 @@
+<template>
+    <component :is="Default || 'div'">
+        <div class="container mt-24">
+            <div class="row">
+                <div class="col-12">
+                    <h1>Category</h1>
+                    {{ $route.params }}
+                </div>
+            </div>
+        </div>
+    </component>
+</template>
+
+
+<script setup lang="ts">
+// import { useRoute } from 'vue-router';
+import Default from '@/layouts/default.vue';
+// const route = useRoute()
+// console.log(route);
+
+</script>
\ No newline at end of file
diff --git a/bo/src/views/LoginView.vue b/bo/src/views/LoginView.vue
index 20cec7b..f85d2c3 100644
--- a/bo/src/views/LoginView.vue
+++ b/bo/src/views/LoginView.vue
@@ -4,8 +4,8 @@ import { useRouter, useRoute } from 'vue-router'
 import { useAuthStore } from '@/stores/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
-import { useI18n } from 'vue-i18n'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const router = useRouter()
 const route = useRoute()
@@ -52,9 +52,11 @@ const PrivacyComponent = computed(() =>
     import(`@/components/terms/${i18n.locale.value}_PrivacyPolicyView.vue`).catch(() => import('@/components/terms/en_PrivacyPolicyView.vue')),
   ),
 )
+
 </script>
 
 <template>
+<component :is="Empty || 'div'">
   <UDrawer v-model:open="showTherms" :overlay="false">
     <template #body>
       <component :is="TermsComponent" />
@@ -163,4 +165,5 @@ const PrivacyComponent = computed(() =>
       </p>
     </div>
   </div>
+  </component>
 </template>
diff --git a/bo/src/views/NotFoundView.vue b/bo/src/views/NotFoundView.vue
new file mode 100644
index 0000000..4e3e4fc
--- /dev/null
+++ b/bo/src/views/NotFoundView.vue
@@ -0,0 +1,7 @@
+<template>
+    <div class="flex flex-col items-center justify-center h-screen">
+      <h1 class="text-4xl font-bold text-gray-800">404</h1>
+      <p class="mt-4 text-lg text-gray-600">Page not found</p>
+      <router-link to="/" class="mt-6 text-blue-500 hover:underline">Go back home</router-link>
+    </div>
+</template>
\ No newline at end of file
diff --git a/bo/src/views/PasswordRecoveryView.vue b/bo/src/views/PasswordRecoveryView.vue
index dd8fada..265011c 100644
--- a/bo/src/views/PasswordRecoveryView.vue
+++ b/bo/src/views/PasswordRecoveryView.vue
@@ -5,6 +5,7 @@ import { useAuthStore } from '@/stores/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const router = useRouter()
 const authStore = useAuthStore()
@@ -36,70 +37,74 @@ function validate(): FormError[] {
 </script>
 
 <template>
-  <div class="h-[100vh] flex flex-col items-center justify-center px-4 sm:px-6 lg:px-8">
-    <div class="text-center mb-15">
-      <div
-        class="inline-flex items-center justify-center w-16 h-16 rounded-2xl bg-primary-500 text-white mb-4 shadow-lg shadow-primary-500/30">
-        <UIcon name="i-heroicons-clock" class="w-8 h-8" />
+  <component :is="Empty || 'div'">
+    <div class="h-[100vh] flex flex-col items-center justify-center px-4 sm:px-6 lg:px-8">
+      <div class="text-center mb-15">
+        <div
+          class="inline-flex items-center justify-center w-16 h-16 rounded-2xl bg-primary-500 text-white mb-4 shadow-lg shadow-primary-500/30">
+          <UIcon name="i-heroicons-clock" class="w-8 h-8" />
+        </div>
+        <h1 class="text-3xl font-bold text-gray-900 dark:text-white">TimeTracker</h1>
       </div>
-      <h1 class="text-3xl font-bold text-gray-900 dark:text-white">TimeTracker</h1>
-    </div>
-    <div class="w-full max-w-md flex flex-col gap-4">
+      <div class="w-full max-w-md flex flex-col gap-4">
 
-      <template v-if="submitted">
-        <div class="text-center flex flex-col gap-4">
-          <UIcon name="i-heroicons-envelope" class="w-12 h-12 mx-auto text-primary-500" />
-          <h2 class="text-xl font-semibold dark:text-white text-black">{{ $t('general.check_your_email') }}</h2>
-          <p class="text-sm text-gray-600 dark:text-gray-400">
-            {{ $t('general.password_reset_link_sent_notice') }}
-          </p>
-          <UButton color="neutral" variant="outline" block @click="goToLogin"
-            class="dark:text-white text-black cursor-pointer">
-            {{ $t('general.back_to_sign_in') }}
-          </UButton>
-        </div>
-      </template>
+        <template v-if="submitted">
+          <div class="text-center flex flex-col gap-4">
+            <UIcon name="i-heroicons-envelope" class="w-12 h-12 mx-auto text-primary-500" />
+            <h2 class="text-xl font-semibold dark:text-white text-black">{{ $t('general.check_your_email') }}</h2>
+            <p class="text-sm text-gray-600 dark:text-gray-400">
+              {{ $t('general.password_reset_link_sent_notice') }}
+            </p>
+            <UButton color="neutral" variant="outline" block @click="goToLogin"
+              class="dark:text-white text-black cursor-pointer">
+              {{ $t('general.back_to_sign_in') }}
+            </UButton>
+          </div>
+        </template>
 
-      <template v-else>
-        <div class="text-center">
-          <p class="text-sm text-gray-600 dark:text-gray-400">
-            {{ $t('general.enter_email_for_password_reset') }}
-          </p>
-        </div>
+        <template v-else>
+          <div class="text-center">
+            <p class="text-sm text-gray-600 dark:text-gray-400">
+              {{ $t('general.enter_email_for_password_reset') }}
+            </p>
+          </div>
 
-        <UForm :validate="validate" @submit="handleRecover" class="flex flex-col gap-3">
-          <UAlert v-if="authStore.error" color="error" variant="subtle" icon="i-heroicons-exclamation-triangle"
-            :title="authStore.error" :close-button="{ icon: 'i-heroicons-x-mark-20-solid', variant: 'link' }"
-            @close="authStore.clearError" />
+          <UForm :validate="validate" @submit="handleRecover" class="flex flex-col gap-3">
+            <UAlert v-if="authStore.error" color="error" variant="subtle" icon="i-heroicons-exclamation-triangle"
+              :title="authStore.error" :close-button="{ icon: 'i-heroicons-x-mark-20-solid', variant: 'link' }"
+              @close="authStore.clearError" />
 
-          <UFormField :label="$t('general.email_address')" name="email" required
-            class="w-full dark:text-white text-black">
-            <UInput v-model="email" :placeholder="$t('general.enter_your_email')" :disabled="authStore.loading"
-              class="w-full dark:text-white text-black placeholder:text-(--placeholder)" />
-          </UFormField>
+            <UFormField :label="$t('general.email_address')" name="email" required
+              class="w-full dark:text-white text-black">
+              <UInput v-model="email" :placeholder="$t('general.enter_your_email')" :disabled="authStore.loading"
+                class="w-full dark:text-white text-black placeholder:text-(--placeholder)" />
+            </UFormField>
 
-          <UButton type="submit" block :loading="authStore.loading"
-            class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) cursor-pointer">
-            {{ $t('general.send_password_reset_link') }}
-          </UButton>
-        </UForm>
+            <UButton type="submit" block :loading="authStore.loading"
+              class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) cursor-pointer">
+              {{ $t('general.send_password_reset_link') }}
+            </UButton>
+          </UForm>
 
-        <div class="text-center flex flex-col gap-3 border-t dark:border-(--border-dark) border-(--border-light) pt-4">
-          <button color="neutral" variant="outline" :loading="authStore.loading"
-            class="w-full flex items-center gap-2 justify-center text-[15px] dark:text-white text-black cursor-pointer"
-            @click="goToLogin">
-            <UIcon name="mingcute:arrow-left-line" class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) text-[16px]" />
-            {{ $t('general.back_to_sign_in') }}
-          </button>
-          <p class="text-sm text-gray-600 dark:text-gray-400">
-            {{ $t('general.dont_have_an_account') }}
-            <button variant="link" size="sm" @click="goToRegister"
-              class=" text-[15px] text-(--accent-blue-light) dark:text-(--accent-blue-dark) cursor-pointer">{{
-                $t('general.create_account_now') }}
+          <div
+            class="text-center flex flex-col gap-3 border-t dark:border-(--border-dark) border-(--border-light) pt-4">
+            <button color="neutral" variant="outline" :loading="authStore.loading"
+              class="w-full flex items-center gap-2 justify-center text-[15px] dark:text-white text-black cursor-pointer"
+              @click="goToLogin">
+              <UIcon name="mingcute:arrow-left-line"
+                class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) text-[16px]" />
+              {{ $t('general.back_to_sign_in') }}
             </button>
-          </p>
-        </div>
-      </template>
+            <p class="text-sm text-gray-600 dark:text-gray-400">
+              {{ $t('general.dont_have_an_account') }}
+              <button variant="link" size="sm" @click="goToRegister"
+                class=" text-[15px] text-(--accent-blue-light) dark:text-(--accent-blue-dark) cursor-pointer">{{
+                  $t('general.create_account_now') }}
+              </button>
+            </p>
+          </div>
+        </template>
+      </div>
     </div>
-  </div>
+  </component>
 </template>
diff --git a/bo/src/views/RegisterView.vue b/bo/src/views/RegisterView.vue
index 71dc802..e329afc 100644
--- a/bo/src/views/RegisterView.vue
+++ b/bo/src/views/RegisterView.vue
@@ -1,4 +1,5 @@
 <template>
+  <component :is="Empty || 'div'">
   <UDrawer v-model:open="showTherms" :overlay="false">
     <template #body>
       <component :is="TermsComponent" />
@@ -110,6 +111,7 @@
       </UForm>
     </div>
   </div>
+  </component>
 </template>
 
 <script setup lang="ts">
@@ -120,6 +122,8 @@ import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { useI18n } from 'vue-i18n'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
+
 
 const { locale } = useI18n()
 const router = useRouter()
diff --git a/bo/src/views/ResetPasswordForm.vue b/bo/src/views/ResetPasswordForm.vue
index 210e782..8eb92b7 100644
--- a/bo/src/views/ResetPasswordForm.vue
+++ b/bo/src/views/ResetPasswordForm.vue
@@ -5,6 +5,7 @@ import { useAuthStore } from '@/stores/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const router = useRouter()
 const route = useRoute()
@@ -49,80 +50,84 @@ function validate(): FormError[] {
 </script>
 
 <template>
-    <div class="h-[100vh] flex flex-col items-center justify-center px-4 sm:px-6 lg:px-8">
-        <div class="text-center mb-15">
-            <div
-                class="inline-flex items-center justify-center w-16 h-16 rounded-2xl bg-primary-500 text-white mb-4 shadow-lg shadow-primary-500/30">
-                <UIcon name="i-heroicons-clock" class="w-8 h-8" />
-            </div>
-            <h1 class="text-3xl font-bold text-gray-900 dark:text-white">TimeTracker</h1>
-        </div>
-        <div class="w-full max-w-md flex flex-col gap-4">
-
-            <template v-if="submitted">
-                <div class="text-center flex flex-col gap-4">
-                    <UIcon name="i-heroicons-check-circle" class="w-12 h-12 mx-auto text-green-800" />
-                    <h2 class="text-xl font-semibold dark:text-white text-black">
-                        {{ $t('general.password_updated') }}
-                    </h2>
-                    <p class="text-sm text-gray-600 dark:text-gray-400">
-                        {{ $t('general.password_updated_description') }}
-                    </p>
-                    <UButton block @click="goToLogin" class="dark:text-white text-black">
-                        {{ $t('general.back_to_sign_in') }}
-                    </UButton>
+    <component :is="Empty || 'div'">
+        <div class="h-[100vh] flex flex-col items-center justify-center px-4 sm:px-6 lg:px-8">
+            <div class="text-center mb-15">
+                <div
+                    class="inline-flex items-center justify-center w-16 h-16 rounded-2xl bg-primary-500 text-white mb-4 shadow-lg shadow-primary-500/30">
+                    <UIcon name="i-heroicons-clock" class="w-8 h-8" />
                 </div>
-            </template>
+                <h1 class="text-3xl font-bold text-gray-900 dark:text-white">TimeTracker</h1>
+            </div>
+            <div class="w-full max-w-md flex flex-col gap-4">
 
-            <template v-else>
-                <UForm :validate="validate" @submit="handleReset" class="flex flex-col gap-3">
-                    <UAlert v-if="authStore.error" color="error" variant="subtle"
-                        icon="i-heroicons-exclamation-triangle" :title="authStore.error"
-                        :close-button="{ icon: 'i-heroicons-x-mark-20-solid', variant: 'link' }"
-                        @close="authStore.clearError" />
-
-                    <UFormField :label="$t('general.new_password')" name="new_password" required
-                        class="w-full dark:text-white text-black">
-                        <UInput v-model="new_password" :type="showNewPassword ? 'text' : 'password'"
-                            :placeholder="$t('general.enter_your_new_password')" :disabled="authStore.loading"
-                            class="w-full dark:text-white text-black placeholder:text-(--placeholder)" :ui="{ trailing: 'pe-1' }">
-                            <template #trailing>
-                                <UIcon color="neutral" variant="link" size="sm"
-                                    :name="showNewPassword ? 'i-lucide-eye-off' : 'i-lucide-eye'"
-                                    :aria-label="showNewPassword ? 'Hide password' : 'Show password'"
-                                    :aria-pressed="showNewPassword" aria-controls="new_password"
-                                    @click="showNewPassword = !showNewPassword" class="mr-2"/>
-                            </template>
-                        </UInput>
-                    </UFormField>
-
-                    <UFormField :label="$t('general.confirm_password')" name="confirm_new_password" required
-                        class="w-full dark:text-white text-black">
-                        <UInput v-model="confirm_new_password" :type="showConfirmPassword ? 'text' : 'password'"
-                            :placeholder="$t('general.confirm_your_new_password')" :disabled="authStore.loading"
-                            class="w-full dark:text-white text-black placeholder:text-(--placeholder)" :ui="{ trailing: 'pe-1' }">
-                            <template #trailing>
-                                <UIcon color="neutral" variant="ghost" size="sm"
-                                    :name="showConfirmPassword ? 'i-lucide-eye-off' : 'i-lucide-eye'"
-                                    @click="showConfirmPassword = !showConfirmPassword" class="mr-2"/>
-                            </template>
-                        </UInput>
-                    </UFormField>
-
-                    <UButton type="submit" block :loading="authStore.loading"
-                        class="text-white! bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) cursor-pointer">
-                        {{ $t('general.reset_password') }}
-                    </UButton>
-
-                    <div class="text-center border-t dark:border-(--border-dark) border-(--border-light) pt-4">
-                        <button color="neutral" variant="ghost" @click="goToLogin"
-                            class="text-[15px] flex items-center gap-2 text-(--accent-blue-light) dark:text-(--accent-blue-dark) cursor-pointer">
-                            <UIcon name="mingcute:arrow-left-line" />
+                <template v-if="submitted">
+                    <div class="text-center flex flex-col gap-4">
+                        <UIcon name="i-heroicons-check-circle" class="w-12 h-12 mx-auto text-green-800" />
+                        <h2 class="text-xl font-semibold dark:text-white text-black">
+                            {{ $t('general.password_updated') }}
+                        </h2>
+                        <p class="text-sm text-gray-600 dark:text-gray-400">
+                            {{ $t('general.password_updated_description') }}
+                        </p>
+                        <UButton block @click="goToLogin" class="dark:text-white text-black">
                             {{ $t('general.back_to_sign_in') }}
-                        </button>
+                        </UButton>
                     </div>
-                </UForm>
-            </template>
+                </template>
+
+                <template v-else>
+                    <UForm :validate="validate" @submit="handleReset" class="flex flex-col gap-3">
+                        <UAlert v-if="authStore.error" color="error" variant="subtle"
+                            icon="i-heroicons-exclamation-triangle" :title="authStore.error"
+                            :close-button="{ icon: 'i-heroicons-x-mark-20-solid', variant: 'link' }"
+                            @close="authStore.clearError" />
+
+                        <UFormField :label="$t('general.new_password')" name="new_password" required
+                            class="w-full dark:text-white text-black">
+                            <UInput v-model="new_password" :type="showNewPassword ? 'text' : 'password'"
+                                :placeholder="$t('general.enter_your_new_password')" :disabled="authStore.loading"
+                                class="w-full dark:text-white text-black placeholder:text-(--placeholder)"
+                                :ui="{ trailing: 'pe-1' }">
+                                <template #trailing>
+                                    <UIcon color="neutral" variant="link" size="sm"
+                                        :name="showNewPassword ? 'i-lucide-eye-off' : 'i-lucide-eye'"
+                                        :aria-label="showNewPassword ? 'Hide password' : 'Show password'"
+                                        :aria-pressed="showNewPassword" aria-controls="new_password"
+                                        @click="showNewPassword = !showNewPassword" class="mr-2" />
+                                </template>
+                            </UInput>
+                        </UFormField>
+
+                        <UFormField :label="$t('general.confirm_password')" name="confirm_new_password" required
+                            class="w-full dark:text-white text-black">
+                            <UInput v-model="confirm_new_password" :type="showConfirmPassword ? 'text' : 'password'"
+                                :placeholder="$t('general.confirm_your_new_password')" :disabled="authStore.loading"
+                                class="w-full dark:text-white text-black placeholder:text-(--placeholder)"
+                                :ui="{ trailing: 'pe-1' }">
+                                <template #trailing>
+                                    <UIcon color="neutral" variant="ghost" size="sm"
+                                        :name="showConfirmPassword ? 'i-lucide-eye-off' : 'i-lucide-eye'"
+                                        @click="showConfirmPassword = !showConfirmPassword" class="mr-2" />
+                                </template>
+                            </UInput>
+                        </UFormField>
+
+                        <UButton type="submit" block :loading="authStore.loading"
+                            class="text-white! bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) cursor-pointer">
+                            {{ $t('general.reset_password') }}
+                        </UButton>
+
+                        <div class="text-center border-t dark:border-(--border-dark) border-(--border-light) pt-4">
+                            <button color="neutral" variant="ghost" @click="goToLogin"
+                                class="text-[15px] flex items-center gap-2 text-(--accent-blue-light) dark:text-(--accent-blue-dark) cursor-pointer">
+                                <UIcon name="mingcute:arrow-left-line" />
+                                {{ $t('general.back_to_sign_in') }}
+                            </button>
+                        </div>
+                    </UForm>
+                </template>
+            </div>
         </div>
-    </div>
+    </component>
 </template>
diff --git a/bo/src/views/VerifyEmailView.vue b/bo/src/views/VerifyEmailView.vue
index 11b594c..2aa281a 100644
--- a/bo/src/views/VerifyEmailView.vue
+++ b/bo/src/views/VerifyEmailView.vue
@@ -4,6 +4,7 @@ import { useRouter, useRoute } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { useFetchJson } from '@/composable/useFetchJson'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const { t, te } = useI18n()
 const router = useRouter()
@@ -66,81 +67,84 @@ function goToLogin() {
 </script>
 
 <template>
-  <div
-    class="min-h-screen bg-gradient-to-br from-primary-50 via-white to-primary-100 dark:from-gray-900 dark:via-gray-800 dark:to-gray-900">
-    <div class="pt-20 pb-8 flex items-center justify-center px-4 sm:px-6 lg:px-8">
-      <div class="w-full max-w-md">
-        <div class="text-center mb-8">
-          <div
-            class="inline-flex items-center justify-center w-16 h-16 rounded-2xl bg-primary-500 text-white mb-4 shadow-lg shadow-primary-500/30">
-            <UIcon name="i-heroicons-clock" class="w-8 h-8" />
+  <component :is="Empty || 'div'">
+    <div
+      class="min-h-screen bg-gradient-to-br from-primary-50 via-white to-primary-100 dark:from-gray-900 dark:via-gray-800 dark:to-gray-900">
+      <div class="pt-20 pb-8 flex items-center justify-center px-4 sm:px-6 lg:px-8">
+        <div class="w-full max-w-md">
+          <div class="text-center mb-8">
+            <div
+              class="inline-flex items-center justify-center w-16 h-16 rounded-2xl bg-primary-500 text-white mb-4 shadow-lg shadow-primary-500/30">
+              <UIcon name="i-heroicons-clock" class="w-8 h-8" />
+            </div>
+            <h1 class="text-3xl font-bold text-gray-900 dark:text-white">TimeTracker</h1>
           </div>
-          <h1 class="text-3xl font-bold text-gray-900 dark:text-white">TimeTracker</h1>
+
+          <UCard class="shadow-xl shadow-gray-200/50 dark:shadow-gray-900/50">
+            <template #header>
+              <div class="text-center">
+                <div v-if="verificationInProgress && loading">
+                  <UIcon name="i-heroicons-arrow-path" class="w-8 h-8 animate-spin text-primary-500 mx-auto mb-4" />
+                  <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
+                    {{ $t('verify_email.verifying') }}
+                  </h2>
+                </div>
+                <div v-else-if="success">
+                  <div
+                    class="inline-flex items-center justify-center w-12 h-12 rounded-full bg-green-100 text-green-600 mb-4">
+                    <UIcon name="i-heroicons-check-circle" class="w-6 h-6" />
+                  </div>
+                  <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
+                    {{ $t('verify_email.success_title') }}
+                  </h2>
+                  <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
+                    {{ $t('verify_email.success_message') }}
+                  </p>
+                </div>
+                <div v-else-if="error">
+                  <div
+                    class="inline-flex items-center justify-center w-12 h-12 rounded-full bg-red-100 text-red-600 mb-4">
+                    <UIcon name="i-heroicons-exclamation-circle" class="w-6 h-6" />
+                  </div>
+                  <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
+                    {{ $t('verify_email.error_title') }}
+                  </h2>
+                  <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
+                    {{ $t('verify_email.error_message') }}
+                  </p>
+                </div>
+              </div>
+            </template>
+
+            <div v-if="success" class="text-center py-4">
+              <p class="text-gray-600 dark:text-gray-400 mb-4">{{ $t('verify_email.redirect_message') }}</p>
+              <UButton color="primary" @click="goToLogin">{{ $t('verify_email.go_to_login') }}</UButton>
+            </div>
+            <div v-else-if="error" class="text-center py-4">
+              <UAlert :color="'error'" variant="subtle" icon="i-heroicons-exclamation-triangle" :title="error"
+                class="mb-4" />
+              <UButton color="primary" @click="goToLogin" class="cursor-pointer">{{ $t('verify_email.go_to_login') }}
+              </UButton>
+            </div>
+            <div v-else-if="verificationInProgress && loading" class="text-center py-4">
+              <p class="text-gray-500 dark:text-gray-400">{{ $t('verify_email.please_wait') }}</p>
+            </div>
+
+            <template #footer>
+              <div class="text-center">
+                <p class="text-sm text-gray-600 dark:text-gray-400">
+                  {{ $t('verify_email.already_registered') }}
+                  <button variant="link" size="sm" @click="goToLogin"
+                    class="cursor-pointer text-(--accent-blue-light) dark:text-(--accent-blue-dark)"> {{
+                      $t('general.sign_in')
+                    }}
+                  </button>
+                </p>
+              </div>
+            </template>
+          </UCard>
         </div>
-
-        <UCard class="shadow-xl shadow-gray-200/50 dark:shadow-gray-900/50">
-          <template #header>
-            <div class="text-center">
-              <div v-if="verificationInProgress && loading">
-                <UIcon name="i-heroicons-arrow-path" class="w-8 h-8 animate-spin text-primary-500 mx-auto mb-4" />
-                <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
-                  {{ $t('verify_email.verifying') }}
-                </h2>
-              </div>
-              <div v-else-if="success">
-                <div
-                  class="inline-flex items-center justify-center w-12 h-12 rounded-full bg-green-100 text-green-600 mb-4">
-                  <UIcon name="i-heroicons-check-circle" class="w-6 h-6" />
-                </div>
-                <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
-                  {{ $t('verify_email.success_title') }}
-                </h2>
-                <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
-                  {{ $t('verify_email.success_message') }}
-                </p>
-              </div>
-              <div v-else-if="error">
-                <div
-                  class="inline-flex items-center justify-center w-12 h-12 rounded-full bg-red-100 text-red-600 mb-4">
-                  <UIcon name="i-heroicons-exclamation-circle" class="w-6 h-6" />
-                </div>
-                <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
-                  {{ $t('verify_email.error_title') }}
-                </h2>
-                <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
-                  {{ $t('verify_email.error_message') }}
-                </p>
-              </div>
-            </div>
-          </template>
-
-          <div v-if="success" class="text-center py-4">
-            <p class="text-gray-600 dark:text-gray-400 mb-4">{{ $t('verify_email.redirect_message') }}</p>
-            <UButton color="primary" @click="goToLogin">{{ $t('verify_email.go_to_login') }}</UButton>
-          </div>
-          <div v-else-if="error" class="text-center py-4">
-            <UAlert :color="'error'" variant="subtle" icon="i-heroicons-exclamation-triangle" :title="error"
-              class="mb-4" />
-            <UButton color="primary" @click="goToLogin" class="cursor-pointer">{{ $t('verify_email.go_to_login') }}
-            </UButton>
-          </div>
-          <div v-else-if="verificationInProgress && loading" class="text-center py-4">
-            <p class="text-gray-500 dark:text-gray-400">{{ $t('verify_email.please_wait') }}</p>
-          </div>
-
-          <template #footer>
-            <div class="text-center">
-              <p class="text-sm text-gray-600 dark:text-gray-400">
-                {{ $t('verify_email.already_registered') }}
-                <button variant="link" size="sm" @click="goToLogin"
-                  class="cursor-pointer text-(--accent-blue-light) dark:text-(--accent-blue-dark)"> {{ $t('general.sign_in')
-                  }}
-                </button>
-              </p>
-            </div>
-          </template>
-        </UCard>
       </div>
     </div>
-  </div>
+  </component>
 </template>