diff --git a/src/components/notifications/DiplomaticNotifications.vue b/src/components/notifications/DiplomaticNotifications.vue
index fe12e4c..c6bc691 100644
--- a/src/components/notifications/DiplomaticNotifications.vue
+++ b/src/components/notifications/DiplomaticNotifications.vue
@@ -19,7 +19,7 @@
           {{ t('diplomacy.markAllRead') }}
         </Button>
       </div>
-      <ScrollArea class="h-auto max-h-96">
+      <ScrollArea class="h-auto max-h-96 overflow-y-auto">
         <Empty v-if="allNotifications.length === 0" class="border-0">
           <EmptyContent>
             <ScrollText class="h-10 w-10 text-muted-foreground" />
diff --git a/src/components/notifications/EnemyAlertNotifications.vue b/src/components/notifications/EnemyAlertNotifications.vue
index e9e33c2..2558f00 100644
--- a/src/components/notifications/EnemyAlertNotifications.vue
+++ b/src/components/notifications/EnemyAlertNotifications.vue
@@ -19,7 +19,7 @@
           {{ t('enemyAlert.markAllRead') }}
         </Button>
       </div>
-      <ScrollArea class="h-auto max-h-96">
+      <ScrollArea class="h-auto max-h-96 overflow-y-auto">
         <Empty v-if="activeAlerts.length === 0" class="border-0">
           <EmptyContent>
             <Shield class="h-10 w-10 text-muted-foreground" />
diff --git a/src/components/notifications/QueueNotifications.vue b/src/components/notifications/QueueNotifications.vue
index fb0dec7..1b6a0a5 100644
--- a/src/components/notifications/QueueNotifications.vue
+++ b/src/components/notifications/QueueNotifications.vue
@@ -32,7 +32,7 @@
           </TabsTrigger>
         </TabsList>
 
-        <ScrollArea class="h-auto max-h-96">
+        <ScrollArea class="h-auto max-h-96 overflow-y-auto">
           <TabsContent v-for="tab in tabConfig" :key="tab.value" :value="tab.value" class="mt-0">
             <Empty v-if="tab.items.length === 0" class="border-0">
               <EmptyContent>
@@ -63,7 +63,9 @@
                         class="text-[10px] sm:text-xs whitespace-nowrap"
                         :class="isWaitingItemResourcesReady(item as WaitingQueueItem) ? 'text-green-500' : 'text-yellow-500'"
                       >
-                        {{ isWaitingItemResourcesReady(item as WaitingQueueItem) ? t('queue.resourcesReady') : t('queue.waitingResources') }}
+                        {{
+                          isWaitingItemResourcesReady(item as WaitingQueueItem) ? t('queue.resourcesReady') : t('queue.waitingResources')
+                        }}
                       </span>
                       <Button
                         variant="ghost"
@@ -146,8 +148,8 @@
   import { useI18n } from '@/composables/useI18n'
   import { formatTime, formatNumber } from '@/utils/format'
   import type { BuildQueueItem, WaitingQueueItem, BuildingType, ShipType, DefenseType, TechnologyType, Resources } from '@/types/game'
-import * as waitingQueueLogic from '@/logic/waitingQueueLogic'
-import * as resourceLogic from '@/logic/resourceLogic'
+  import * as waitingQueueLogic from '@/logic/waitingQueueLogic'
+  import * as resourceLogic from '@/logic/resourceLogic'
 
   const { t } = useI18n()
   const gameStore = useGameStore()
