diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index 124b22e..ea413a5 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -109,6 +109,13 @@ export const routes: Routes = [
             (r) => r.USERS_ROUTES
           ),
       },
+      {
+        path: 'analytics',
+        loadChildren: () =>
+          import('./features/components/analytics/analytics.routes').then(
+            (r) => r.ANALYTICS_ROUTES
+          ),
+      },
     ],
   },
   {
diff --git a/src/app/features/components/analytics/analytics.routes.ts b/src/app/features/components/analytics/analytics.routes.ts
new file mode 100644
index 0000000..afa8fd2
--- /dev/null
+++ b/src/app/features/components/analytics/analytics.routes.ts
@@ -0,0 +1,11 @@
+import { Routes } from '@angular/router';
+import { AnalyticsComponent } from './analytics/analytics.component';
+
+
+export const ANALYTICS_ROUTES: Routes = [
+  {
+    path: '',
+    component: AnalyticsComponent,
+    title: '',
+  },
+];
diff --git a/src/app/features/components/analytics/analytics/analytics.component.css b/src/app/features/components/analytics/analytics/analytics.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/features/components/analytics/analytics/analytics.component.html b/src/app/features/components/analytics/analytics/analytics.component.html
new file mode 100644
index 0000000..4cf1f17
--- /dev/null
+++ b/src/app/features/components/analytics/analytics/analytics.component.html
@@ -0,0 +1,70 @@
+<!-- /src/app/features/admin/components/analytics/analytics.component.html -->
+
+<div>
+  <h1>Analytics Dashboard</h1>
+  
+  <div class="period-selector">
+    <button (click)="loadAnalytics('Last7Days')" [class.active]="selectedPeriod === 'Last7Days'">Letzte 7 Tage</button>
+    <button (click)="loadAnalytics('Last30Days')" [class.active]="selectedPeriod === 'Last30Days'">Letzte 30 Tage</button>
+    <button (click)="loadAnalytics('AllTime')" [class.active]="selectedPeriod === 'AllTime'">Gesamt</button>
+  </div>
+
+  <hr>
+
+  <div *ngIf="analytics$ | async as data; else loading">
+    
+    <fieldset>
+      <legend>KPI Übersicht</legend>
+      <div class="kpi-grid">
+        <div><strong>Umsatz:</strong> {{ data.kpiSummary.totalRevenue | currency:'EUR' }}</div>
+        <div><strong>Bestellungen:</strong> {{ data.kpiSummary.totalOrders }}</div>
+        <div><strong>Ø Bestellwert:</strong> {{ data.kpiSummary.averageOrderValue | currency:'EUR' }}</div>
+        <div><strong>Gesamtkunden:</strong> {{ data.kpiSummary.totalCustomers }}</div>
+        <div><strong>Neukunden (im Zeitraum):</strong> {{ data.kpiSummary.newCustomersThisPeriod }}</div>
+      </div>
+    </fieldset>
+
+    <fieldset>
+      <legend>Top Produkte</legend>
+      <table>
+        <thead>
+          <tr>
+            <th>Produkt</th>
+            <th>SKU</th>
+            <th>Verkaufte Einheiten</th>
+            <th>Umsatz</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let product of data.topPerformingProducts">
+            <td>{{ product.name }}</td>
+            <td>{{ product.sku }}</td>
+            <td>{{ product.unitsSold }}</td>
+            <td>{{ product.totalRevenue | currency:'EUR' }}</td>
+          </tr>
+          <tr *ngIf="!data.topPerformingProducts || data.topPerformingProducts.length === 0">
+            <td colspan="4">Keine Produktdaten in diesem Zeitraum.</td>
+          </tr>
+        </tbody>
+      </table>
+    </fieldset>
+    
+    <fieldset>
+      <legend>Lagerstatus</legend>
+       <div class="kpi-grid">
+        <div><strong>Produkte mit niedrigem Lagerbestand:</strong> {{ data.inventoryStatus.productsWithLowStock }}</div>
+        <div><strong>Lagerverfügbarkeit (gesamt):</strong> {{ data.inventoryStatus.overallStockAvailabilityPercentage | number:'1.1-2' }}%</div>
+       </div>
+    </fieldset>
+
+    <fieldset>
+      <legend>Verkaufsverlauf (Rohdaten)</legend>
+      <pre>{{ data.salesOverTime | json }}</pre>
+    </fieldset>
+
+  </div>
+
+  <ng-template #loading>
+    <p>Lade Analysedaten...</p>
+  </ng-template>
+</div>
\ No newline at end of file
diff --git a/src/app/features/components/analytics/analytics/analytics.component.ts b/src/app/features/components/analytics/analytics/analytics.component.ts
new file mode 100644
index 0000000..8bbbca8
--- /dev/null
+++ b/src/app/features/components/analytics/analytics/analytics.component.ts
@@ -0,0 +1,35 @@
+// /src/app/features/admin/components/analytics/analytics.component.ts
+
+import { Component, OnInit, inject } from '@angular/core';
+import { CommonModule, CurrencyPipe, DecimalPipe } from '@angular/common';
+import { Observable } from 'rxjs';
+
+// Models & Enums
+import { Analytics } from '../../../../core/models/analytics.model';
+import { AnalyticsPeriod } from '../../../../core/enums/shared.enum';
+
+// Services
+import { AnalyticsService } from '../../../services/analytics.service';
+
+@Component({
+  selector: 'app-analytics', // Dein gewünschter Selector
+  standalone: true,
+  imports: [CommonModule, CurrencyPipe, DecimalPipe],
+  templateUrl: './analytics.component.html',
+  styleUrl: './analytics.component.css'
+})
+export class AnalyticsComponent implements OnInit { // Dein gewünschter Klassenname
+  private analyticsService = inject(AnalyticsService);
+  
+  analytics$!: Observable<Analytics>;
+  selectedPeriod: AnalyticsPeriod = 'Last30Days';
+
+  ngOnInit(): void {
+    this.loadAnalytics(this.selectedPeriod);
+  }
+
+  loadAnalytics(period: AnalyticsPeriod): void {
+    this.selectedPeriod = period;
+    this.analytics$ = this.analyticsService.get(period);
+  }
+}
\ No newline at end of file
diff --git a/src/app/features/components/orders/orders.routes.ts b/src/app/features/components/orders/orders.routes.ts
index 6a58393..d71b89c 100644
--- a/src/app/features/components/orders/orders.routes.ts
+++ b/src/app/features/components/orders/orders.routes.ts
@@ -3,7 +3,7 @@ import { OrderListComponent } from './order-list/order-list.component';
 
 export const ORDERS_ROUTES: Routes = [
   {
-    path: '1',
+    path: '',
     component: OrderListComponent,
     title: '',
   },
diff --git a/src/app/features/components/products/product-list/product-list.component.html b/src/app/features/components/products/product-list/product-list.component.html
index 2ebdc52..82085c7 100644
--- a/src/app/features/components/products/product-list/product-list.component.html
+++ b/src/app/features/components/products/product-list/product-list.component.html
@@ -1,132 +1,227 @@
 <div>
   <h1>Produkte verwalten</h1>
 
-  <!-- Formular -->
+  <!-- Das Formular bleibt unverändert und ist bereits korrekt -->
   <form [formGroup]="productForm" (ngSubmit)="onSubmit()">
-    <h3>{{ selectedProductId ? 'Produkt bearbeiten' : 'Neues Produkt erstellen' }}</h3>
-
-    <!-- Basis-Informationen -->
+    <!-- ... (Dein komplettes Formular hier) ... -->
+    <h3>
+      {{ selectedProductId ? "Produkt bearbeiten" : "Neues Produkt erstellen" }}
+    </h3>
     <h4>Basis-Informationen</h4>
+    <div><label>Name:</label><input type="text" formControlName="name" /></div>
     <div>
-      <label for="name">Name:</label>
-      <input id="name" type="text" formControlName="name">
+      <label>Slug (automatisch generiert):</label
+      ><input type="text" formControlName="slug" />
     </div>
     <div>
-      <label for="slug">Slug (automatisch generiert):</label>
-      <input id="slug" type="text" formControlName="slug">
-    </div>
-    <div>
-      <label for="sku">SKU (Artikelnummer):</label>
-      <div style="display: flex; align-items: center; gap: 10px;">
-        <input id="sku" type="text" formControlName="sku" style="flex-grow: 1;">
-        <button type="button" (click)="generateSku()">Generieren</button>
+      <label>SKU (Artikelnummer):</label>
+      <div style="display: flex; align-items: center; gap: 10px">
+        <input
+          id="sku"
+          type="text"
+          formControlName="sku"
+          style="flex-grow: 1"
+        /><button type="button" (click)="generateSku()">Generieren</button>
       </div>
     </div>
     <div>
-      <label for="description">Beschreibung:</label>
-      <textarea id="description" formControlName="description" rows="5"></textarea>
+      <label>Beschreibung:</label
+      ><textarea formControlName="description" rows="5"></textarea>
     </div>
-
-    <hr>
-    
-    <!-- Preis & Lager -->
+    <hr />
     <h4>Preis & Lager</h4>
     <div>
-      <label for="price">Preis (€):</label>
-      <input id="price" type="number" formControlName="price">
+      <label>Preis (€):</label><input type="number" formControlName="price" />
     </div>
     <div>
-      <label for="oldPrice">Alter Preis (€) (optional):</label>
-      <input id="oldPrice" type="number" formControlName="oldPrice">
+      <label>Alter Preis (€) (optional):</label
+      ><input type="number" formControlName="oldPrice" />
     </div>
     <div>
-      <label for="purchasePrice">Einkaufspreis (€) (optional):</label>
-      <input id="purchasePrice" type="number" formControlName="purchasePrice">
+      <label>Einkaufspreis (€) (optional):</label
+      ><input type="number" formControlName="purchasePrice" />
     </div>
     <div>
-      <label for="stock">Lagerbestand:</label>
-      <input id="stock" type="number" formControlName="stockQuantity">
+      <label>Lagerbestand:</label
+      ><input type="number" formControlName="stockQuantity" />
     </div>
     <div>
-      <label for="weight">Gewicht (in kg) (optional):</label>
-      <input id="weight" type="number" formControlName="weight">
+      <label>Gewicht (in kg) (optional):</label
+      ><input type="number" formControlName="weight" />
     </div>
-    
-    <hr>
-
-    <!-- Zuweisungen -->
+    <hr />
     <h4>Zuweisungen</h4>
     <div>
-        <label for="supplier">Lieferant:</label>
-        <select id="supplier" formControlName="supplierId">
-            <option [ngValue]="null">-- Kein Lieferant --</option>
-            <option *ngFor="let supplier of allSuppliers$ | async" [value]="supplier.id">{{ supplier.name }}</option>
-        </select>
+      <label>Lieferant:</label
+      ><select formControlName="supplierId">
+        <option [ngValue]="null">-- Kein Lieferant --</option>
+        <option
+          *ngFor="let supplier of allSuppliers$ | async"
+          [value]="supplier.id"
+        >
+          {{ supplier.name }}
+        </option>
+      </select>
     </div>
-
     <div>
       <label>Kategorien:</label>
-      <div class="category-checkbox-group" style="height: 100px; overflow-y: auto; border: 1px solid #ccc; padding: 5px; margin-top: 5px;">
+      <div
+        class="category-checkbox-group"
+        style="
+          height: 100px;
+          overflow-y: auto;
+          border: 1px solid #ccc;
+          padding: 5px;
+          margin-top: 5px;
+        "
+      >
         <div *ngFor="let category of allCategories$ | async">
-          <label>
-            <input 
-              type="checkbox" 
+          <label
+            ><input
+              type="checkbox"
               [value]="category.id"
               [checked]="isCategorySelected(category.id)"
-              (change)="onCategoryChange($event)">
-            {{ category.name }}
-          </label>
+              (change)="onCategoryChange($event)"
+            />{{ category.name }}</label
+          >
         </div>
       </div>
     </div>
-
-    <hr>
-    
-    <!-- Bilder -->
+    <hr />
     <h4>Produktbilder</h4>
     <div *ngIf="selectedProductId && existingImages.length > 0">
       <p>Bestehende Bilder:</p>
-      <div style="display: flex; gap: 10px; flex-wrap: wrap; margin-bottom: 15px;">
-        <div *ngFor="let img of existingImages" style="position: relative;">
-          <img [src]="img.url" [alt]="productForm.get('name')?.value" 
-               style="width: 100px; height: 100px; object-fit: cover; border: 2px solid" 
-               [style.borderColor]="img.isMainImage ? 'green' : 'gray'">
-          <button (click)="deleteExistingImage(img.id, $event)" 
-                  style="position: absolute; top: -5px; right: -5px; background: red; color: white; border-radius: 50%; width: 20px; height: 20px; border: none; cursor: pointer; line-height: 20px; text-align: center; padding: 0;">X</button>
+      <div
+        style="display: flex; gap: 10px; flex-wrap: wrap; margin-bottom: 15px"
+      >
+        <div *ngFor="let img of existingImages" style="position: relative">
+          <img
+            [src]="img.url"
+            [alt]="productForm.get('name')?.value"
+            style="
+              width: 100px;
+              height: 100px;
+              object-fit: cover;
+              border: 2px solid;
+            "
+            [style.borderColor]="img.isMainImage ? 'green' : 'gray'"
+          /><button
+            (click)="deleteExistingImage(img.id, $event)"
+            style="
+              position: absolute;
+              top: -5px;
+              right: -5px;
+              background: red;
+              color: white;
+              border-radius: 50%;
+              width: 20px;
+              height: 20px;
+              border: none;
+              cursor: pointer;
+              line-height: 20px;
+              text-align: center;
+              padding: 0;
+            "
+          >
+            X
+          </button>
         </div>
       </div>
     </div>
     <div>
-      <label for="main-image">Hauptbild (ersetzt bestehendes Hauptbild)</label>
-      <input id="main-image" type="file" (change)="onMainFileChange($event)" accept="image/*">
+      <label for="main-image">Hauptbild (ersetzt bestehendes Hauptbild)</label
+      ><input
+        id="main-image"
+        type="file"
+        (change)="onMainFileChange($event)"
+        accept="image/*"
+      />
     </div>
     <div>
-      <label for="additional-images">Zusätzliche Bilder hinzufügen</label>
-      <input id="additional-images" type="file" (change)="onAdditionalFilesChange($event)" accept="image/*" multiple>
+      <label for="additional-images">Zusätzliche Bilder hinzufügen</label
+      ><input
+        id="additional-images"
+        type="file"
+        (change)="onAdditionalFilesChange($event)"
+        accept="image/*"
+        multiple
+      />
     </div>
-
-    <hr>
-    
-    <!-- Status & Sichtbarkeit -->
+    <hr />
     <h4>Status & Sichtbarkeit</h4>
-    <div><label><input type="checkbox" formControlName="isActive"> Aktiv (im Shop sichtbar)</label></div>
-    <div><label><input type="checkbox" formControlName="isFeatured"> Hervorgehoben (z.B. auf Startseite)</label></div>
-    <div><label>Anzeigereihenfolge (Hervorgehoben):</label><input type="number" formControlName="featuredDisplayOrder"></div>
-    
-    <br><br>
-
-    <button type="submit" [disabled]="productForm.invalid">{{ selectedProductId ? 'Aktualisieren' : 'Erstellen' }}</button>
-    <button type="button" *ngIf="selectedProductId" (click)="clearSelection()">Abbrechen</button>
+    <div>
+      <label
+        ><input type="checkbox" formControlName="isActive" /> Aktiv (im Shop
+        sichtbar)</label
+      >
+    </div>
+    <div>
+      <label
+        ><input type="checkbox" formControlName="isFeatured" /> Hervorgehoben
+        (z.B. auf Startseite)</label
+      >
+    </div>
+    <div>
+      <label>Anzeigereihenfolge (Hervorgehoben):</label
+      ><input type="number" formControlName="featuredDisplayOrder" />
+    </div>
+    <br /><br />
+    <button type="submit" [disabled]="productForm.invalid">
+      {{ selectedProductId ? "Aktualisieren" : "Erstellen" }}
+    </button>
+    <button type="button" *ngIf="selectedProductId" (click)="clearSelection()">
+      Abbrechen
+    </button>
   </form>
 
-  <hr>
-
-  <h2>Bestehende Produkte</h2>
-  <ul>
-    <li *ngFor="let product of products$ | async">
-      {{ product.name }} (SKU: {{ product.sku }}) - Preis: {{ product.price | currency:'EUR' }}
-      <button (click)="selectProduct(product)">Bearbeiten</button>
-      <button (click)="onDelete(product.id)">Löschen</button>
-    </li>
-  </ul>
-</div>
\ No newline at end of file
+  <hr />
+<h2>Bestehende Produkte</h2>
+  
+<table style="width: 100%; border-collapse: collapse;">
+  <thead>
+    <tr >
+      <th style="padding: 8px; border: 1px solid #ddd;">Bild</th>
+      <th style="padding: 8px; border: 1px solid #ddd;">Name</th>
+      <th style="padding: 8px; border: 1px solid #ddd;">SKU</th>
+      <th style="padding: 8px; border: 1px solid #ddd;">Preis</th>
+      <th style="padding: 8px; border: 1px solid #ddd;">Lagerbestand</th>
+      <th style="padding: 8px; border: 1px solid #ddd;">Aktiv</th>
+      <th style="padding: 8px; border: 1px solid #ddd;">Aktionen</th>
+    </tr>
+  </thead>
+  <tbody>
+    <ng-container *ngIf="products$ | async as products; else loading">
+      <tr *ngIf="products.length === 0">
+        <td colspan="7" style="text-align: center; padding: 16px;">Keine Produkte gefunden.</td>
+      </tr>
+      <tr *ngFor="let product of products">
+        <td style="padding: 8px; border: 1px solid #ddd; text-align: center;">
+          <!-- +++ HIER IST DIE KORREKTUR +++ -->
+          <img 
+            [src]="getMainImageUrl(product.images)" 
+            [alt]="product.name" 
+            style="width: 50px; height: 50px; object-fit: cover;">
+        </td>
+        <td style="padding: 8px; border: 1px solid #ddd;">
+          <strong>{{ product.name }}</strong><br>
+          <small style="color: #777;">Slug: {{ product.slug }}</small>
+        </td>
+        <td style="padding: 8px; border: 1px solid #ddd;">{{ product.sku }}</td>
+        <td style="padding: 8px; border: 1px solid #ddd;">{{ product.price | currency:'EUR' }}</td>
+        <td style="padding: 8px; border: 1px solid #ddd;">{{ product.stockQuantity }}</td>
+        <td style="padding: 8px; border: 1px solid #ddd; text-align: center;" [style.color]="product.isActive ? 'green' : 'red'">
+          {{ product.isActive ? 'Ja' : 'Nein' }}
+        </td>
+        <td style="padding: 8px; border: 1px solid #ddd; width: 150px; text-align: center;">
+          <button (click)="selectProduct(product)">Bearbeiten</button>
+          <button (click)="onDelete(product.id)" style="margin-left: 5px; background-color: #dc3545; color: white;">Löschen</button>
+        </td>
+      </tr>
+    </ng-container>
+    <ng-template #loading>
+      <tr>
+        <td colspan="7" style="text-align: center; padding: 16px;">Lade Produkte...</td>
+      </tr>
+    </ng-template>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/src/app/features/components/products/product-list/product-list.component.ts b/src/app/features/components/products/product-list/product-list.component.ts
index 5095adb..6454fc3 100644
--- a/src/app/features/components/products/product-list/product-list.component.ts
+++ b/src/app/features/components/products/product-list/product-list.component.ts
@@ -265,4 +265,18 @@ export class ProductListComponent implements OnInit, OnDestroy {
   private capitalizeFirstLetter(string: string): string {
     return string.charAt(0).toUpperCase() + string.slice(1);
   }
+
+   /**
+   * Sucht das Hauptbild aus der Bilderliste eines Produkts und gibt dessen URL zurück.
+   * Gibt eine Platzhalter-URL zurück, wenn kein Hauptbild gefunden wird.
+   * @param images Die Liste der Produktbilder.
+   * @returns Die URL des Hauptbildes oder eine Platzhalter-URL.
+   */
+  getMainImageUrl(images?: ProductImage[]): string {
+    if (!images || images.length === 0) {
+      return 'https://via.placeholder.com/50'; // Platzhalter, wenn gar keine Bilder vorhanden sind
+    }
+    const mainImage = images.find(img => img.isMainImage);
+    return mainImage?.url || images[0].url || 'https://via.placeholder.com/50'; // Fallback auf das erste Bild, wenn kein Hauptbild markiert ist
+  }
 }
diff --git a/src/app/features/components/settings/settings/settings.component.html b/src/app/features/components/settings/settings/settings.component.html
index 9055778..974996a 100644
--- a/src/app/features/components/settings/settings/settings.component.html
+++ b/src/app/features/components/settings/settings/settings.component.html
@@ -1,29 +1,33 @@
 <div>
   <h1>Einstellungen verwalten</h1>
+  
   <form [formGroup]="settingsForm" (ngSubmit)="onSubmit()">
-    <div formArrayName="settings">
-      <div *ngFor="let group of settingGroups">
-        <h3>{{ group.groupName }}</h3>
-        <div *ngFor="let setting of group.settings; let i = index">
-          <!-- Find the correct form group in the FormArray by key -->
-          <ng-container
-            *ngFor="let control of settingsArray.controls; let j = index"
-          >
-            <div
-              *ngIf="control.get('key')?.value === setting.key"
-              [formGroupName]="j"
-            >
-              <label>{{ setting.description || setting.key }}</label>
-              <input type="text" formControlName="value" />
-              <label
-                ><input type="checkbox" formControlName="isActive" />
-                Aktiv</label
-              >
-            </div>
-          </ng-container>
+    <div formArrayName="groups">
+      <fieldset *ngFor="let groupControl of groups.controls; let i = index" [formGroupName]="i">
+        <legend>{{ groupControl.get('groupName')?.value }}</legend>
+
+        <!-- +++ VERWENDUNG DER NEUEN HILFSFUNKTION +++ -->
+        <div formArrayName="settings">
+          <div *ngFor="let settingControl of getSettingsFormArray(i).controls; let j = index" [formGroupName]="j" class="setting-item">
+            
+            <label [for]="'setting-value-' + i + '-' + j">
+              {{ settingControl.get('description')?.value || settingControl.get('key')?.value }}
+            </label>
+            
+            <input [id]="'setting-value-' + i + '-' + j" type="text" formControlName="value" />
+            
+            <label class="active-label">
+              <input type="checkbox" formControlName="isActive" />
+              Aktiv
+            </label>
+
+          </div>
         </div>
-      </div>
+        <!-- +++ ENDE +++ -->
+      </fieldset>
     </div>
-    <button type="submit">Einstellungen speichern</button>
+
+    <br>
+    <button type="submit" [disabled]="settingsForm.invalid">Einstellungen speichern</button>
   </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/features/components/settings/settings/settings.component.ts b/src/app/features/components/settings/settings/settings.component.ts
index 4e6df98..1210022 100644
--- a/src/app/features/components/settings/settings/settings.component.ts
+++ b/src/app/features/components/settings/settings/settings.component.ts
@@ -14,41 +14,71 @@ export class SettingsComponent implements OnInit {
   private settingService = inject(SettingService);
   private fb = inject(FormBuilder);
   
-  settingsForm: FormGroup;
-  settingGroups: { groupName: string, settings: Setting[] }[] = [];
+  settingsForm!: FormGroup;
 
   constructor() {
     this.settingsForm = this.fb.group({
-      settings: this.fb.array([])
+      groups: this.fb.array([])
     });
   }
 
-  get settingsArray(): FormArray {
-    return this.settingsForm.get('settings') as FormArray;
+  get groups(): FormArray {
+    return this.settingsForm.get('groups') as FormArray;
   }
 
+  // +++ NEUE HILFSFUNKTION +++
+  /**
+   * Gibt das 'settings'-FormArray für eine bestimmte Gruppe zurück.
+   * Ermöglicht einen sauberen Zugriff im Template.
+   * @param groupIndex Der Index der Gruppe im 'groups'-FormArray.
+   * @returns Das verschachtelte 'settings'-FormArray.
+   */
+  getSettingsFormArray(groupIndex: number): FormArray {
+    return (this.groups.at(groupIndex) as FormGroup).get('settings') as FormArray;
+  }
+  // +++ ENDE NEU +++
+
   ngOnInit(): void {
     this.settingService.getAllGrouped().subscribe(groupedSettings => {
-      this.settingsArray.clear();
-      this.settingGroups = [];
+      this.groups.clear();
+
       Object.keys(groupedSettings).forEach(groupName => {
         const settings = groupedSettings[groupName];
-        this.settingGroups.push({ groupName, settings });
-        settings.forEach(setting => {
-          this.settingsArray.push(this.fb.group({
+        
+        const settingsControls = settings.map(setting => 
+          this.fb.group({
             key: [setting.key],
             value: [setting.value],
-            isActive: [setting.isActive]
-          })); 
-        });
+            isActive: [setting.isActive],
+            description: [setting.description]
+          })
+        );
+
+        this.groups.push(this.fb.group({
+          groupName: [groupName],
+          settings: this.fb.array(settingsControls)
+        }));
       });
     });
   }
 
   onSubmit(): void {
     if (this.settingsForm.invalid) return;
-    this.settingService.update(this.settingsForm.value.settings).subscribe(() => {
-      alert('Einstellungen gespeichert!');
+
+    const allSettings: Setting[] = this.groups.value
+      .flatMap((group: any) => group.settings)
+      .map((setting: any) => ({
+        key: setting.key,
+        value: setting.value,
+        isActive: setting.isActive
+      }));
+
+    this.settingService.update(allSettings).subscribe({
+      next: () => alert('Einstellungen erfolgreich gespeichert!'),
+      error: (err) => {
+        alert('Fehler beim Speichern der Einstellungen.');
+        console.error('Failed to update settings', err);
+      }
     });
   }
 }
\ No newline at end of file
diff --git a/src/app/shared/components/layout/sidebar/sidebar.component.html b/src/app/shared/components/layout/sidebar/sidebar.component.html
index 96e263c..0f21053 100644
--- a/src/app/shared/components/layout/sidebar/sidebar.component.html
+++ b/src/app/shared/components/layout/sidebar/sidebar.component.html
@@ -71,6 +71,15 @@
 
       <span>reviews</span>
     </div>
+    <!-- <div
+      class="nav-item"
+      [class.active]="activeRoute === 'settings'"
+      (click)="setActive('settings')"
+    >
+      <app-icon [iconName]="'placeholder'" [svgColor]="'#8e44ad'"></app-icon>
+
+      <span>settings</span>
+    </div> -->
     <div
       class="nav-item"
       [class.active]="activeRoute === 'shipping-methods'"
@@ -107,5 +116,14 @@
 
       <span>users</span>
     </div>
+    <div
+      class="nav-item"
+      [class.active]="activeRoute === 'analytics'"
+      (click)="setActive('analytics')"
+    >
+      <app-icon [iconName]="'placeholder'" [svgColor]="'#8e44ad'"></app-icon>
+
+      <span>analytics</span>
+    </div>
   </nav>
 </aside>