diff --git a/eeg_frontend/src/app/guards/auth-guard.ts b/eeg_frontend/src/app/guards/auth-guard.ts
index 6d7e39a..0bd1c22 100644
--- a/eeg_frontend/src/app/guards/auth-guard.ts
+++ b/eeg_frontend/src/app/guards/auth-guard.ts
@@ -10,6 +10,5 @@ export const authGuard: CanActivateFn = () => {
     return true;
   }
 
-  console.warn('Zugriff verweigert: Login erforderlich.');
   return router.createUrlTree(['/login']);
 };
diff --git a/eeg_frontend/src/app/guards/role-guard.ts b/eeg_frontend/src/app/guards/role-guard.ts
index 06693b5..1968f13 100644
--- a/eeg_frontend/src/app/guards/role-guard.ts
+++ b/eeg_frontend/src/app/guards/role-guard.ts
@@ -12,7 +12,6 @@ export function roleGuard(allowedRoles: string[]): CanActivateFn {
       return true;
     }
 
-    console.warn(`Zugriff verweigert: benötigt eine der Rollen [${allowedRoles.join(', ')}].`);
     return router.createUrlTree(['/dashboard']);
   };
 }
diff --git a/eeg_frontend/src/app/layout/header/header.html b/eeg_frontend/src/app/layout/header/header.html
index 7aa62f7..4e0de21 100644
--- a/eeg_frontend/src/app/layout/header/header.html
+++ b/eeg_frontend/src/app/layout/header/header.html
@@ -16,8 +16,6 @@
       <div class="hidden md:flex absolute left-1/2 transform -translate-x-1/2">
         <nav class="flex gap-6">
           <a href="#vorteile" class="text-slate-600 hover:text-slate-900 font-medium">Vorteile</a>
-          <a href="#so-gehts" class="text-slate-600 hover:text-slate-900 font-medium">So funktioniert's</a>
-          <a href="#faq" class="text-slate-600 hover:text-slate-900 font-medium">FAQ</a>
         </nav>
       </div>
 
diff --git a/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.html b/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.html
index e1b88dc..7036a98 100644
--- a/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.html
+++ b/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.html
@@ -64,7 +64,7 @@
       <div class="bg-white rounded-2xl shadow-xl w-full max-w-lg overflow-hidden flex flex-col max-h-[90vh]">
 
         <div class="px-6 py-4 border-b border-slate-200 flex justify-between items-center bg-slate-50 shrink-0">
-          <h3 class="text-lg font-bold text-slate-800">Neue Energiegemeinschaft anlegen</h3>
+          <h3 class="text-lg font-bold text-slate-800">{{ isEditMode ? 'Energiegemeinschaft bearbeiten' : 'Neue Energiegemeinschaft anlegen' }}</h3>
           <button (click)="closeModal()" class="text-slate-400 hover:text-slate-600 transition-colors">
             <svg class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
diff --git a/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.ts b/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.ts
index a8ed7f7..eefa6a0 100644
--- a/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.ts
+++ b/eeg_frontend/src/app/pages/admin-energy-community/admin-energy-community.ts
@@ -2,6 +2,7 @@ import {Component, inject, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormBuilder, ReactiveFormsModule, Validators} from '@angular/forms';
 import {EnergyCommunityAdminControllerService, EnergyCommunityDto} from '../../api';
+import {ToastService} from '../../services/toast';
 
 @Component({
   selector: 'app-admin-energy-community',
@@ -12,6 +13,7 @@ import {EnergyCommunityAdminControllerService, EnergyCommunityDto} from '../../a
 export class AdminEnergyCommunity implements OnInit {
   private ecService = inject(EnergyCommunityAdminControllerService);
   private fb = inject(FormBuilder);
+  private toastService = inject(ToastService);
 
   communities: EnergyCommunityDto[] = [];
 
@@ -38,8 +40,7 @@ export class AdminEnergyCommunity implements OnInit {
         this.communities = data;
       },
       error: (err) => {
-        console.error('Fehler beim Laden der Energiegemeinschaften', err);
-        // Hier würde später ein globaler Error-Toast getriggert werden
+        this.toastService.error(err.error?.message || 'Fehler beim Laden der Energiegemeinschaften.');
       }
     });
   }
@@ -80,7 +81,9 @@ export class AdminEnergyCommunity implements OnInit {
             if (index !== -1) this.communities[index] = updatedEc;
             this.closeModal();
           },
