diff --git a/src/components/Autocomplete/Autocomplete.vue b/src/components/Autocomplete/Autocomplete.global.vue
similarity index 100%
rename from src/components/Autocomplete/Autocomplete.vue
rename to src/components/Autocomplete/Autocomplete.global.vue
diff --git a/src/components/Autocomplete/AutocompleteOtu.vue b/src/components/Autocomplete/AutocompleteOtu.global.vue
similarity index 97%
rename from src/components/Autocomplete/AutocompleteOtu.vue
rename to src/components/Autocomplete/AutocompleteOtu.global.vue
index f18d3cc..d4a38ae 100644
--- a/src/components/Autocomplete/AutocompleteOtu.vue
+++ b/src/components/Autocomplete/AutocompleteOtu.global.vue
@@ -10,7 +10,7 @@
 
 <script setup>
 import { useRouter } from 'vue-router'
-import Autocomplete from '@/components/Autocomplete/Autocomplete.vue'
+import Autocomplete from '@/components/Autocomplete/Autocomplete.global.vue'
 
 const router = useRouter()
 
diff --git a/src/components/Button/ButtonExpand.vue b/src/components/Button/ButtonExpand.global.vue
similarity index 100%
rename from src/components/Button/ButtonExpand.vue
rename to src/components/Button/ButtonExpand.global.vue
diff --git a/src/components/Card/VCard.vue b/src/components/Card/VCard.global.vue
similarity index 100%
rename from src/components/Card/VCard.vue
rename to src/components/Card/VCard.global.vue
diff --git a/src/components/Card/VCardContent.vue b/src/components/Card/VCardContent.global.vue
similarity index 100%
rename from src/components/Card/VCardContent.vue
rename to src/components/Card/VCardContent.global.vue
diff --git a/src/components/Card/VCardHeader.vue b/src/components/Card/VCardHeader.global.vue
similarity index 100%
rename from src/components/Card/VCardHeader.vue
rename to src/components/Card/VCardHeader.global.vue
diff --git a/src/components/Gallery/GalleryImage.vue b/src/components/Gallery/GalleryImage.global.vue
similarity index 100%
rename from src/components/Gallery/GalleryImage.vue
rename to src/components/Gallery/GalleryImage.global.vue
diff --git a/src/components/Gallery/GalleryThumbnail.vue b/src/components/Gallery/GalleryThumbnail.vue
index f309d64..94a8373 100644
--- a/src/components/Gallery/GalleryThumbnail.vue
+++ b/src/components/Gallery/GalleryThumbnail.vue
@@ -1,10 +1,10 @@
 <template>
   <div 
-    class="bg-white dark:bg-gray-800 flex flex-col justify-center cursor-pointer w-24 h-20 dark:border-gray-600 rounded border box-border"
+    class="bg-white dark:bg-gray-800 flex flex-col justify-center cursor-pointer w-24 max-h-20 h-20 dark:border-gray-600 rounded border-2"
     :title="title"
   >
     <img 
-      class="max-h-24 max-w-24 h-24 w-24 object-cover rounded"
+      class="max-h-20 max-w-24 h-20 w-24 object-cover rounded"
       :src="image.thumb"
     >
   </div>
diff --git a/src/components/Gallery/GalleryThumbnailList.vue b/src/components/Gallery/GalleryThumbnailList.vue
index 4d6d2a4..d814a3a 100644
--- a/src/components/Gallery/GalleryThumbnailList.vue
+++ b/src/components/Gallery/GalleryThumbnailList.vue
@@ -18,6 +18,8 @@
 </template>
 
 <script setup>
