diff --git a/app/layouts/default.vue b/app/layouts/default.vue
deleted file mode 100644
index 284c4b5..0000000
--- a/app/layouts/default.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-  <div class="drawer lg:drawer-open">
-    <input id="main-drawer" type="checkbox" class="drawer-toggle" v-model="drawerOpen" />
-
-    <!-- Main content area -->
-    <div class="drawer-content flex flex-col bg-base-200" :class="$slots.sidebar ? 'h-screen' : 'min-h-screen'">
-      <!-- TopBar -->
-      <TopBar
-        :session-checked="sessionChecked"
-        :logged-in="isLoggedIn"
-        :novu-subscriber-id="novuSubscriberId"
-        :user-avatar-svg="userAvatarSvg"
-        :user-name="userName"
-        :user-initials="userInitials"
-        :theme="theme"
-        @toggle-theme="toggleTheme"
-        @toggle-sidebar="drawerOpen = !drawerOpen"
-        @sign-out="onClickSignOut"
-        @sign-in="signIn()"
-      />
-
-      <!-- Page content -->
-      <main class="flex-1 flex flex-col min-h-0" :class="$slots.sidebar ? '' : 'p-4 lg:p-6'">
-        <slot />
-      </main>
-
-      <!-- Footer (hide when custom sidebar is used, e.g. map page) -->
-      <FooterPublic v-if="!$slots.sidebar" />
-    </div>
-
-    <!-- Sidebar drawer -->
-    <div class="drawer-side z-50">
-      <label for="main-drawer" aria-label="close sidebar" class="drawer-overlay"></label>
-      <slot name="sidebar">
-        <Sidebar
-          :user-data="userData"
-          :is-seller="isSeller"
-          :logged-in="isLoggedIn"
-          @switch-team="switchToTeam"
-        />
-      </slot>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-const runtimeConfig = useRuntimeConfig()
-const siteUrl = runtimeConfig.public.siteUrl || 'https://optovia.ru/'
-const { signIn, signOut, loggedIn, fetch: fetchSession } = useAuth()
-
-const drawerOpen = ref(false)
-// Theme: use CSS default when not set, switch to DaisyUI "night" for dark
-const theme = useState<'default' | 'night'>('theme', () => 'default')
-const userData = useState<{
-  id?: string
-  firstName?: string
-  lastName?: string
-  avatarId?: string
-  activeTeam?: { name?: string; teamType?: string; logtoOrgId?: string }
-  activeTeamId?: string
-  teams?: Array<{ id?: string; name?: string; logtoOrgId?: string }>
-} | null>('me', () => null)
-const sessionChecked = ref(false)
-const userAvatarSvg = useState('user-avatar-svg', () => '')
-const lastAvatarSeed = useState('user-avatar-seed', () => '')
-const novuSubscriberId = useState('novu-subscriber-id', () => '')
-
-const isSeller = computed(() => {
-  return userData.value?.activeTeam?.teamType === 'SELLER'
-})
-
-const isLoggedIn = computed(() => loggedIn.value || !!userData.value?.id)
-
-const userName = computed(() => {
-  return userData.value?.firstName || 'User'
-})
-
-const userInitials = computed(() => {
-  const first = userData.value?.firstName?.charAt(0) || ''
-  const last = userData.value?.lastName?.charAt(0) || ''
-  if (first || last) return (first + last).toUpperCase()
-  return '?'
-})
-
-// Avatar generation
-const generateUserAvatar = async (seed: string) => {
-  if (!seed) return
-  try {
-    const response = await fetch(`https://api.dicebear.com/7.x/avataaars/svg?seed=${encodeURIComponent(seed)}&backgroundColor=b6e3f4,c0aede,d1d4f9`)
-    if (response.ok) {
-      userAvatarSvg.value = await response.text()
-      lastAvatarSeed.value = seed
-    }
-  } catch (error) {
-    console.error('Error generating avatar:', error)
-  }
-}
-
-const computeNovuSubscriber = () => {
-  const uuid = userData.value?.id
-  if (uuid) return uuid
-  return ''
-}
-
-const { setActiveTeam } = useActiveTeam()
-const { mutate } = useGraphQL()
-const locationStore = useLocationStore()
-
-const syncUserUi = async () => {
-  if (!userData.value) {
-    novuSubscriberId.value = ''
-    locationStore.clear()
-    return
-  }
-
-  if (userData.value.activeTeamId && userData.value.activeTeam?.logtoOrgId) {
-    setActiveTeam(userData.value.activeTeamId, userData.value.activeTeam.logtoOrgId)
-  }
-
-  novuSubscriberId.value = computeNovuSubscriber()
-
-  const seed = userData.value.avatarId || userData.value.id || userData.value.firstName || 'default'
-
-  if (!userAvatarSvg.value || lastAvatarSeed.value !== seed) {
-    userAvatarSvg.value = ''
-    await generateUserAvatar(seed)
-  }
-
-  // Установить локацию из данных пользователя
-  locationStore.setFromUserData(userData.value.activeTeam?.selectedLocation)
-}
-
-watch(userData, () => {
-  void syncUserUi()
-}, { immediate: true })
-
-// Check session (SSR + client navigation)
-await fetchSession().catch(() => {})
-sessionChecked.value = true
-
-const switchToTeam = async (team: { id?: string; logtoOrgId?: string; name?: string }) => {
-  if (!team?.id) return
-
-  try {
-    const { SwitchTeamDocument } = await import('~/composables/graphql/user/teams-generated')
-    const result = await mutate(SwitchTeamDocument, { teamId: team.id }, 'user', 'teams')
-
-    if (result.switchTeam?.user && userData.value) {
-      userData.value.activeTeam = team as typeof userData.value.activeTeam
-      userData.value.activeTeamId = team.id
-      if (team.logtoOrgId) {
-        setActiveTeam(team.id, team.logtoOrgId)
-      }
-    }
-  } catch (err) {
-    console.error('Failed to switch team:', err)
-  }
-}
-
-const onClickSignOut = () => {
-  signOut(siteUrl)
-}
-
-const applyTheme = (value: 'default' | 'night') => {
-  if (process.client) {
-    if (value === 'default') {
-      document.documentElement.removeAttribute('data-theme')
-    } else {
-      document.documentElement.setAttribute('data-theme', value)
-    }
-    localStorage.setItem('theme', value)
-  }
-}
-
-onMounted(() => {
-  const stored = process.client ? localStorage.getItem('theme') : null
-  if (stored === 'night' || stored === 'default') {
-    theme.value = stored
-  }
-  applyTheme(theme.value)
-})
-
-watch(theme, (value) => applyTheme(value))
-
-const toggleTheme = () => {
-  theme.value = theme.value === 'night' ? 'default' : 'night'
-}
-
-// Close drawer on route change (mobile)
-const route = useRoute()
-watch(() => route.path, () => {
-  drawerOpen.value = false
-})
-</script>
diff --git a/app/pages/callback.vue b/app/pages/callback.vue
index d106689..5dcba0d 100644
--- a/app/pages/callback.vue
+++ b/app/pages/callback.vue
@@ -7,7 +7,11 @@
   </Section>
 </template>
 