-          error: (err) => console.error('Fehler beim Updaten', err)
+          error: (err) => {
+            this.toastService.error(err.error?.message || 'Fehler beim Aktualisieren der Energiegemeinschaft.');
+          }
         });
       } else {
         this.ecService.createEnergyCommunity(formData as any).subscribe({
@@ -88,7 +91,9 @@ export class AdminEnergyCommunity implements OnInit {
             this.communities.push(newCommunity);
             this.closeModal();
           },
-          error: (err) => console.error('Fehler beim Erstellen', err)
+          error: (err) => {
+            this.toastService.error(err.error?.message || 'Fehler beim Erstellen der Energiegemeinschaft.');
+          }
         });
       }
     } else {
@@ -109,9 +114,7 @@ export class AdminEnergyCommunity implements OnInit {
           this.communities = this.communities.filter(c => c.id !== id);
         },
         error: (err) => {
-          console.error('Löschen fehlgeschlagen', err);
-          const errorMsg = err.error?.message || 'Die Energiegemeinschaft konnte nicht gelöscht werden.';
-          alert(errorMsg);
+          this.toastService.error(err.error?.message || 'Die Energiegemeinschaft konnte nicht gelöscht werden.');
         }
       });
     }
diff --git a/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.html b/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.html
index ca7ac74..262b6b6 100644
--- a/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.html
+++ b/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.html
@@ -29,7 +29,7 @@
           <thead>
           <tr class="bg-gray-50 border-b border-gray-200">
             <th class="p-4 text-sm font-semibold text-gray-700 uppercase tracking-wider">Benutzer</th>
-            <th class="p-4 text-sm font-semibold text-gray-700 uppercase tracking-wider">Zählpunkt</th>
+            <th class="p-4 text-sm font-semibold text-gray-700 uppercase tracking-wider">Status</th>
             <th class="p-4 text-sm font-semibold text-gray-700 uppercase tracking-wider">Status</th>
             <th class="p-4 text-sm font-semibold text-gray-700 uppercase tracking-wider text-right">Aktionen</th>
           </tr>
diff --git a/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.ts b/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.ts
index 71fc0f2..ca0bcc4 100644
--- a/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.ts
+++ b/eeg_frontend/src/app/pages/admin-user-approval/admin-user-approval.ts
@@ -1,6 +1,7 @@
 import {Component, DestroyRef, inject, OnInit, signal} from '@angular/core';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 import {AdminIAMService, UserProfileResponse} from '../../api';
+import {ToastService} from '../../services/toast';
 
 @Component({
   selector: 'app-admin-user-approval',
@@ -16,7 +17,8 @@ export class AdminUserApprovalComponent implements OnInit {
   public readonly errorMessage = signal<string>('');
 
   private readonly adminService = inject(AdminIAMService);
-  private readonly destroyRef = inject(DestroyRef); // Für sauberes Ressourcen-Management
+  private readonly destroyRef = inject(DestroyRef);
+  private readonly toastService = inject(ToastService);
 
   public ngOnInit(): void {
     this.loadPendingUsers();
@@ -33,8 +35,7 @@ export class AdminUserApprovalComponent implements OnInit {
           this.pendingUsers.set(users);
           this.isLoading.set(false);
         },
-        error: (error) => {
-          console.error('Failed to load pending users:', error);
+        error: () => {
           this.errorMessage.set('Fehler beim Laden der Daten aus dem EDA-Netz-Check.');
           this.isLoading.set(false);
         }
@@ -51,18 +52,14 @@ export class AdminUserApprovalComponent implements OnInit {
         next: () => {
           this.pendingUsers.update(users => users.filter(user => user.id !== userId));
         },
-        error: (error) => {
-          console.error(`Failed to approve user with ID ${userId}:`, error);
+        error: () => {
           this.errorMessage.set('Der User konnte nicht freigegeben werden.');
         }
       });
   }
 
   public rejectUser(user: UserProfileResponse): void {
-    if (!user.id) {
-      console.error('Fehler: UserProfileResponse hat keine ID.');
-      return;
-    }
+    if (!user.id) return;
 
     if (confirm(`Möchtest du die Registrierung von ${user.firstName} ${user.lastName} wirklich ablehnen?`)) {
       this.adminService.rejectUser(user.id).subscribe({
@@ -70,8 +67,7 @@ export class AdminUserApprovalComponent implements OnInit {
          this.pendingUsers.update(users => users.filter(u => u.id !== user.id));
         },
         error: (err) => {
-          console.error('Fehler beim Ablehnen des Users', err);
-          alert(err.error?.message || 'Der User konnte nicht abgelehnt werden.');
+          this.toastService.error(err.error?.message || 'Der User konnte nicht abgelehnt werden.');
         }
       });
     }
diff --git a/eeg_frontend/src/app/pages/register/register.ts b/eeg_frontend/src/app/pages/register/register.ts
index 2a86918..e0243ce 100644
--- a/eeg_frontend/src/app/pages/register/register.ts
+++ b/eeg_frontend/src/app/pages/register/register.ts
@@ -80,8 +80,7 @@ export class Register {
       next: () => {
         this.registeredSuccessfully = true;
       },
-      error: (err) => {
-        console.error('Fehler bei der Registrierung', err);
+      error: () => {
       }
     });
   }