+import GalleryThumbnail from './GalleryThumbnail.vue'
+
 defineProps({
   images: {
     type: Array,
diff --git a/src/components/Icon/IconClose.vue b/src/components/Icon/IconClose.global.vue
similarity index 100%
rename from src/components/Icon/IconClose.vue
rename to src/components/Icon/IconClose.global.vue
diff --git a/src/components/Gallery/ControlImageNext.vue b/src/components/ImageViewer/ControlImageNext.vue
similarity index 99%
rename from src/components/Gallery/ControlImageNext.vue
rename to src/components/ImageViewer/ControlImageNext.vue
index 8e40a14..c0bb3d7 100644
--- a/src/components/Gallery/ControlImageNext.vue
+++ b/src/components/ImageViewer/ControlImageNext.vue
@@ -20,5 +20,6 @@
     </svg>
   </button>
 </template>
+
 <script setup>
 </script>
diff --git a/src/components/Gallery/ControlImagePrevious.vue b/src/components/ImageViewer/ControlImagePrevious.vue
similarity index 100%
rename from src/components/Gallery/ControlImagePrevious.vue
rename to src/components/ImageViewer/ControlImagePrevious.vue
diff --git a/src/components/Gallery/ImageAttribution.vue b/src/components/ImageViewer/ImageAttribution.vue
similarity index 100%
rename from src/components/Gallery/ImageAttribution.vue
rename to src/components/ImageViewer/ImageAttribution.vue
diff --git a/src/components/Gallery/ImageDepictions.vue b/src/components/ImageViewer/ImageDepictions.vue
similarity index 100%
rename from src/components/Gallery/ImageDepictions.vue
rename to src/components/ImageViewer/ImageDepictions.vue
diff --git a/src/components/Gallery/ImageToolbar.vue b/src/components/ImageViewer/ImageToolbar.vue
similarity index 79%
rename from src/components/Gallery/ImageToolbar.vue
rename to src/components/ImageViewer/ImageToolbar.vue
index 27d3a50..6222b4c 100644
--- a/src/components/Gallery/ImageToolbar.vue
+++ b/src/components/ImageViewer/ImageToolbar.vue
@@ -5,7 +5,7 @@
     </div>
     <button
       type="button"
-      class="p-2  cursor-pointer text-white opacity-50 "
+      class="p-2 cursor-pointer text-white opacity-50 "
     >
       <IconClose />
     </button>
diff --git a/src/components/Gallery/ImageViewer.vue b/src/components/ImageViewer/ImageViewer.global.vue
similarity index 97%
rename from src/components/Gallery/ImageViewer.vue
rename to src/components/ImageViewer/ImageViewer.global.vue
index 8a1a896..1193c43 100644
--- a/src/components/Gallery/ImageViewer.vue
+++ b/src/components/ImageViewer/ImageViewer.global.vue
@@ -77,6 +77,7 @@ import ImageDepictions from './ImageDepictions.vue'
 import ImageViewerCounter from './ImageViewerCounter.vue'
 import ControlNextImage from './ControlImageNext.vue'
 import ControlPreviousImage from './ControlImagePrevious.vue'
+import GalleryThumbnailList from '@/components/Gallery/GalleryThumbnailList.vue'
 import ImageToolbar from './ImageToolbar.vue'
 
 const props = defineProps({
diff --git a/src/components/Gallery/ImageViewerCounter.vue b/src/components/ImageViewer/ImageViewerCounter.vue
similarity index 67%
rename from src/components/Gallery/ImageViewerCounter.vue
rename to src/components/ImageViewer/ImageViewerCounter.vue
index 7551ac4..f94181c 100644
--- a/src/components/Gallery/ImageViewerCounter.vue
+++ b/src/components/ImageViewer/ImageViewerCounter.vue
@@ -1,5 +1,5 @@
 <template>
-  <span>{{ currentImage + 1 }}/{{ totalImages }}</span>
+  <span class="p-2 text-white opacity-50">{{ currentImage + 1 }}/{{ totalImages }}</span>
 </template>
 
 <script setup>
diff --git a/src/components/Map/VMap.vue b/src/components/Map/VMap.global.vue
similarity index 100%
rename from src/components/Map/VMap.vue
rename to src/components/Map/VMap.global.vue
diff --git a/src/components/Menu/MenuList.vue b/src/components/Menu/MenuList.global.vue
similarity index 100%
rename from src/components/Menu/MenuList.vue
rename to src/components/Menu/MenuList.global.vue
diff --git a/src/components/Tab/TabItem.vue b/src/components/Tab/TabItem.global.vue
similarity index 100%
rename from src/components/Tab/TabItem.vue
rename to src/components/Tab/TabItem.global.vue
diff --git a/src/components/Tab/TabMenu.vue b/src/components/Tab/TabMenu.global.vue
similarity index 100%
rename from src/components/Tab/TabMenu.vue
rename to src/components/Tab/TabMenu.global.vue
diff --git a/src/components/TreeView.vue b/src/components/TreeView.vue
index 7acbbb4..affeb5d 100644
--- a/src/components/TreeView.vue
+++ b/src/components/TreeView.vue
@@ -37,7 +37,6 @@
 <script setup>
 import TreeView from '@/components/TreeView.vue'
 import SynonymList from './SynonymList.vue'
-import ButtonExpand from '@/components/Button/ButtonExpand.vue'
 import OtuService from '@/modules/otus/services/OtuService';
 import { ref, watch } from 'vue'
 
diff --git a/src/components/VSpinner.vue b/src/components/VSpinner.global.vue
similarity index 100%
rename from src/components/VSpinner.vue
rename to src/components/VSpinner.global.vue
diff --git a/src/components/globalComponents.js b/src/components/globalComponents.js
index c017950..eadadc6 100644
--- a/src/components/globalComponents.js
+++ b/src/components/globalComponents.js
@@ -1,8 +1,8 @@
-const components = import.meta.globEager('@/components/**/*.vue')
+const components = import.meta.globEager('@/components/**/*.global.vue')
 
 const register = app => {
   Object.entries(components).forEach(([path, definition]) => {
-    const componentName = path.split('/').pop().replace(/\.\w+$/, '')
+    const componentName = path.split('/').pop().replace(/\.global.\w+$/, '')
 
     app.component(componentName, definition.default)
   })
diff --git a/src/modules/otus/components/Map.vue b/src/modules/otus/components/Map.vue
index 85729e0..5fa64f1 100644
--- a/src/modules/otus/components/Map.vue
+++ b/src/modules/otus/components/Map.vue
@@ -1,22 +1,19 @@
 <template>
   <VCard>
-
-      <VSpinner v-if="isLoading" />
-      <VMap
-        ref="map"
-        class="h-96 max-h-96"
-        :zoom="zoom"
-        :geojson="geojson"
-        @geojson:ready="isLoading = false"
-      />
-
+    <VSpinner v-if="isLoading" />
+    <VMap
+      ref="map"
+      class="h-96 max-h-96"
+      :zoom="zoom"
+      :geojson="geojson"
+      @geojson:ready="isLoading = false"
+    />
   </VCard>
 </template>
 
 <script setup>
-import { ref, watch } from "vue";
-import VMap from '@/components/Map/VMap.vue'
-import OtuService from "../services/OtuService";
+import { ref, watch } from "vue"
+import OtuService from "../services/OtuService"
 
 const props = defineProps({
   otuId: {
diff --git a/src/modules/otus/views/Index.vue b/src/modules/otus/views/Index.vue
index 5447c9e..3212b92 100644
--- a/src/modules/otus/views/Index.vue
+++ b/src/modules/otus/views/Index.vue
@@ -53,7 +53,8 @@
 
         <TabMenu
           v-if="tabs.length"
-          class="m-[-1px] print:hidden">
+          class="m-[-1px] print:hidden"
+        >
           <TabItem
             v-for="({ name, label }) in tabs"
             :key="name"
@@ -82,10 +83,7 @@
 
 import { ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import TabMenu from '@/components/Tab/TabMenu.vue'
-import TabItem from '@/components/Tab/TabItem.vue'
 import Breadcrumb from '@/components/Breadcrumb.vue'
-import Autocomplete from '@/components/Autocomplete/Autocomplete.vue'
 import TaxaInfo from '@/modules/otus/components/TaxaInfo.vue'
 import useChildrenRoutes from '../composables/useChildrenRoutes'
 import OtuService from '../services/OtuService'