diff --git a/frontend/src/components/falukant/MessagesDialog.vue b/frontend/src/components/falukant/MessagesDialog.vue
index 52b1b24..36ecd11 100644
--- a/frontend/src/components/falukant/MessagesDialog.vue
+++ b/frontend/src/components/falukant/MessagesDialog.vue
@@ -5,45 +5,69 @@
     :title="'falukant.messages.title'"
     :isTitleTranslated="true"
     icon="falukant/messages24.png"
-  :buttons="[
-    { text: 'falukant.messages.markAllRead', action: 'markAll' },
-    { text: 'message.close', action: 'close' }
-  ]"
+    :buttons="dialogButtons"
     width="520px"
     height="420px"
   >
     <ul class="messages">
       <li v-for="n in messages" :key="n.id" :class="{ unread: !n.shown }">
         <div class="body">
-          <div v-if="formatBody(n).title" class="notification-title">{{ formatBody(n).title }}</div>
+          <div v-if="formatBody(n).title" class="notification-title">
+            {{ formatBody(n).title }}
+          </div>
           <div class="notification-description" v-html="formatBody(n).description || formatBody(n)"></div>
         </div>
         <div class="footer">
           <span>{{ formatDate(n.createdAt) }}</span>
         </div>
       </li>
-      <li v-if="messages.length === 0" class="empty">{{ $t('falukant.messages.empty') }}</li>
+      <li v-if="messages.length === 0" class="empty">
+        {{ $t('falukant.messages.empty') }}
+      </li>
     </ul>
     <div class="pagination" v-if="total > size">
       <button @click="firstPage" :disabled="!canPrev">«</button>
       <button @click="prevPage" :disabled="!canPrev">‹</button>
       <span>
-        <input type="number" min="1" :max="totalPages" v-model.number="pageInput" @change="goToPage(pageInput)" />
+        <input 
+          type="number" 
+          min="1" 
+          :max="totalPages" 
+          v-model.number="pageInput" 
+          @change="goToPage(pageInput)" 
+        />
         / {{ totalPages }}
       </span>
       <button @click="nextPage" :disabled="!canNext">›</button>
       <button @click="lastPage" :disabled="!canNext">»</button>
     </div>
   </DialogWidget>
-  </template>
+</template>
 
 <script>
 import DialogWidget from '@/components/DialogWidget.vue';
 import apiClient from '@/utils/axios.js';
 