-<script setup>
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
+
 const localePath = useLocalePath()
 
 onMounted(() => {
diff --git a/app/pages/catalog/hubs/[id].vue b/app/pages/catalog/hubs/[id].vue
index d094e19..97b71b8 100644
--- a/app/pages/catalog/hubs/[id].vue
+++ b/app/pages/catalog/hubs/[id].vue
@@ -112,6 +112,10 @@ import { GetLocationOffersDocument, GetSupplierProfilesDocument } from '~/compos
 import { GetNodeConnectionsDocument, GetAutoRouteDocument, GetRailRouteDocument } from '~/composables/graphql/public/geo-generated'
 import type { EdgeType } from '~/composables/graphql/public/geo-generated'
 
+definePageMeta({
+  layout: 'topnav'
+})
+
 interface RouteGeometry {
   toUuid: string
   coordinates: [number, number][]
diff --git a/app/pages/catalog/offers/[uuid].vue b/app/pages/catalog/offers/[uuid].vue
index 638f6b8..cd41ada 100644
--- a/app/pages/catalog/offers/[uuid].vue
+++ b/app/pages/catalog/offers/[uuid].vue
@@ -115,6 +115,10 @@ import {
   GetSupplierProfilesDocument,
 } from '~/composables/graphql/public/exchange-generated'
 
+definePageMeta({
+  layout: 'topnav'
+})
+
 const route = useRoute()
 const localePath = useLocalePath()
 const { t } = useI18n()
diff --git a/app/pages/catalog/products/[id].vue b/app/pages/catalog/products/[id].vue
index 1b9238e..2754077 100644
--- a/app/pages/catalog/products/[id].vue
+++ b/app/pages/catalog/products/[id].vue
@@ -206,6 +206,10 @@ import {
   GetSupplierProfilesDocument,
 } from '~/composables/graphql/public/exchange-generated'
 
+definePageMeta({
+  layout: 'topnav'
+})
+
 const route = useRoute()
 const localePath = useLocalePath()
 const { t } = useI18n()
diff --git a/app/pages/clientarea/addresses/[uuid].vue b/app/pages/clientarea/addresses/[uuid].vue
index 72cedf3..ac7908f 100644
--- a/app/pages/clientarea/addresses/[uuid].vue
+++ b/app/pages/clientarea/addresses/[uuid].vue
@@ -95,6 +95,7 @@ import { NuxtLink } from '#components'
 import type { MapMouseEvent, Map as MapboxMapType } from 'mapbox-gl'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/addresses/new.vue b/app/pages/clientarea/addresses/new.vue
index 5f13b8e..62ec189 100644
--- a/app/pages/clientarea/addresses/new.vue
+++ b/app/pages/clientarea/addresses/new.vue
@@ -72,6 +72,7 @@ import { NuxtLink } from '#components'
 import type { MapMouseEvent, Map as MapboxMapType } from 'mapbox-gl'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/ai/[id].vue b/app/pages/clientarea/ai/[id].vue
index 68a6a74..e661d0b 100644
--- a/app/pages/clientarea/ai/[id].vue
+++ b/app/pages/clientarea/ai/[id].vue
@@ -1,4 +1,8 @@
 <script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
+
 const localePath = useLocalePath()
 await navigateTo(localePath('/clientarea/ai'))
 </script>
diff --git a/app/pages/clientarea/company-switch.vue b/app/pages/clientarea/company-switch.vue
index e6bd509..0d522f7 100644
--- a/app/pages/clientarea/company-switch.vue
+++ b/app/pages/clientarea/company-switch.vue
@@ -80,6 +80,7 @@
 import { SwitchTeamDocument } from '~/composables/graphql/user/teams-generated'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/goods.vue b/app/pages/clientarea/goods.vue
index 421ae03..d54f447 100644
--- a/app/pages/clientarea/goods.vue
+++ b/app/pages/clientarea/goods.vue
@@ -4,6 +4,7 @@
 
 <script setup>
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 </script>
diff --git a/app/pages/clientarea/kyc/index.vue b/app/pages/clientarea/kyc/index.vue
index 0c5695b..6b8e2ef 100644
--- a/app/pages/clientarea/kyc/index.vue
+++ b/app/pages/clientarea/kyc/index.vue
@@ -94,6 +94,7 @@
 import { GetKycRequestsRussiaDocument } from '~/composables/graphql/user/kyc-generated'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/kyc/russia.vue b/app/pages/clientarea/kyc/russia.vue
index d18ce6b..874160c 100644
--- a/app/pages/clientarea/kyc/russia.vue
+++ b/app/pages/clientarea/kyc/russia.vue
@@ -46,6 +46,7 @@
 import { CreateKycRequestRussiaDocument } from '~/composables/graphql/user/kyc-generated'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/locations.vue b/app/pages/clientarea/locations.vue
index 7c0d131..185a31f 100644
--- a/app/pages/clientarea/locations.vue
+++ b/app/pages/clientarea/locations.vue
@@ -4,6 +4,7 @@
 
 <script setup>
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 </script>
diff --git a/app/pages/clientarea/offers/[uuid].vue b/app/pages/clientarea/offers/[uuid].vue
index 2215beb..fde6d2b 100644
--- a/app/pages/clientarea/offers/[uuid].vue
+++ b/app/pages/clientarea/offers/[uuid].vue
@@ -121,6 +121,7 @@ import { CreateOfferDocument } from '~/composables/graphql/team/exchange-generat
 import { GetTeamAddressesDocument } from '~/composables/graphql/team/teams-generated'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc'],
   validate: (route) => {
     // Exclude 'new' from the dynamic route
diff --git a/app/pages/clientarea/offers/new.vue b/app/pages/clientarea/offers/new.vue
index f37e303..b266846 100644
--- a/app/pages/clientarea/offers/new.vue
+++ b/app/pages/clientarea/offers/new.vue
@@ -54,6 +54,7 @@
 import { GetProductsDocument } from '~/composables/graphql/public/exchange-generated'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/orders/[id].vue b/app/pages/clientarea/orders/[id].vue
index 029407d..f41f5da 100644
--- a/app/pages/clientarea/orders/[id].vue
+++ b/app/pages/clientarea/orders/[id].vue
@@ -50,6 +50,7 @@ import { GetOrderDocument } from '~/composables/graphql/team/orders-generated'
 import type { RouteStageItem } from '~/components/RouteStagesList.vue'
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/profile/debug-tokens.vue b/app/pages/clientarea/profile/debug-tokens.vue
index b29a6fa..c1bfe84 100644
--- a/app/pages/clientarea/profile/debug-tokens.vue
+++ b/app/pages/clientarea/profile/debug-tokens.vue
@@ -173,6 +173,7 @@
 
 <script setup lang="ts">
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/request/[id].vue b/app/pages/clientarea/request/[id].vue
index 24aa8fb..f0cc57b 100644
--- a/app/pages/clientarea/request/[id].vue
+++ b/app/pages/clientarea/request/[id].vue
@@ -2,5 +2,8 @@
   <CalcResultContent />
 </template>
 
-<script setup>
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
 </script>
\ No newline at end of file
diff --git a/app/pages/clientarea/team/invite.vue b/app/pages/clientarea/team/invite.vue
index 2182c6f..67d253b 100644
--- a/app/pages/clientarea/team/invite.vue
+++ b/app/pages/clientarea/team/invite.vue
@@ -62,6 +62,7 @@ const localePath = useLocalePath()
 const router = useRouter()
 
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/clientarea/team/new.vue b/app/pages/clientarea/team/new.vue
index b58fae0..9ba5a1a 100644
--- a/app/pages/clientarea/team/new.vue
+++ b/app/pages/clientarea/team/new.vue
@@ -5,6 +5,7 @@
 <script setup lang="ts">
 // Ручное создание команды убрано — команды создаются автоматически после KYC
 definePageMeta({
+  layout: 'topnav',
   middleware: ['auth-oidc']
 })
 
diff --git a/app/pages/goods.vue b/app/pages/goods.vue
index b5e0c5c..dbc7b3c 100644
--- a/app/pages/goods.vue
+++ b/app/pages/goods.vue
@@ -3,3 +3,9 @@
     <GoodsContent />
   </Section>
 </template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
+</script>
diff --git a/app/pages/locations.vue b/app/pages/locations.vue
index 4f71f2d..01564b8 100644
--- a/app/pages/locations.vue
+++ b/app/pages/locations.vue
@@ -3,3 +3,9 @@
     <LocationsContent />
   </Section>
 </template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
+</script>
diff --git a/app/pages/request/[id].vue b/app/pages/request/[id].vue
index a9970e0..fde4d25 100644
--- a/app/pages/request/[id].vue
+++ b/app/pages/request/[id].vue
@@ -3,3 +3,9 @@
     <CalcResultContent />
   </Section>
 </template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
+</script>
diff --git a/app/pages/request/index.vue b/app/pages/request/index.vue
index a9970e0..fde4d25 100644
--- a/app/pages/request/index.vue
+++ b/app/pages/request/index.vue
@@ -3,3 +3,9 @@
     <CalcResultContent />
   </Section>
 </template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
+</script>
diff --git a/app/pages/search/index.vue b/app/pages/search/index.vue
index bd95705..77a0e82 100644
--- a/app/pages/search/index.vue
+++ b/app/pages/search/index.vue
@@ -29,7 +29,10 @@
   </Stack>
 </template>
 
-<script setup>
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
 
 const localePath = useLocalePath()
 const { t } = useI18n()
diff --git a/app/pages/select-location/index.vue b/app/pages/select-location/index.vue
index 67eaa09..bf32c5d 100644
--- a/app/pages/select-location/index.vue
+++ b/app/pages/select-location/index.vue
@@ -86,6 +86,10 @@
 <script setup lang="ts">
 import { useLocationStore } from '~/stores/location'
 
+definePageMeta({
+  layout: 'topnav'
+})
+
 const router = useRouter()
 const route = useRoute()
 const { t } = useI18n()
diff --git a/app/pages/supplier/[id].vue b/app/pages/supplier/[id].vue
index 8d95159..ce58f90 100644
--- a/app/pages/supplier/[id].vue
+++ b/app/pages/supplier/[id].vue
@@ -160,7 +160,10 @@
   </Section>
 </template>
 
-<script setup>
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
 
 const route = useRoute()
 const localePath = useLocalePath()
diff --git a/app/pages/test-gantt.vue b/app/pages/test-gantt.vue
index 059a1df..612472d 100644
--- a/app/pages/test-gantt.vue
+++ b/app/pages/test-gantt.vue
@@ -44,7 +44,11 @@
   </Section>
 </template>
 
-<script setup>
+<script setup lang="ts">
+definePageMeta({
+  layout: 'topnav'
+})
+
 const timelineGroups = [
   { id: 'group1', label: 'Stage 1' },
   { id: 'group2', label: 'Stage 2' }