diff --git a/src/locales/de.ts b/src/locales/de.ts
index 0505d8d..386ed64 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -157,6 +157,10 @@ export default {
     build: 'Bauen',
     production: 'Produktion',
     consumption: 'Verbrauch',
+    levelRange: 'Stufenbereich',
+    totalCost: 'Gesamtkosten',
+    totalPoints: 'Gesamtpunkte',
+    researchSpeedBonus: 'Forschungsgeschwindigkeitsbonus',
     capacity: 'Capacity/Effect',
     storageCapacity: 'Capacity',
     energyProduction: 'Energy Production',
@@ -265,6 +269,9 @@ export default {
   },
   research: {
     researchTime: 'Forschungszeit',
+    levelRange: 'Stufenbereich',
+    totalCost: 'Gesamtkosten',
+    totalPoints: 'Gesamtpunkte',
     capacity: 'Capacity/Effect',
     storageCapacity: 'Capacity',
     energyProduction: 'Energy Production',
@@ -417,10 +424,20 @@ export default {
       'Bitte überprüfen Sie, ob Sie genügend Ressourcen haben, die Voraussetzungen erfüllt sind oder keine anderen Forschungsaufträge vorhanden sind.'
   },
   shipyard: {
+    attack: 'Angriff',
+    shield: 'Schild',
+    armor: 'Panzerung',
     missileAttack: 'Raketenangriff',
     speed: 'Geschwindigkeit',
     cargoCapacity: 'Ladekapazität',
-    fuelConsumption: 'Treibstoffverbrauch'
+    fuelConsumption: 'Treibstoffverbrauch',
+    buildCost: 'Baukosten',
+    buildTime: 'Bauzeit',
+    perUnit: 'Pro Einheit',
+    batchCalculator: 'Stapelrechner',
+    quantity: 'Menge',
+    totalCost: 'Gesamtkosten',
+    totalTime: 'Gesamtzeit'
   },
   shipyardView: {
     title: 'Raumschiffwerft',
diff --git a/src/locales/en.ts b/src/locales/en.ts
index a2fa5f5..eb38deb 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -155,6 +155,10 @@ export default {
     buildTime: 'Build Time',
     production: 'Production',
     consumption: 'Consumption',
+    levelRange: 'Level Range',
+    totalCost: 'Total Cost',
+    totalPoints: 'Total Points',
+    researchSpeedBonus: 'Research Speed Bonus',
 
     storageCapacity: 'Capacity',
     energyProduction: 'Energy Production',
@@ -260,6 +264,9 @@ export default {
   },
   research: {
     researchTime: 'Research Time',
+    levelRange: 'Level Range',
+    totalCost: 'Total Cost',
+    totalPoints: 'Total Points',
 
     attackBonus: 'Attack Bonus',
     shieldBonus: 'Shield Bonus',
@@ -403,10 +410,20 @@ export default {
     researchFailedMessage: 'Please check if you have enough resources, prerequisites are met, or if there are other research tasks.'
   },
   shipyard: {
+    attack: 'Attack',
+    shield: 'Shield',
+    armor: 'Armor',
     missileAttack: 'Missile Attack',
     speed: 'Speed',
     cargoCapacity: 'Cargo Capacity',
-    fuelConsumption: 'Fuel Consumption'
+    fuelConsumption: 'Fuel Consumption',
+    buildCost: 'Build Cost',
+    buildTime: 'Build Time',
+    perUnit: 'Per Unit',
+    batchCalculator: 'Batch Calculator',
+    quantity: 'Quantity',
+    totalCost: 'Total Cost',
+    totalTime: 'Total Time'
   },
   shipyardView: {
     title: 'Shipyard',
@@ -426,7 +443,17 @@ export default {
     buildFailedMessage: 'Please check if you have enough resources or if prerequisites are met.'
   },
   defense: {
-    missileAttack: 'Missile Attack'
+    attack: 'Attack',
+    shield: 'Shield',
+    armor: 'Armor',
+    missileAttack: 'Missile Attack',
+    buildCost: 'Build Cost',
+    buildTime: 'Build Time',
+    perUnit: 'Per Unit',
+    batchCalculator: 'Batch Calculator',
+    quantity: 'Quantity',
+    totalCost: 'Total Cost',
+    totalTime: 'Total Time'
   },
   defenseView: {
     title: 'Defense',
diff --git a/src/locales/es-LA.ts b/src/locales/es-LA.ts
index c21f46b..3a88e83 100644
--- a/src/locales/es-LA.ts
+++ b/src/locales/es-LA.ts
@@ -155,6 +155,10 @@ export default {
     buildTime: 'Tiempo de Construcción',
     production: 'Producción',
     consumption: 'Consumo',
+    levelRange: 'Rango de Nivel',
+    totalCost: 'Costo Total',
+    totalPoints: 'Puntos Totales',
+    researchSpeedBonus: 'Bono de Velocidad de Investigación',
 
     storageCapacity: 'Capacidad',
     energyProduction: 'Producción de Energía',
@@ -411,10 +415,20 @@ export default {
       'Por favor verifica si tienes suficientes recursos, si se cumplen los prerrequisitos, o si hay otras tareas de investigación.'
   },
   shipyard: {
+    attack: 'Ataque',
+    shield: 'Escudo',
+    armor: 'Blindaje',
     missileAttack: 'Ataque de Misil',
     speed: 'Velocidad',
     cargoCapacity: 'Capacidad de Carga',
-    fuelConsumption: 'Consumo de Combustible'
+    fuelConsumption: 'Consumo de Combustible',
+    buildCost: 'Costo de Construcción',
+    buildTime: 'Tiempo de Construcción',
+    perUnit: 'Por Unidad',
+    batchCalculator: 'Calculadora de Lotes',
+    quantity: 'Cantidad',
+    totalCost: 'Costo Total',
+    totalTime: 'Tiempo Total'
   },
   shipyardView: {
     title: 'Astillero',
diff --git a/src/locales/ko.ts b/src/locales/ko.ts
index cba87d1..948e717 100644
--- a/src/locales/ko.ts
+++ b/src/locales/ko.ts
@@ -409,9 +409,19 @@ export default {
     researchFailedMessage: '자원이 충분한지, 전제 조건이 충족되었는지, 또는 다른 연구 작업이 있는지 확인하세요.'
   },
   shipyard: {
+    attack: '공격력',
+    shield: '실드',
+    armor: '장갑',
     speed: '속도',
     cargoCapacity: '화물 용량',
-    fuelConsumption: '연료 소비'
+    fuelConsumption: '연료 소비',
+    buildCost: '건조 비용',
+    buildTime: '건조 시간',
+    perUnit: '단위당',
+    batchCalculator: '일괄 계산기',
+    quantity: '수량',
+    totalCost: '총 비용',
+    totalTime: '총 시간'
   },
   shipyardView: {
     title: '조선소',
diff --git a/src/locales/ru.ts b/src/locales/ru.ts
index 89316a3..e5066f2 100644
--- a/src/locales/ru.ts
+++ b/src/locales/ru.ts
@@ -161,6 +161,7 @@ export default {
     totalCost: 'Общая стоимость',
     totalPoints: 'Общие очки',
     levelRange: 'Диапазон уровней',
+    researchSpeedBonus: 'Бонус скорости исследований',
     capacity: 'Capacity/Effect',
     storageCapacity: 'Capacity',
     energyProduction: 'Energy Production',
@@ -269,6 +270,9 @@ export default {
   },
   research: {
     researchTime: 'Время исследования',
+    levelRange: 'Диапазон уровней',
+    totalCost: 'Общая стоимость',
+    totalPoints: 'Всего очков',
     capacity: 'Capacity/Effect',
     storageCapacity: 'Capacity',
     energyProduction: 'Energy Production',
@@ -424,9 +428,19 @@ export default {
       'Пожалуйста, проверьте, достаточно ли у вас ресурсов, выполнены ли предварительные условия или нет других исследовательских задач.'
   },
   shipyard: {
+    attack: 'Атака',
+    shield: 'Щит',
+    armor: 'Броня',
     speed: 'Скорость',
     cargoCapacity: 'Грузоподъёмность',
-    fuelConsumption: 'Расход топлива'
+    fuelConsumption: 'Расход топлива',
+    buildCost: 'Стоимость постройки',
+    buildTime: 'Время постройки',
+    perUnit: 'За единицу',
+    batchCalculator: 'Калькулятор партии',
+    quantity: 'Количество',
+    totalCost: 'Общая стоимость',
+    totalTime: 'Общее время'
   },
   shipyardView: {
     title: 'Верфь',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 8ad8df2..f988ede 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -264,6 +264,9 @@ export default {
   },
   research: {
     researchTime: '研究时间',
+    levelRange: '等级范围',
+    totalCost: '总成本',
+    totalPoints: '总积分',
 
     attackBonus: '攻击加成',
     shieldBonus: '护盾加成',
@@ -405,9 +408,19 @@ export default {
     researchFailedMessage: '请检查资源是否足够、前置条件是否满足，或是否有其他研究任务。'
   },
   shipyard: {
+    attack: '攻击力',
+    shield: '护盾',
+    armor: '装甲',
     speed: '速度',
     cargoCapacity: '载货量',
-    fuelConsumption: '燃料消耗'
+    fuelConsumption: '燃料消耗',
+    buildCost: '建造成本',
+    buildTime: '建造时间',
+    perUnit: '单位',
+    batchCalculator: '批量计算器',
+    quantity: '数量',
+    totalCost: '总成本',
+    totalTime: '总时间'
   },
   shipyardView: {
     title: '船坞',
diff --git a/src/locales/zh-TW.ts b/src/locales/zh-TW.ts
index 21b18a1..b1fd272 100644
--- a/src/locales/zh-TW.ts
+++ b/src/locales/zh-TW.ts
@@ -270,6 +270,9 @@ export default {
   },
   research: {
     researchTime: '研究時間',
+    levelRange: '等級範圍',
+    totalCost: '總成本',
+    totalPoints: '總積分',
     capacity: '容量/效果',
     attackBonus: '攻擊加成',
     shieldBonus: '護盾加成',
@@ -414,11 +417,20 @@ export default {
     researchFailedMessage: '請檢查資源是否足夠、前置條件是否滿足，或是否有其他研究任務。'
   },
   shipyard: {
-    missileAttack: '導彈攻擊',
+    attack: '攻擊力',
+    shield: '護盾',
     armor: '裝甲',
+    missileAttack: '導彈攻擊',
     speed: '速度',
     cargoCapacity: '載貨量',
     fuelConsumption: '燃料消耗',
+    buildCost: '建造成本',
+    buildTime: '建造時間',
+    perUnit: '單位',
+    batchCalculator: '批量計算器',
+    quantity: '數量',
+    totalCost: '總成本',
+    totalTime: '總時間',
     build: '建造'
   },
   shipyardView: {