+// Konstanten
+const NOTIFICATION_NAMESPACE = 'falukant.notifications.';
+const RANDOM_EVENT_PREFIX = 'falukant.notifications.random_event.';
+const FALUKANT_PREFIX = 'falukant.';
+
+// Effect-Typen
+const EFFECT_TYPES = {
+  MONEY_CHANGE: 'money_change',
+  CHARACTER_HEALTH_CHANGE: 'character_health_change',
+  CHARACTER_DEATH: 'character_death',
+  STORAGE_DAMAGE: 'storage_damage',
+  PRODUCTION_QUALITY_CHANGE: 'production_quality_change',
+  TRANSPORT_SPEED_CHANGE: 'transport_speed_change',
+  STORAGE_CAPACITY_CHANGE: 'storage_capacity_change',
+};
+
 export default {
   name: 'FalukantMessagesDialog',
   components: { DialogWidget },
+  
   data() {
     return {
       messages: [],
@@ -51,19 +75,47 @@ export default {
       size: 10,
       total: 0,
       pageInput: 1,
-      branches: [], // Cache für Branch-Namen
+      branches: [],
     };
   },
+
+  computed: {
+    totalPages() {
+      return Math.max(1, Math.ceil(this.total / this.size));
+    },
+    canPrev() {
+      return this.page > 1;
+    },
+    canNext() {
+      return this.page < this.totalPages;
+    },
+    dialogButtons() {
+      return [
+        { text: 'falukant.messages.markAllRead', action: 'markAll' },
+        { text: 'message.close', action: 'close' }
+      ];
+    },
+  },
+
   methods: {
+    // ==================== Dialog Management ====================
     async open() {
-      this.page = 1;
-      this.pageInput = 1;
-      await this.loadBranches(); // Branches laden für Branch-Namen
+      this.resetPagination();
+      await this.loadBranches();
       await this.load();
       this.$refs.dlg.open();
-      // mark unread as shown
-      try { await apiClient.post('/api/falukant/notifications/mark-shown'); } catch {}
+      await this.markNotificationsAsShown();
     },
+
+    async markNotificationsAsShown() {
+      try {
+        await apiClient.post('/api/falukant/notifications/mark-shown');
+      } catch (error) {
+        // Silent fail - nicht kritisch
+      }
+    },
+
+    // ==================== Data Loading ====================
     async loadBranches() {
       try {
         const result = await apiClient.get('/api/falukant/branches');
@@ -76,18 +128,13 @@ export default {
         this.branches = [];
       }
     },
-    async markAll() {
-      try {
-        await apiClient.post('/api/falukant/notifications/mark-shown');
-        // reload to update shown flags and unread count
-        await this.load();
-      } catch (e) {
-        // ignore errors silently
-      }
-    },
+
     async load() {
       try {
-        const { data } = await apiClient.get('/api/falukant/notifications/all', { params: { page: this.page, size: this.size } });
+        const { data } = await apiClient.get('/api/falukant/notifications/all', {
+          params: { page: this.page, size: this.size }
+        });
+        
         if (data && Array.isArray(data.items)) {
           this.messages = data.items;
           this.total = data.total || 0;
@@ -95,197 +142,467 @@ export default {
           this.messages = Array.isArray(data) ? data : [];
           this.total = this.messages.length;
         }
-      } catch (e) {
-        console.error('Failed to load messages', e);
+      } catch (error) {
+        console.error('Failed to load messages', error);
         this.messages = [];
         this.total = 0;
       }
     },
+
+    async markAll() {
+      try {
+        await apiClient.post('/api/falukant/notifications/mark-shown');
+        await this.load();
+      } catch (error) {
+        // Silent fail
+      }
+    },
+
+    // ==================== Pagination ====================
+    resetPagination() {
+      this.page = 1;
+      this.pageInput = 1;
+    },
+
+    setPage(newPage) {
+      this.page = newPage;
+      this.pageInput = newPage;
+      this.load();
+    },
+
     nextPage() {
-      if (this.page < this.totalPages) {
-        this.page++;
-        this.pageInput = this.page;
-        this.load();
+      if (this.canNext) {
+        this.setPage(this.page + 1);
       }
     },
+
     prevPage() {
-      if (this.page > 1) {
-        this.page--;
-        this.pageInput = this.page;
-        this.load();
+      if (this.canPrev) {
+        this.setPage(this.page - 1);
       }
     },
+
     firstPage() {
       if (this.page !== 1) {
-        this.page = 1;
-        this.pageInput = 1;
-        this.load();
+        this.setPage(1);
       }
     },
+
     lastPage() {
       if (this.page !== this.totalPages) {
-        this.page = this.totalPages;
-        this.pageInput = this.page;
-        this.load();
+        this.setPage(this.totalPages);
       }
     },
+
     goToPage(val) {
-      let v = Number(val) || 1;
-      if (v < 1) v = 1;
-      if (v > this.totalPages) v = this.totalPages;
-      if (v !== this.page) {
-        this.page = v;
-        this.pageInput = v;
-        this.load();
+      const page = Math.max(1, Math.min(this.totalPages, Number(val) || 1));
+      if (page !== this.page) {
+        this.setPage(page);
       } else {
-        this.pageInput = v;
+        this.pageInput = page;
       }
     },
-    formatDate(dt) {
+
+    // ==================== Formatting ====================
+    formatDate(dateTime) {
       try {
-        return new Date(dt).toLocaleString();
-      } catch { return dt; }
+        return new Date(dateTime).toLocaleString();
+      } catch (error) {
+        return dateTime;
+      }
     },
-    formatBody(n) {
-      let raw = n.tr || '';
-      let parsed = null;
-      let value = null;
-      let key = raw;
-      let params = {};
 
-      // 1) Parse JSON-Format: {"tr":"random_event.character_illness","value":{...}}
-      if (typeof raw === 'string') {
-        const trimmed = raw.trim();
-        if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
-          try {
-            parsed = JSON.parse(trimmed);
-            if (parsed && parsed.tr) {
-              key = parsed.tr;
-              value = parsed.value || {};
-              
-              // Extrahiere Parameter aus value und effects
-              params = this.extractParamsFromValue(value, n);
-              
-              // Wenn value eine einfache Zahl ist (z.B. für overproduction), als value-Parameter verwenden
-              if (typeof parsed.value === 'number') {
-                params.value = parsed.value;
-              }
-              
-              // Wenn kein value-Objekt vorhanden ist, extrahiere Parameter direkt aus parsed
-              // (z.B. für character_illness, character_recovery, character_accident)
-              if (!parsed.value || Object.keys(value).length === 0) {
-                // Extrahiere Parameter direkt aus parsed (außer 'tr')
-                const directParams = { ...parsed };
-                delete directParams.tr;
-                delete directParams.value;
-                // Verwende formatParams, um die Parameter zu formatieren
-                const formattedDirectParams = this.formatParams(directParams);
-                // Merge mit bereits extrahierten Parametern (value hat Vorrang)
-                params = { ...formattedDirectParams, ...params };
-                // Backend-aufgelöster Name hat höchste Priorität
-                if (n.characterName) {
-                  params.characterName = n.characterName;
-                }
-              }
-              
-              // Weitere Parameter aus parsed extrahieren (z.B. branch_id)
-              if (parsed.branch_id !== undefined) {
-                params.branch_id = parsed.branch_id;
-              }
-              if (parsed.region_id !== undefined) {
-                params.region_id = parsed.region_id;
-              }
-            }
-          } catch (e) {
-            // Bei Parse-Fehler: Alte Struktur unterstützen
-            try {
-              parsed = JSON.parse(trimmed);
-              if (parsed && parsed.tr) {
-                key = parsed.tr;
-                params = this.formatParams({ ...parsed });
-                delete params.tr;
-              }
-            } catch (e2) {
-              // Ignore parse errors
-            }
-          }
+    formatBody(notification) {
+      const parsedData = this.parseNotificationData(notification);
+      if (!parsedData) {
+        return this.$t(notification.tr || '');
+      }
+
+      const { key, value, params } = parsedData;
+
+      // Wenn value.title und value.description vorhanden sind
+      if (this.hasValueWithTitleAndDescription(value)) {
+        return this.formatValueBasedNotification(value, params);
+      }
+
+      // Normalisiere den Schlüssel
+      const normalizedKey = this.normalizeNotificationKey(key);
+
+      // Prüfe auf random_event
+      if (this.isRandomEvent(normalizedKey)) {
+        return this.formatRandomEvent(normalizedKey, params, value, notification);
+      }
+
+      // Fallback: Standard-Übersetzung
+      return this.$t(normalizedKey, this.formatParams(params));
+    },
+
+    // ==================== Parsing ====================
+    parseNotificationData(notification) {
+      const raw = notification.tr || '';
+      
+      if (typeof raw !== 'string' || !raw.trim().startsWith('{')) {
+        return null;
+      }
+
+      try {
+        const parsed = JSON.parse(raw.trim());
+        if (!parsed || !parsed.tr) {
+          return null;
         }
-      }
 
-      // 2) Wenn value.title und value.description vorhanden sind, verwende diese
-      if (value && value.title && value.description) {
-        // Parameter aus effects extrahieren und formatieren
-        const formattedParams = this.formatParams(params);
-        // Zuerst Description interpolieren (für {amount} etc.), dann Effects hinzufügen
-        let description = this.interpolateString(value.description, formattedParams);
-        description = this.formatDescriptionWithEffects(description, value.effects || [], formattedParams);
-        return {
-          title: this.interpolateString(value.title, formattedParams),
-          description: description
-        };
-      }
+        const key = parsed.tr;
+        const value = parsed.value || {};
+        const params = this.extractAllParams(parsed, value, notification);
 
-      // 3) Schlüssel normalisieren
-      if (typeof key === 'string') {
-        const trimmedKey = key.trim();
-        if (trimmedKey.startsWith('falukant.')) {
-          key = trimmedKey;
-        } else {
-          key = 'falukant.notifications.' + trimmedKey;
+        return { key, value, params };
+      } catch (error) {
+        return this.parseLegacyFormat(raw);
+      }
+    },
+
+    parseLegacyFormat(raw) {
+      try {
+        const parsed = JSON.parse(raw);
+        if (parsed && parsed.tr) {
+          const params = this.formatParams({ ...parsed });
+          delete params.tr;
+          return { key: parsed.tr, value: {}, params };
         }
+      } catch (error) {
+        // Ignore parse errors
+      }
+      return null;
+    },
+
+    extractAllParams(parsed, value, notification) {
+      let params = this.extractParamsFromValue(value, notification);
+
+      // Wenn value eine einfache Zahl ist
+      if (typeof parsed.value === 'number') {
+        params.value = parsed.value;
       }
 
-      // 4) Prüfe, ob es sich um ein random_event handelt mit title/description Struktur
-      if (key.startsWith('falukant.notifications.random_event.')) {
-        const eventId = key.replace('falukant.notifications.random_event.', '');
-        const eventKey = `falukant.notifications.random_event.${eventId}`;
-        try {
-          const titleKey = `${eventKey}.title`;
-          const descKey = `${eventKey}.description`;
-          
-          // Wenn keine Parameter extrahiert wurden, versuche es aus der Notification
-          if ((!params || Object.keys(params).length === 0) && n) {
-            params = this.extractParams(n) || {};
-          }
-          
-          // Wenn value vorhanden ist, verwende effects für Details
-          if (value && value.effects) {
-            params = this.extractParamsFromValue(value, n);
-          }
-
-          const formattedParams = this.formatParams(params);
-          
-          if (this.$te(titleKey) && this.$te(descKey)) {
-            const title = this.$t(titleKey, formattedParams);
-            let description = this.$t(descKey, formattedParams);
-            
-            // Stelle sicher, dass auch hier die Parameter interpoliert werden (für {amount} etc.)
-            // Vue i18n interpoliert bereits, aber wir müssen sicherstellen, dass formatParams korrekt formatiert
-            description = this.interpolateString(description, formattedParams);
-            
-            // Füge Effect-Details hinzu, falls vorhanden
-            if (value && value.effects) {
-              description = this.formatDescriptionWithEffects(description, value.effects, formattedParams);
-            }
-            
-            return { title, description };
-          }
-        } catch (e) {
-          // Fallback zur alten Methode
-        }
+      // Wenn kein value-Objekt vorhanden ist, extrahiere direkt aus parsed
+      if (!parsed.value || Object.keys(value).length === 0) {
+        params = this.extractDirectParams(parsed, params, notification);
       }
 
-      // Fallback: Alte Methode für andere Notification-Typen
+      // Weitere Parameter aus parsed
+      this.addAdditionalParams(parsed, params);
+
+      return params;
+    },
+
+    extractDirectParams(parsed, existingParams, notification) {
+      const directParams = { ...parsed };
+      delete directParams.tr;
+      delete directParams.value;
+
+      // Stelle sicher, dass amount als Zahl behandelt wird
+      if (directParams.amount !== undefined && directParams.amount !== null) {
+        directParams.amount = Number(directParams.amount);
+      }
+
+      const formattedParams = this.formatParams(directParams);
+      const mergedParams = { ...formattedParams, ...existingParams };
+
+      // Backend-aufgelöster Name hat höchste Priorität
+      if (notification.characterName) {
+        mergedParams.characterName = notification.characterName;
+      }
+
+      return mergedParams;
+    },
+
+    addAdditionalParams(parsed, params) {
+      if (parsed.branch_id !== undefined) {
+        params.branch_id = parsed.branch_id;
+      }
+      if (parsed.region_id !== undefined) {
+        params.region_id = parsed.region_id;
+      }
+    },
+
+    // ==================== Key Normalization ====================
+    normalizeNotificationKey(key) {
+      if (typeof key !== 'string') {
+        return key;
+      }
+
+      const trimmed = key.trim();
+      return trimmed.startsWith(FALUKANT_PREFIX)
+        ? trimmed
+        : NOTIFICATION_NAMESPACE + trimmed;
+    },
+
+    isRandomEvent(key) {
+      return typeof key === 'string' && key.startsWith(RANDOM_EVENT_PREFIX);
+    },
+
+    // ==================== Notification Formatting ====================
+    hasValueWithTitleAndDescription(value) {
+      return value && value.title && value.description;
+    },
+
+    formatValueBasedNotification(value, params) {
       const formattedParams = this.formatParams(params);
-      return this.$t(key, formattedParams);
+      let description = this.interpolateString(value.description, formattedParams);
+      description = this.formatDescriptionWithEffects(
+        description,
+        value.effects || [],
+        formattedParams
+      );
+
+      return {
+        title: this.interpolateString(value.title, formattedParams),
+        description
+      };
     },
-    
+
+    formatRandomEvent(key, params, value, notification) {
+      const eventId = key.replace(RANDOM_EVENT_PREFIX, '');
+      const eventKey = `${RANDOM_EVENT_PREFIX}${eventId}`;
+      const titleKey = `${eventKey}.title`;
+      const descKey = `${eventKey}.description`;
+
+      if (!this.$te(titleKey) || !this.$te(descKey)) {
+        return this.$t(key, this.formatParams(params));
+      }
+
+      // Parameter extrahieren falls leer
+      let finalParams = params;
+      if (!finalParams || Object.keys(finalParams).length === 0) {
+        finalParams = this.extractParams(notification) || {};
+      }
+
+      if (value && value.effects) {
+        finalParams = this.extractParamsFromValue(value, notification);
+      }
+
+      const formattedParams = this.formatParams(finalParams);
+      const title = this.$t(titleKey, formattedParams);
+      let description = this.$t(descKey, formattedParams);
+      description = this.interpolateString(description, formattedParams);
+
+      if (value && value.effects) {
+        description = this.formatDescriptionWithEffects(
+          description,
+          value.effects,
+          formattedParams
+        );
+      }
+
+      return { title, description };
+    },
+
+    // ==================== Parameter Extraction ====================
+    extractParamsFromValue(value, notification) {
+      const params = {};
+
+      this.extractMoneyParams(value, params);
+      this.extractCharacterParams(value, notification, params);
+      this.extractRegionParams(value, params);
+      this.extractEffectParams(value, notification, params);
+
+      // Fallback: character_id als letzter Ausweg
+      if (!params.characterName && notification.character_id) {
+        params.characterName = `#${notification.character_id}`;
+      }
+
+      return params;
+    },
+
+    extractMoneyParams(value, params) {
+      if (value.money_change_absolute !== undefined && value.money_change_absolute !== null) {
+        params.absolute = value.money_change_absolute;
+        params.amount = value.money_change_absolute;
+      }
+      if (value.money_change_percent !== undefined && value.money_change_percent !== null) {
+        params.percent = value.money_change_percent;
+      }
+    },
+
+    extractCharacterParams(value, notification, params) {
+      if (notification.characterName) {
+        params.characterName = notification.characterName;
+      } else if (value.characterName) {
+        params.characterName = value.characterName;
+      } else if (value.character_id) {
+        params.characterName = `#${value.character_id}`;
+      }
+
+      if (value.character_id) {
+        params.character_id = value.character_id;
+      }
+    },
+
+    extractRegionParams(value, params) {
+      if (value.region_id) {
+        params.region_id = value.region_id;
+      }
+      if (value.regionName) {
+        params.regionName = value.regionName;
+      }
+    },
+
+    extractEffectParams(value, notification, params) {
+      if (!value.effects || !Array.isArray(value.effects)) {
+        return;
+      }
+
+      for (const effect of value.effects) {
+        switch (effect.type) {
+          case EFFECT_TYPES.MONEY_CHANGE:
+            this.extractMoneyChangeEffect(effect, params);
+            break;
+          case EFFECT_TYPES.CHARACTER_HEALTH_CHANGE:
+            this.extractCharacterHealthChangeEffect(effect, notification, params);
+            break;
+          case EFFECT_TYPES.CHARACTER_DEATH:
+            this.extractCharacterDeathEffect(effect, notification, params);
+            break;
+          case EFFECT_TYPES.STORAGE_DAMAGE:
+            this.extractStorageDamageEffect(effect, params);
+            break;
+          case EFFECT_TYPES.PRODUCTION_QUALITY_CHANGE:
+            if (effect.change !== undefined) {
+              params.productionQualityChange = effect.change;
+            }
+            break;
+          case EFFECT_TYPES.TRANSPORT_SPEED_CHANGE:
+            if (effect.percent !== undefined) {
+              params.transportSpeedChangePercent = effect.percent;
+            }
+            break;
+          case EFFECT_TYPES.STORAGE_CAPACITY_CHANGE:
+            if (effect.percent !== undefined) {
+              params.storageCapacityChangePercent = effect.percent;
+            }
+            break;
+        }
+      }
+    },
+
+    extractMoneyChangeEffect(effect, params) {
+      if (params.absolute === undefined && effect.absolute !== undefined) {
+        params.absolute = effect.absolute;
+        params.amount = effect.absolute;
+      }
+      if (params.percent === undefined && effect.percent !== undefined) {
+        params.percent = effect.percent;
+      }
+    },
+
+    extractCharacterHealthChangeEffect(effect, notification, params) {
+      if (!params.characterName && effect.character_id) {
+        params.character_id = effect.character_id;
+        params.characterName = notification.characterName || `#${effect.character_id}`;
+      }
+      if (effect.change !== undefined) {
+        params.change = effect.change;
+        params.healthChange = effect.change > 0 ? `+${effect.change}` : `${effect.change}`;
+      }
+    },
+
+    extractCharacterDeathEffect(effect, notification, params) {
+      if (!params.characterName && effect.character_id) {
+        params.character_id = effect.character_id;
+        params.characterName = notification.characterName || `#${effect.character_id}`;
+      }
+    },
+
+    extractStorageDamageEffect(effect, params) {
+      if (effect.inventory_damage_percent !== undefined) {
+        params.inventory_damage_percent = effect.inventory_damage_percent;
+      }
+      if (effect.storage_destruction_percent !== undefined) {
+        params.storage_destruction_percent = effect.storage_destruction_percent;
+      }
+    },
+
+    extractParams(notification) {
+      const params = {};
+
+      if (notification.effects && Array.isArray(notification.effects)) {
+        for (const effect of notification.effects) {
+          this.extractLegacyEffect(effect, notification, params);
+        }
+      }
+
+      // Weitere Parameter aus der Notification selbst
+      if (notification.region_id && notification.regionName) {
+        params.regionName = notification.regionName;
+      }
+      if (notification.character_id && notification.characterName) {
+        params.characterName = notification.characterName;
+      }
+      if (notification.amount !== undefined) {
+        params.amount = notification.amount;
+      }
+
+      return params;
+    },
+
+    extractLegacyEffect(effect, notification, params) {
+      switch (effect.type) {
+        case EFFECT_TYPES.MONEY_CHANGE:
+          if (effect.absolute !== undefined) {
+            params.amount = effect.absolute;
+          } else if (effect.percent !== undefined) {
+            params.percent = effect.percent;
+          }
+          break;
+        case EFFECT_TYPES.CHARACTER_HEALTH_CHANGE:
+          if (effect.character_id) {
+            params.character_id = effect.character_id;
+            params.characterName = params.characterName || notification.characterName || `#${effect.character_id}`;
+          }
+          if (effect.change !== undefined) {
+            params.change = effect.change;
+          }
+          break;
+        case EFFECT_TYPES.CHARACTER_DEATH:
+          if (effect.character_id) {
+            params.character_id = effect.character_id;
+            params.characterName = params.characterName || notification.characterName || `#${effect.character_id}`;
+          }
+          break;
+        case EFFECT_TYPES.STORAGE_DAMAGE:
+          if (effect.inventory_damage_percent !== undefined) {
+            params.inventory_damage_percent = effect.inventory_damage_percent;
+          }
+          if (effect.storage_destruction_percent !== undefined) {
+            params.storage_destruction_percent = effect.storage_destruction_percent;
+          }
+          break;
+      }
+    },
+
+    // ==================== Parameter Formatting ====================
     formatParams(params) {
       const formatted = {};
-      
-      // Geldbeträge formatieren
+
+      this.formatMoneyParams(params, formatted);
+      this.formatValueParams(params, formatted);
+      this.formatBranchParams(params, formatted);
+      this.formatHealthParams(params, formatted);
+      this.formatCharacterParams(params, formatted);
+      this.formatRegionParams(params, formatted);
+      this.formatDamageParams(params, formatted);
+      this.copyRemainingParams(params, formatted);
+
+      return formatted;
+    },
+
+    formatMoneyParams(params, formatted) {
       if (params.amount !== undefined && params.amount !== null) {
-        formatted.amount = this.formatMoney(Number(params.amount));
+        const amountNum = Number(params.amount);
+        if (!isNaN(amountNum) && isFinite(amountNum)) {
+          formatted.amount = this.formatMoney(amountNum);
+        } else {
+          formatted.amount = String(params.amount);
+        }
       }
       if (params.absolute !== undefined && params.absolute !== null) {
         formatted.amount = this.formatMoney(Number(params.absolute));
@@ -293,36 +610,38 @@ export default {
       if (params.percent !== undefined && params.percent !== null) {
         formatted.percent = `${params.percent > 0 ? '+' : ''}${params.percent.toFixed(1)}%`;
       }
-      
-      // Einfache Werte (z.B. für overproduction)
+    },
+
+    formatValueParams(params, formatted) {
       if (params.value !== undefined && params.value !== null) {
         formatted.value = Number(params.value);
       }
-      
-      // Filiale-Information mit Branch-Namen
+    },
+
+    formatBranchParams(params, formatted) {
       if (params.branch_id !== undefined && params.branch_id !== null) {
         const branch = this.branches.find(b => b.id === params.branch_id);
-        if (branch && branch.cityName) {
-          formatted.branch_info = ` (${branch.cityName})`;
-        } else {
-          formatted.branch_info = ` (Filiale #${params.branch_id})`;
-        }
+        formatted.branch_info = branch && branch.cityName
+          ? ` (${branch.cityName})`
+          : ` (Filiale #${params.branch_id})`;
       } else {
         formatted.branch_info = '';
       }
-      
-      // Gesundheit formatieren
+    },
+
+    formatHealthParams(params, formatted) {
       if (params.change !== undefined && params.change !== null) {
         formatted.healthChange = params.change > 0 ? `+${params.change}` : `${params.change}`;
         formatted.change = formatted.healthChange;
       }
       if (params.healthChange !== undefined && params.healthChange !== null && !formatted.healthChange) {
-        formatted.healthChange = typeof params.healthChange === 'string' 
-          ? params.healthChange 
+        formatted.healthChange = typeof params.healthChange === 'string'
+          ? params.healthChange
           : (params.healthChange > 0 ? `+${params.healthChange}` : `${params.healthChange}`);
       }
-      
-      // Charakternamen
+    },
+
+    formatCharacterParams(params, formatted) {
       if (params.characterName) {
         formatted.characterName = params.characterName;
       }
@@ -331,251 +650,141 @@ export default {
         const lastName = params.character_last_name || '';
         formatted.characterName = `${firstName} ${lastName}`.trim() || formatted.characterName;
       }
-      
-      // Regions-Informationen
+    },
+
+    formatRegionParams(params, formatted) {
       if (params.regionName) {
         formatted.regionName = params.regionName;
       }
       if (params.region_id) {
         formatted.region_id = params.region_id;
       }
-      
-      // Schaden formatieren (für Kompatibilität mit alter Struktur)
+    },
+
+    formatDamageParams(params, formatted) {
       if (params.inventory_damage_percent !== undefined && params.inventory_damage_percent !== null) {
         formatted.damagePercent = ` Lagerbestand beschädigt: ${params.inventory_damage_percent.toFixed(1)}%.`;
       }
       if (params.storage_destruction_percent !== undefined && params.storage_destruction_percent !== null) {
         formatted.destructionPercent = ` Lager zerstört: ${params.storage_destruction_percent.toFixed(1)}%.`;
       }
-      
-      // Alle anderen Parameter übernehmen
+    },
+
+    copyRemainingParams(params, formatted) {
       for (const [key, value] of Object.entries(params)) {
         if (!formatted.hasOwnProperty(key) && key !== 'tr' && value !== undefined && value !== null) {
           formatted[key] = value;
         }
       }
-      
-      return formatted;
     },
-    
-    extractParamsFromValue(value, n) {
-      const params = {};
-      
-      // Geldbeträge direkt aus value extrahieren (neue Struktur)
-      if (value.money_change_absolute !== undefined && value.money_change_absolute !== null) {
-        params.absolute = value.money_change_absolute;
-        params.amount = value.money_change_absolute;
-      }
-      if (value.money_change_percent !== undefined && value.money_change_percent !== null) {
-        params.percent = value.money_change_percent;
-      }
-      
-      // Charakternamen: Priorität auf vom Backend aufgelösten Namen (n.characterName)
-      if (n.characterName) {
-        params.characterName = n.characterName;
-      } else if (value.characterName) {
-        params.characterName = value.characterName;
-      } else if (value.character_id) {
-        params.characterName = `#${value.character_id}`;
-      }
-      if (value.character_id) {
-        params.character_id = value.character_id;
-      }
-      
-      // Regions-Informationen
-      if (value.region_id) {
-        params.region_id = value.region_id;
-      }
-      if (value.regionName) {
-        params.regionName = value.regionName;
-      }
-      
-      // Parameter aus effects extrahieren (falls nicht bereits aus value extrahiert)
-      if (value.effects && Array.isArray(value.effects)) {
-        for (const effect of value.effects) {
-          if (effect.type === 'money_change') {
-            // Nur verwenden, wenn nicht bereits aus value extrahiert
-            if (params.absolute === undefined && effect.absolute !== undefined) {
-              params.absolute = effect.absolute;
-              params.amount = effect.absolute;
-            }
-            if (params.percent === undefined && effect.percent !== undefined) {
-              params.percent = effect.percent;
-            }
-          } else if (effect.type === 'character_health_change') {
-            // Charakternamen: Backend-aufgelöst hat Vorrang
-            if (!params.characterName && effect.character_id) {
-              params.character_id = effect.character_id;
-              params.characterName = n.characterName || `#${effect.character_id}`;
-            }
-            if (effect.change !== undefined) {
-              params.change = effect.change;
-              params.healthChange = effect.change > 0 ? `+${effect.change}` : `${effect.change}`;
-            }
-          } else if (effect.type === 'character_death') {
-            // Charakternamen: Backend-aufgelöst hat Vorrang
-            if (!params.characterName && effect.character_id) {
-              params.character_id = effect.character_id;
-              params.characterName = n.characterName || `#${effect.character_id}`;
-            }
-          } else if (effect.type === 'storage_damage') {
-            if (effect.inventory_damage_percent !== undefined) {
-              params.inventory_damage_percent = effect.inventory_damage_percent;
-            }
-            if (effect.storage_destruction_percent !== undefined) {
-              params.storage_destruction_percent = effect.storage_destruction_percent;
-            }
-          } else if (effect.type === 'production_quality_change') {
-            if (effect.change !== undefined) {
-              params.productionQualityChange = effect.change;
-            }
-          } else if (effect.type === 'transport_speed_change') {
-            if (effect.percent !== undefined) {
-              params.transportSpeedChangePercent = effect.percent;
-            }
-          } else if (effect.type === 'storage_capacity_change') {
-            if (effect.percent !== undefined) {
-              params.storageCapacityChangePercent = effect.percent;
-            }
-          }
-        }
-      }
-      
-      // Fallback: character_id als letzter Ausweg
-      if (!params.characterName && n.character_id) {
-        params.characterName = `#${n.character_id}`;
-      }
-      
-      return params;
-    },
-    
-    extractParams(n) {
-      const params = {};
-      
-      // Parameter aus effects extrahieren (alte Struktur)
-      if (n.effects && Array.isArray(n.effects)) {
-        for (const effect of n.effects) {
-          if (effect.type === 'money_change') {
-            if (effect.absolute !== undefined) {
-              params.amount = effect.absolute;
-            } else if (effect.percent !== undefined) {
-              params.percent = effect.percent;
-            }
-          } else if (effect.type === 'character_health_change') {
-            if (effect.character_id) {
-              params.character_id = effect.character_id;
-              params.characterName = params.characterName || n.characterName || `#${effect.character_id}`;
-            }
-            if (effect.change !== undefined) {
-              params.change = effect.change;
-            }
-          } else if (effect.type === 'character_death') {
-            if (effect.character_id) {
-              params.character_id = effect.character_id;
-              params.characterName = params.characterName || n.characterName || `#${effect.character_id}`;
-            }
-          } else if (effect.type === 'storage_damage') {
-            if (effect.inventory_damage_percent !== undefined) {
-              params.inventory_damage_percent = effect.inventory_damage_percent;
-            }
-            if (effect.storage_destruction_percent !== undefined) {
-              params.storage_destruction_percent = effect.storage_destruction_percent;
-            }
-          }
-        }
-      }
-      
-      // Weitere Parameter aus der Notification selbst
-      if (n.region_id && n.regionName) {
-        params.regionName = n.regionName;
-      }
-      if (n.character_id && n.characterName) {
-        params.characterName = n.characterName;
-      }
-      if (n.amount !== undefined) {
-        params.amount = n.amount;
-      }
-      
-      return params;
-    },
-    
+
+    // ==================== Description Formatting ====================
     formatDescriptionWithEffects(baseDescription, effects, params) {
       if (!effects || !Array.isArray(effects) || effects.length === 0) {
         return baseDescription;
       }
-      
-      let description = baseDescription;
-      const effectDetails = [];
-      
-      for (const effect of effects) {
-        if (effect.type === 'character_health_change') {
-          const charName = effect.character_first_name && effect.character_last_name 
-            ? `${effect.character_first_name} ${effect.character_last_name}`.trim()
-            : params.characterName || `#${effect.character_id}`;
-          const change = effect.change > 0 ? `+${effect.change}` : `${effect.change}`;
-          effectDetails.push(`${charName} hat ${change} Gesundheit verloren.`);
-        } else if (effect.type === 'character_death') {
-          const charName = effect.character_first_name && effect.character_last_name 
-            ? `${effect.character_first_name} ${effect.character_last_name}`.trim()
-            : params.characterName || `#${effect.character_id}`;
-          effectDetails.push(`${charName} ist verstorben.`);
-        } else if (effect.type === 'production_quality_change') {
-          const change = effect.change > 0 ? `+${effect.change}` : `${effect.change}`;
-          effectDetails.push(`Produktionsqualität: ${change}.`);
-        } else if (effect.type === 'transport_speed_change') {
-          const percent = effect.percent > 0 ? `+${effect.percent.toFixed(1)}%` : `${effect.percent.toFixed(1)}%`;
-          effectDetails.push(`Transportgeschwindigkeit: ${percent}.`);
-        } else if (effect.type === 'storage_damage') {
-          const stockType = effect.stock_type || 'Lager';
-          const inventoryDamage = effect.inventory_damage_percent ? `${effect.inventory_damage_percent.toFixed(1)}%` : '0%';
-          const storageDestruction = effect.storage_destruction_percent ? `${effect.storage_destruction_percent.toFixed(1)}%` : '0%';
-          const affected = effect.affected_stocks ? effect.affected_stocks.length : 0;
-          const destroyed = effect.destroyed_stocks ? effect.destroyed_stocks.length : 0;
-          effectDetails.push(`${stockType}: ${inventoryDamage} Lagerbestand beschädigt, ${storageDestruction} Lager zerstört (${affected} betroffen, ${destroyed} zerstört).`);
-        } else if (effect.type === 'storage_capacity_change') {
-          const percent = effect.percent > 0 ? `+${effect.percent.toFixed(1)}%` : `${effect.percent.toFixed(1)}%`;
-          const affected = effect.affected_stocks ? effect.affected_stocks.length : 0;
-          effectDetails.push(`Lagerkapazität: ${percent} (${affected} betroffen).`);
-        }
-      }
-      
-      if (effectDetails.length > 0) {
-        description += ' ' + effectDetails.join(' ');
-      }
-      
-      return description;
+
+      const effectDetails = effects
+        .map(effect => this.formatEffectDetail(effect, params))
+        .filter(Boolean);
+
+      return effectDetails.length > 0
+        ? `${baseDescription} ${effectDetails.join(' ')}`
+        : baseDescription;
     },
-    
+
+    formatEffectDetail(effect, params) {
+      switch (effect.type) {
+        case EFFECT_TYPES.CHARACTER_HEALTH_CHANGE:
+          return this.formatCharacterHealthChangeDetail(effect, params);
+        case EFFECT_TYPES.CHARACTER_DEATH:
+          return this.formatCharacterDeathDetail(effect, params);
+        case EFFECT_TYPES.PRODUCTION_QUALITY_CHANGE:
+          return this.formatProductionQualityChangeDetail(effect);
+        case EFFECT_TYPES.TRANSPORT_SPEED_CHANGE:
+          return this.formatTransportSpeedChangeDetail(effect);
+        case EFFECT_TYPES.STORAGE_DAMAGE:
+          return this.formatStorageDamageDetail(effect);
+        case EFFECT_TYPES.STORAGE_CAPACITY_CHANGE:
+          return this.formatStorageCapacityChangeDetail(effect);
+        default:
+          return null;
+      }
+    },
+
+    formatCharacterHealthChangeDetail(effect, params) {
+      const charName = this.getCharacterName(effect, params);
+      const change = effect.change > 0 ? `+${effect.change}` : `${effect.change}`;
+      return `${charName} hat ${change} Gesundheit verloren.`;
+    },
+
+    formatCharacterDeathDetail(effect, params) {
+      const charName = this.getCharacterName(effect, params);
+      return `${charName} ist verstorben.`;
+    },
+
+    formatProductionQualityChangeDetail(effect) {
+      const change = effect.change > 0 ? `+${effect.change}` : `${effect.change}`;
+      return `Produktionsqualität: ${change}.`;
+    },
+
+    formatTransportSpeedChangeDetail(effect) {
+      const percent = effect.percent > 0 ? `+${effect.percent.toFixed(1)}%` : `${effect.percent.toFixed(1)}%`;
+      return `Transportgeschwindigkeit: ${percent}.`;
+    },
+
+    formatStorageDamageDetail(effect) {
+      const stockType = effect.stock_type || 'Lager';
+      const inventoryDamage = effect.inventory_damage_percent
+        ? `${effect.inventory_damage_percent.toFixed(1)}%`
+        : '0%';
+      const storageDestruction = effect.storage_destruction_percent
+        ? `${effect.storage_destruction_percent.toFixed(1)}%`
+        : '0%';
+      const affected = effect.affected_stocks ? effect.affected_stocks.length : 0;
+      const destroyed = effect.destroyed_stocks ? effect.destroyed_stocks.length : 0;
+      
+      return `${stockType}: ${inventoryDamage} Lagerbestand beschädigt, ${storageDestruction} Lager zerstört (${affected} betroffen, ${destroyed} zerstört).`;
+    },
+
+    formatStorageCapacityChangeDetail(effect) {
+      const percent = effect.percent > 0 ? `+${effect.percent.toFixed(1)}%` : `${effect.percent.toFixed(1)}%`;
+      const affected = effect.affected_stocks ? effect.affected_stocks.length : 0;
+      return `Lagerkapazität: ${percent} (${affected} betroffen).`;
+    },
+
+    getCharacterName(effect, params) {
+      if (effect.character_first_name && effect.character_last_name) {
+        return `${effect.character_first_name} ${effect.character_last_name}`.trim();
+      }
+      return params.characterName || `#${effect.character_id}`;
+    },
+
+    // ==================== String Utilities ====================
     interpolateString(str, params) {
-      if (!str || typeof str !== 'string') return str;
+      if (!str || typeof str !== 'string') {
+        return str;
+      }
+
       let result = str;
       for (const [key, value] of Object.entries(params)) {
         if (value !== undefined && value !== null && value !== '') {
           result = result.replace(new RegExp(`\\{${key}\\}`, 'g'), String(value));
         } else {
-          // Entferne Platzhalter, wenn kein Wert vorhanden ist
           result = result.replace(new RegExp(`\\s*\\{${key}\\}\\s*`, 'g'), '');
         }
       }
-      // Entferne doppelte Leerzeichen und trimme
-      result = result.replace(/\s+/g, ' ').trim();
-      return result;
+
+      return result.replace(/\s+/g, ' ').trim();
     },
-    
+
     formatMoney(amount) {
-      return new Intl.NumberFormat(navigator.language, { 
-        minimumFractionDigits: 2, 
-        maximumFractionDigits: 2 
+      return new Intl.NumberFormat(navigator.language, {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2
       }).format(amount);
-    }
+    },
   },
-  computed: {
-    totalPages() {
-      return Math.max(1, Math.ceil(this.total / this.size));
-  },
-  canPrev() { return this.page > 1; },
-  canNext() { return this.page < this.totalPages; }
-  }
 };
 </script>
 
@@ -585,21 +794,62 @@ export default {
   padding: 0;
   margin: 0;
 }
-.messages > li { border: 1px solid #7BBE55; margin-bottom: .25em; padding: .5em; }
-.messages > li.unread { font-weight: bold; }
-.messages > li .body { display: flex; flex-direction: column; gap: 0.25em; }
-.messages > li .notification-title { font-weight: bold; font-size: 1.05em; }
-.messages > li .notification-description { color: #555; }
-.messages > li .footer { color: #f9a22c; font-size: .8em; margin-top: .3em; display: flex; }
-.messages > li .footer span:first-child { flex: 1; }
-.empty { text-align: center; color: #777; padding: 1em; }
+
+.messages > li {
+  border: 1px solid #7BBE55;
+  margin-bottom: 0.25em;
+  padding: 0.5em;
+}
+
+.messages > li.unread {
+  font-weight: bold;
+}
+
+.messages > li .body {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25em;
+}
+
+.messages > li .notification-title {
+  font-weight: bold;
+  font-size: 1.05em;
+}
+
+.messages > li .notification-description {
+  color: #555;
+}
+
+.messages > li .footer {
+  color: #f9a22c;
+  font-size: 0.8em;
+  margin-top: 0.3em;
+  display: flex;
+}
+
+.messages > li .footer span:first-child {
+  flex: 1;
+}
+
+.empty {
+  text-align: center;
+  color: #777;
+  padding: 1em;
+}
+
 .pagination {
   display: flex;
   justify-content: center;
-  gap: .5em;
-  margin-top: .5em;
+  gap: 0.5em;
+  margin-top: 0.5em;
 }
-.pagination button { padding: .25em .6em; }
-.pagination input[type="number"] { width: 4em; text-align: right; }
-</style>
 
+.pagination button {
+  padding: 0.25em 0.6em;
+}
+
+.pagination input[type="number"] {
+  width: 4em;
+  text-align: right;
+}
+</style>