diff --git a/app.py b/app.py
index dc912d8..0beea4c 100644
--- a/app.py
+++ b/app.py
@@ -1,4 +1,3 @@
-
 from flask import Flask, request, jsonify, session, render_template_string, redirect
 import os
 import json
@@ -24,7 +23,7 @@ default_users = [
         'is_active': True,
         'created_at': datetime.now().isoformat(),
         'last_login': None,
-        'force_password_change': False  # Nach erstmaligem Login Passwort ändern
+        'force_password_change': False
     }
 ]
 
@@ -79,7 +78,7 @@ Buchungsdetails:
 - Datum: {date}
 - Uhrzeit: {time}
 - Personen: {guests}
-- Tische: {tables}
+- Raum: {room}
 
 Wir freuen uns auf Ihren Besuch!
 
@@ -124,12 +123,14 @@ Ihr Restaurant-Team
 """
 }
 
-# Datenstruktur
+# Datenstruktur - Räume mit Kapazität und Block-Status
 rooms = [
     {
         'id': 1,
         'name': 'Hauptraum',
         'description': 'Großer Saal mit Fensterfront',
+        'capacity': 40,
+        'blocked': False,
         'tables': [
             {'id': 1, 'name': 'Tisch 1', 'seats': 4, 'shape': 'circle'},
             {'id': 2, 'name': 'Tisch 2', 'seats': 2, 'shape': 'circle'},
@@ -141,6 +142,8 @@ rooms = [
         'id': 2,
         'name': 'Nebenraum',
         'description': 'Gemütlicher kleiner Raum',
+        'capacity': 20,
+        'blocked': False,
         'tables': [
             {'id': 5, 'name': 'Tisch A', 'seats': 4, 'shape': 'circle'},
             {'id': 6, 'name': 'Tisch B', 'seats': 4, 'shape': 'circle'},
@@ -150,6 +153,8 @@ rooms = [
         'id': 3,
         'name': 'Terrasse',
         'description': 'Draußen unter dem Vordach',
+        'capacity': 15,
+        'blocked': False,
         'tables': [
             {'id': 7, 'name': 'Tisch T1', 'seats': 4, 'shape': 'rect'},
             {'id': 8, 'name': 'Tisch T2', 'seats': 4, 'shape': 'rect'},
@@ -166,6 +171,12 @@ def generate_booking_id():
         if not any(r.get('booking_id') == booking_id for r in reservations):
             return booking_id
 
+def get_room(room_id):
+    for room in rooms:
+        if room['id'] == room_id:
+            return room
+    return None
+
 def get_table(table_id):
     for room in rooms:
         for table in room['tables']:
@@ -176,11 +187,14 @@ def get_table(table_id):
 def get_available_tables(date_str, time_str):
     available = []
     for room in rooms:
+        if room.get('blocked', False):
+            continue
         for table in room['tables']:
             table_copy = table.copy()
             table_copy['room_id'] = room['id']
             table_copy['room_name'] = room['name']
-            available.append(table_copy)
+            if is_table_available(table['id'], date_str, time_str):
+                available.append(table_copy)
     return available
 
 def is_table_available(table_id, date_str, time_str):
@@ -190,6 +204,44 @@ def is_table_available(table_id, date_str, time_str):
                 return False
     return True
 
+def auto_assign_tables(room_id, guests, date_str, time_str):
+    """Automatische Tisch-Zuweisung basierend auf Raum und Gästeanzahl"""
+    room = get_room(room_id)
+    if not room:
+        return None, "Raum nicht gefunden"
+    
+    if room.get('blocked', False):
+        return None, "Raum ist derzeit nicht verfügbar"
+    
+    # Alle verfügbaren Tische im Raum
+    available_tables = []
+    for table in room['tables']:
+        if is_table_available(table['id'], date_str, time_str):
+            available_tables.append(table)
+    
+    if not available_tables:
+        return None, "Keine Tische im Raum verfügbar"
+    
+    # Sortiere nach Sitzplätzen (größte zuerst)
+    available_tables.sort(key=lambda t: t['seats'], reverse=True)
+    
+    # Finde beste Kombination für Gäste
+    total_seats = sum(t['seats'] for t in available_tables)
+    if total_seats < guests:
+        return None, f"Nicht genügend Platz im Raum. Verfügbar: {total_seats} Plätze"
+    
+    # Wähle Tische aus (greedy - erst große, dann kleine)
+    selected_tables = []
+    remaining_guests = guests
+    
+    for table in available_tables:
+        if remaining_guests <= 0:
+            break
+        selected_tables.append(table)
+        remaining_guests -= table['seats']
+    
+    return [t['id'] for t in selected_tables], None
+
 def send_email_smtp(to_email, subject, body):
     try:
         import smtplib
@@ -251,21 +303,9 @@ PUBLIC_RESERVATION_HTML = '''
             width: 100%; padding: 1rem; border: 2px solid #e0e0e0;
             border-radius: 10px; font-size: 1rem;
         }
-        .form-group input:focus { outline: none; border-color: #667eea; }
-        .checkbox-group {
-            display: flex; align-items: center; gap: 0.75rem;
-            padding: 1rem; background: #f8f9fa; border-radius: 10px;
-            border: 2px solid #e0e0e0; cursor: pointer;
-        }
-        .checkbox-group input[type="checkbox"] { width: 24px; height: 24px; }
-        .table-selection {
-            display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 0.75rem;
-        }
-        .table-option {
-            border: 2px solid #e0e0e0; border-radius: 12px; padding: 1rem;
-            text-align: center; cursor: pointer; transition: all 0.2s;
-        }
-        .table-option.selected { border-color: #667eea; background: #f0f4ff; }
+        .form-group input:focus, .form-group select:focus { outline: none; border-color: #667eea; }
+        .error-msg { display: none; color: #ef4444; font-size: 0.85rem; margin-top: 0.5rem; }
+        .success-message { text-align: center; padding: 3rem 2rem; }
         .btn {
             width: 100%; padding: 1.25rem;
             background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
@@ -273,12 +313,13 @@ PUBLIC_RESERVATION_HTML = '''
             font-size: 1.1rem; font-weight: 600; cursor: pointer;
         }
         .btn:disabled { opacity: 0.6; cursor: not-allowed; }
-        .success-message { text-align: center; padding: 3rem 2rem; }
         .booking-id { 
             background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
             color: white; padding: 1rem 2rem; border-radius: 10px;
             font-size: 1.5rem; font-weight: bold; margin: 1rem 0; letter-spacing: 2px;
         }
+        .hidden { display: none !important; }
+        .capacity-info { color: #667eea; font-size: 0.9rem; margin-top: 0.5rem; }
     </style>
 </head>
 <body>
@@ -314,22 +355,20 @@ PUBLIC_RESERVATION_HTML = '''
                 <h2>👥 Wie viele Personen?</h2>
                 <div class="form-group">
                     <label>Anzahl Personen <span class="required">*</span></label>
-                    <input type="number" id="res-guests" value="2" min="1" max="50">
+                    <input type="number" id="res-guests" value="2" min="1" max="50" onchange="validateCapacity()">
                 </div>
             </div>
             
             <div class="card">
-                <h2>🪑 Welcher Raum?</h2>
+                <h2>🏠 Welcher Raum?</h2>
                 <div class="form-group" id="group-room">
                     <label>Raum wählen <span class="required">*</span></label>
-                    <select id="res-room" onchange="checkRoomCapacity()">
+                    <select id="res-room" onchange="updateRoomInfo()">
                         <option value="">Bitte wählen...</option>
-                        <option value="1">Saal (bis 40 Personen)</option>
-                        <option value="2">Nebenzimmer (bis 20 Personen)</option>
-                        <option value="3">Wintergarten (bis 15 Personen)</option>
                     </select>
-                    <div class="error-msg" id="room-error" style="display: none; color: #ef4444; font-size: 0.85rem; margin-top: 0.5rem;">Bitte wählen Sie einen Raum aus</div>
-                    <div id="room-info" style="margin-top: 0.5rem; color: #667eea; font-size: 0.9rem;"></div>
+                    <div class="error-msg" id="room-error">Bitte wählen Sie einen Raum aus</div>
+                    <div class="capacity-info" id="room-info"></div>
+                    <div class="error-msg" id="capacity-error" style="color: #f59e0b;"></div>
                 </div>
             </div>
             
@@ -353,14 +392,6 @@ PUBLIC_RESERVATION_HTML = '''
                 </div>
             </div>
             
-            <div class="card">
-                <h2>🤖 Sicherheitsprüfung</h2>
-                <label class="checkbox-group" onclick="toggleCaptcha()">
-                    <input type="checkbox" id="captcha-check">
-                    <label for="captcha-check">Ich bin kein Roboter</label>
-                </label>
-            </div>
-            
             <div class="card" style="background: transparent; box-shadow: none; padding: 0;">
                 <button class="btn" id="submit-btn" onclick="submitReservation()" disabled>
                     📧 Reservierung mit Bestätigungsmail senden
@@ -381,50 +412,76 @@ PUBLIC_RESERVATION_HTML = '''
     </div>
 
     <script>
-        let selectedTables = [];
+        let roomsData = [];
         document.getElementById('res-date').valueAsDate = new Date();
         document.getElementById('res-date').min = new Date().toISOString().split('T')[0];
         
-        document.getElementById('res-date').addEventListener('change', loadAvailableTables);
-        document.getElementById('res-time').addEventListener('change', loadAvailableTables);
+        // Lade Räume beim Start
+        async function loadRooms() {
+            const res = await fetch('/api/public/rooms');
+            const data = await res.json();
+            roomsData = data.rooms.filter(r => !r.blocked);
+            
+            const select = document.getElementById('res-room');
+            select.innerHTML = '<option value="">Bitte wählen...</option>' +
+                roomsData.map(r => `<option value="${r.id}">${r.name} (bis ${r.capacity} Personen)</option>`).join('');
+        }
         
-        async function loadAvailableTables() {
+        loadRooms();
+        
+        function updateRoomInfo() {
+            const roomId = parseInt(document.getElementById('res-room').value);
+            const room = roomsData.find(r => r.id === roomId);
+            const infoDiv = document.getElementById('room-info');
+            const capacityError = document.getElementById('capacity-error');
+            
+            if (room) {
+                infoDiv.textContent = `${room.tables.length} Tische verfügbar · Gesamtkapazität: ${room.capacity} Plätze`;
+                validateCapacity();
+            } else {
+                infoDiv.textContent = '';
+                capacityError.style.display = 'none';
+            }
+            checkFormValidity();
+        }
+        
+        function validateCapacity() {
+            const guests = parseInt(document.getElementById('res-guests').value) || 0;
+            const roomId = parseInt(document.getElementById('res-room').value);
+            const room = roomsData.find(r => r.id === roomId);
+            const capacityError = document.getElementById('capacity-error');
+            
+            if (room && guests > room.capacity) {
+                capacityError.textContent = `⚠️ Zu viele Gäste für diesen Raum (max. ${room.capacity})`;
+                capacityError.style.display = 'block';
+                document.getElementById('submit-btn').disabled = true;
+                return false;
+            } else {
+                capacityError.style.display = 'none';
+                return true;
+            }
+        }
+        
+        function checkFormValidity() {
             const date = document.getElementById('res-date').value;
             const time = document.getElementById('res-time').value;
-            if (!date || !time) return;
+            const guests = parseInt(document.getElementById('res-guests').value);
+            const room = document.getElementById('res-room').value;
+            const name = document.getElementById('res-name').value.trim();
+            const email = document.getElementById('res-email').value.trim();
             
-            const res = await fetch(`/api/public/tables?date=${date}&time=${time}`);
-            const data = await res.json();
+            const roomData = roomsData.find(r => r.id === parseInt(room));
+            const capacityOk = !roomData || guests <= roomData.capacity;
             
-            const container = document.getElementById('available-tables');
-            if (data.tables.length === 0) {
-                container.innerHTML = '<p style="color: #ef4444; text-align: center; padding: 2rem;">😔 Leider sind keine Tische mehr verfügbar.</p>';
-                return;
-            }
-            
-            container.innerHTML = '<div class="table-selection">' + 
-                data.tables.map(t => `
-                    <div class="table-option" onclick="toggleTable(${t.id})" id="table-${t.id}">
-                        <input type="checkbox" style="margin-bottom: 0.5rem;" onclick="event.stopPropagation()">
-                        <div><strong>${t.name}</strong></div>
-                        <div style="font-size: 0.85rem; color: #666;">${t.seats} Plätze</div>
-                    </div>
-                `).join('') + '</div>';
+            const valid = date && time && guests > 0 && room && name && email && capacityOk;
+            document.getElementById('submit-btn').disabled = !valid;
         }
         
-        function toggleTable(tableId) {
-            const index = selectedTables.indexOf(tableId);
-            if (index > -1) selectedTables.splice(index, 1);
-            else selectedTables.push(tableId);
-            
-            document.querySelectorAll('.table-option').forEach(el => el.classList.remove('selected'));
-            selectedTables.forEach(id => document.getElementById('table-' + id).classList.add('selected'));
-        }
-        
-        function toggleCaptcha() {
-            const captcha = document.getElementById('captcha-check').checked;
-            document.getElementById('submit-btn').disabled = !captcha || selectedTables.length === 0;
-        }
+        document.getElementById('res-date').addEventListener('change', checkFormValidity);
+        document.getElementById('res-time').addEventListener('change', checkFormValidity);
+        document.getElementById('res-guests').addEventListener('input', checkFormValidity);
+        document.getElementById('res-name').addEventListener('input', checkFormValidity);
+        document.getElementById('res-email').addEventListener('input', checkFormValidity);
         
         async function submitReservation() {
             const btn = document.getElementById('submit-btn');
@@ -438,16 +495,10 @@ PUBLIC_RESERVATION_HTML = '''
                 date: document.getElementById('res-date').value,
                 time: document.getElementById('res-time').value,
                 guests: parseInt(document.getElementById('res-guests').value),
-                table_ids: selectedTables,
+                room_id: parseInt(document.getElementById('res-room').value),
                 notes: document.getElementById('res-notes').value
             };
             
-            if (!data.name || !data.email || selectedTables.length === 0) {
-                alert('Bitte füllen Sie alle Pflichtfelder aus.');
-                btn.disabled = false;
-                return;
-            }
-            
             const res = await fetch('/api/public/reservations', {
                 method: 'POST',
                 headers: {'Content-Type': 'application/json'},
@@ -463,6 +514,7 @@ PUBLIC_RESERVATION_HTML = '''
             } else {
                 alert('Fehler: ' + result.error);
                 btn.disabled = false;
+                btn.textContent = '📧 Reservierung mit Bestätigungsmail senden';
             }
         }
     </script>
@@ -470,7 +522,7 @@ PUBLIC_RESERVATION_HTML = '''
 </html>
 '''
 
-# Admin Login mit Passwort-Änderung-Aufforderung
+# Admin HTML Templates...
 ADMIN_LOGIN_HTML = '''
 <!DOCTYPE html>
 <html>
@@ -549,7 +601,6 @@ ADMIN_LOGIN_HTML = '''
 </html>
 '''
 
-# Passwort-Änderung Seite
 CHANGE_PASSWORD_HTML = '''
 <!DOCTYPE html>
 <html lang="de">
@@ -709,6 +760,8 @@ ADMIN_DASHBOARD_HTML = '''
                padding: 0.75rem 1.5rem; border-radius: 8px; cursor: pointer; }
         .btn-secondary { background: #6b7280; }
         .btn-danger { background: #ef4444; }
+        .btn-success { background: #10b981; }
+        .btn-warning { background: #f59e0b; }
         .btn-sm { padding: 0.5rem 1rem; font-size: 0.85rem; }
         .search-box { display: flex; gap: 0.5rem; margin-bottom: 1rem; }
         .search-box input { flex: 1; padding: 0.75rem; border: 1px solid #ddd; border-radius: 8px; }
@@ -719,6 +772,8 @@ ADMIN_DASHBOARD_HTML = '''
         .badge-admin { background: #ef4444; color: white; }
         .badge-manager { background: #f59e0b; color: white; }
         .badge-staff { background: #10b981; color: white; }
+        .badge-blocked { background: #ef4444; color: white; }
+        .badge-active { background: #10b981; color: white; }
         .form-group { margin-bottom: 1rem; }
         .form-group label { display: block; margin-bottom: 0.5rem; font-weight: 500; color: #555; }
         .form-group input, .form-group select { width: 100%; padding: 0.75rem; border: 1px solid #ddd; border-radius: 8px; }
@@ -726,12 +781,14 @@ ADMIN_DASHBOARD_HTML = '''
         .modal-overlay { display: none; position: fixed; top: 0; left: 0; right: 0; bottom: 0; 
                         background: rgba(0,0,0,0.5); z-index: 1000; justify-content: center; align-items: center; }
         .modal-overlay.active { display: flex; }
-        .modal { background: white; border-radius: 16px; padding: 2rem; width: 90%; max-width: 500px; max-height: 90vh; overflow-y: auto; }
+        .modal { background: white; border-radius: 16px; padding: 2rem; width: 90%; max-width: 600px; max-height: 90vh; overflow-y: auto; }
         .modal h2 { margin-bottom: 1.5rem; }
+        .modal h3 { margin: 1.5rem 0 0.75rem 0; color: #333; }
         .hidden { display: none !important; }
         .alert { padding: 1rem; border-radius: 8px; margin-bottom: 1rem; }
         .alert.success { background: #d1fae5; color: #065f46; }
         .alert.error { background: #fee2e2; color: #991b1b; }
+        .alert.info { background: #dbeafe; color: #1e40af; }
         .permission-list { display: flex; flex-wrap: wrap; gap: 0.5rem; margin-top: 0.5rem; }
         .permission-tag { background: #e0e7ff; color: #4338ca; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.75rem; }
         .stats-grid { display: grid; grid-template-columns: repeat(4, 1fr); gap: 1rem; }
@@ -745,6 +802,15 @@ ADMIN_DASHBOARD_HTML = '''
         .dropdown-content a:hover { background: #f8f9fa; }
         .dropdown-content a:last-child { border-bottom: none; }
         .dropdown:hover .dropdown-content { display: block; }
+        .room-card { border: 2px solid #e0e0e0; border-radius: 12px; padding: 1.5rem; transition: all 0.2s; }
+        .room-card:hover { border-color: #667eea; }
+        .room-card.blocked { background: #fef2f2; border-color: #ef4444; }
+        .room-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 1rem; }
+        .room-title { font-size: 1.25rem; font-weight: 600; }
+        .room-capacity { color: #666; font-size: 0.9rem; }
+        .tables-list { display: flex; flex-wrap: wrap; gap: 0.5rem; margin-top: 1rem; }
+        .table-item { background: #f3f4f6; padding: 0.5rem 0.75rem; border-radius: 6px; font-size: 0.85rem; }
+        .action-btns { display: flex; gap: 0.5rem; margin-top: 1rem; }
         @media (max-width: 768px) { .stats-grid { grid-template-columns: repeat(2, 1fr); } }
     </style>
 </head>
@@ -789,8 +855,8 @@ ADMIN_DASHBOARD_HTML = '''
                     <div class="stat-label">Diese Woche</div>
                 </div>
                 <div class="stat-card">
-                    <div class="stat-value" id="stat-users">0</div>
-                    <div class="stat-label">Benutzer</div>
+                    <div class="stat-value" id="stat-rooms">0</div>
+                    <div class="stat-label">Räume</div>
                 </div>
             </div>
             
@@ -821,7 +887,13 @@ ADMIN_DASHBOARD_HTML = '''
         
         <!-- Rooms -->
         <div id="tab-rooms" class="tab-content hidden">
-            <div class="grid" id="rooms-list"></div>
+            <div class="card">
+                <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 1rem;">
+                    <h2>🏠 Raumverwaltung</h2>
+                    <button class="btn" onclick="showAddRoomModal()">➕ Raum hinzufügen</button>
+                </div>
+                <div id="rooms-list"></div>
+            </div>
         </div>
         
         <!-- Users -->
@@ -841,7 +913,7 @@ ADMIN_DASHBOARD_HTML = '''
                 <h2>✉️ E-Mail Templates</h2>
                 <h3 style="margin-top: 1rem;">Buchungsbestätigung</h3>
                 <textarea id="template-confirmation">{{ template_confirmation }}</textarea>
-                <p style="font-size: 0.85rem; color: #666; margin: 0.5rem 0;">Variablen: {name}, {booking_id}, {date}, {time}, {guests}, {tables}</p>
+                <p style="font-size: 0.85rem; color: #666; margin: 0.5rem 0;">Variablen: {name}, {booking_id}, {date}, {time}, {guests}, {room}</p>
                 
                 <h3 style="margin-top: 1rem;">E-Mail-Antwort</h3>
                 <textarea id="template-email-reply">{{ template_email_reply }}</textarea>
@@ -879,6 +951,57 @@ ADMIN_DASHBOARD_HTML = '''
         </div>
     </div>
     
+    <!-- Add/Edit Room Modal -->
+    <div id="room-modal" class="modal-overlay" onclick="if(event.target===this)closeRoomModal()">
+        <div class="modal">
+            <h2 id="room-modal-title">🏠 Raum hinzufügen</h2>
+            <div class="form-group">
+                <label>Raumname *</label>
+                <input type="text" id="room-name" placeholder="z.B. Großer Saal">
+            </div>
+            <div class="form-group">
+                <label>Beschreibung</label>
+                <input type="text" id="room-desc" placeholder="z.B. Mit Fensterfront">
+            </div>
+            <div class="form-group">
+                <label>Kapazität (max. Personen) *</label>
+                <input type="number" id="room-capacity" placeholder="40" min="1">
+            </div>
+            <div style="display: flex; gap: 0.5rem;">
+                <button class="btn" onclick="saveRoom()">💾 Speichern</button>
+                <button class="btn btn-secondary" onclick="closeRoomModal()">❌ Abbrechen</button>
+            </div>
+            <input type="hidden" id="room-id">
+        </div>
+    </div>
+    
+    <!-- Manage Tables Modal -->
+    <div id="tables-modal" class="modal-overlay" onclick="if(event.target===this)closeTablesModal()">
+        <div class="modal" style="max-width: 700px;">
+            <h2>🪑 Tische verwalten</h2>
+            <p id="tables-room-name" style="color: #666; margin-bottom: 1rem;"></p>
+            
+            <h3>Neuer Tisch</h3>
+            <div style="display: grid; grid-template-columns: 2fr 1fr 1fr auto; gap: 0.5rem; margin-bottom: 1rem;">
+                <input type="text" id="new-table-name" placeholder="Tischname (z.B. Tisch 1)">
+                <input type="number" id="new-table-seats" placeholder="Plätze" min="1">
+                <select id="new-table-shape">
+                    <option value="rect">Rechteck</option>
+                    <option value="circle">Rund</option>
+                </select>
+                <button class="btn btn-success btn-sm" onclick="addTable()">➕ Hinzufügen</button>
+            </div>
+            
+            <h3>Vorhandene Tische</h3>
+            <div id="tables-list"></div>
+            
+            <div style="margin-top: 1.5rem;">
+                <button class="btn btn-secondary" onclick="closeTablesModal()">Schließen</button>
+            </div>
+            <input type="hidden" id="tables-room-id">
+        </div>
+    </div>
+    
     <!-- Add User Modal -->
     <div id="user-modal" class="modal-overlay" onclick="if(event.target===this)closeUserModal()">
         <div class="modal">
@@ -922,7 +1045,8 @@ ADMIN_DASHBOARD_HTML = '''
     
     <script>
         let currentUser = null;
-        let allReservations = [];
+        let allRooms = [];
+        let currentReservations = [];
         
         loadCurrentUser();
         loadReservations();
@@ -965,12 +1089,14 @@ ADMIN_DASHBOARD_HTML = '''
             location.href = '/';
         }
         
-        // Search, Reservations, Rooms, Users functions...
+        // Dashboard & Reservations
         async function doQuickSearch() {
             const query = document.getElementById('quick-search').value;
             if (!query) return;
             await searchReservations(query);
             showTab('reservations');
+            document.querySelectorAll('.nav-btn')[1].classList.add('active');
+            document.querySelectorAll('.nav-btn')[0].classList.remove('active');
         }
         
         async function searchReservations(query = null) {
@@ -1008,6 +1134,7 @@ ADMIN_DASHBOARD_HTML = '''
                             <th>Name</th>
                             <th>Datum/Zeit</th>
                             <th>Personen</th>
+                            <th>Raum</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -1017,6 +1144,7 @@ ADMIN_DASHBOARD_HTML = '''
                                 <td><strong>${r.name}</strong></td>
                                 <td>${r.date}<br><small>${r.time}</small></td>
                                 <td>${r.guests}</td>
+                                <td>${r.room_name || '-'}</td>
                             </tr>
                         `).join('')}
                     </tbody>
@@ -1030,25 +1158,211 @@ ADMIN_DASHBOARD_HTML = '''
             document.getElementById('stat-total').textContent = reservations.length;
             document.getElementById('stat-today').textContent = reservations.filter(r => r.date === today).length;
             document.getElementById('stat-week').textContent = reservations.filter(r => r.date >= today && r.date <= weekLater).length;
+            document.getElementById('stat-rooms').textContent = allRooms.length;
         }
         
+        // ROOMS MANAGEMENT
         async function loadRooms() {
-            const res = await fetch('/api/rooms');
+            const res = await fetch('/api/admin/rooms');
             const data = await res.json();
+            allRooms = data.rooms;
+            renderRooms(allRooms);
+            updateStats(currentReservations);
+        }
+        
+        function renderRooms(rooms) {
             const container = document.getElementById('rooms-list');
-            container.innerHTML = data.rooms.map(room => `
-                <div class="card">
-                    <h2>${room.name}</h2>
-                    <p style="color: #666; margin-bottom: 1rem;">${room.description}</p>
-                    <p><strong>${room.tables.length} Tische</strong></p>
+            if (rooms.length === 0) {
+                container.innerHTML = '<p style="color: #999; text-align: center; padding: 2rem;">Keine Räume vorhanden</p>';
+                return;
+            }
+            container.innerHTML = rooms.map(room => `
+                <div class="room-card ${room.blocked ? 'blocked' : ''}">
+                    <div class="room-header">
+                        <div>
+                            <div class="room-title">${room.name}</div>
+                            <div class="room-capacity">${room.description || ''} · Kapazität: ${room.capacity} Personen · ${room.tables.length} Tische</div>
+                        </div>
+                        <span class="badge ${room.blocked ? 'badge-blocked' : 'badge-active'}">${room.blocked ? '🔒 Blockiert' : '✅ Aktiv'}</span>
+                    </div>
+                    <div class="tables-list">
+                        ${room.tables.map(t => `<span class="table-item">${t.name} (${t.seats} P.)</span>`).join('')}
+                    </div>
+                    <div class="action-btns">
+                        <button class="btn btn-sm btn-secondary" onclick="editRoom(${room.id})">✏️ Bearbeiten</button>
+                        <button class="btn btn-sm ${room.blocked ? 'btn-success' : 'btn-warning'}" onclick="toggleRoomBlock(${room.id}, ${!room.blocked})">${room.blocked ? '🔓 Freigeben' : '🔒 Blockieren'}</button>
+                        <button class="btn btn-sm" onclick="manageTables(${room.id})">🪑 Tische</button>
+                        <button class="btn btn-sm btn-danger" onclick="deleteRoom(${room.id})">🗑️ Löschen</button>
+                    </div>
                 </div>
             `).join('');
         }
         
+        let editingRoomId = null;
+        
+        function showAddRoomModal() {
+            editingRoomId = null;
+            document.getElementById('room-modal-title').textContent = '🏠 Raum hinzufügen';
+            document.getElementById('room-name').value = '';
+            document.getElementById('room-desc').value = '';
+            document.getElementById('room-capacity').value = '';
+            document.getElementById('room-modal').classList.add('active');
+        }
+        
+        function editRoom(roomId) {
+            const room = allRooms.find(r => r.id === roomId);
+            if (!room) return;
+            editingRoomId = roomId;
+            document.getElementById('room-modal-title').textContent = '🏠 Raum bearbeiten';
+            document.getElementById('room-name').value = room.name;
+            document.getElementById('room-desc').value = room.description || '';
+            document.getElementById('room-capacity').value = room.capacity;
+            document.getElementById('room-modal').classList.add('active');
+        }
+        
+        function closeRoomModal() {
+            document.getElementById('room-modal').classList.remove('active');
+            editingRoomId = null;
+        }
+        
+        async function saveRoom() {
+            const data = {
+                name: document.getElementById('room-name').value,
+                description: document.getElementById('room-desc').value,
+                capacity: parseInt(document.getElementById('room-capacity').value) || 0
+            };
+            
+            if (!data.name || data.capacity < 1) {
+                alert('Bitte Name und Kapazität eingeben!');
+                return;
+            }
+            
+            const url = editingRoomId ? `/api/admin/rooms/${editingRoomId}` : '/api/admin/rooms';
+            const method = editingRoomId ? 'PUT' : 'POST';
+            
+            const res = await fetch(url, {
+                method: method,
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify(data)
+            });
+            
+            const result = await res.json();
+            if (result.status === 'ok') {
+                closeRoomModal();
+                loadRooms();
+            } else {
+                alert('Fehler: ' + result.error);
+            }
+        }
+        
+        async function deleteRoom(roomId) {
+            if (!confirm('Raum wirklich löschen? Alle zugehörigen Tische werden auch gelöscht.')) return;
+            
+            const res = await fetch(`/api/admin/rooms/${roomId}`, {method: 'DELETE'});
+            const result = await res.json();
+            if (result.status === 'ok') {
+                loadRooms();
+            } else {
+                alert('Fehler: ' + result.error);
+            }
+        }
+        
+        async function toggleRoomBlock(roomId, block) {
+            const action = block ? 'block' : 'unblock';
+            const res = await fetch(`/api/admin/rooms/${roomId}/${action}`, {method: 'POST'});
+            const result = await res.json();
+            if (result.status === 'ok') {
+                loadRooms();
+            } else {
+                alert('Fehler: ' + result.error);
+            }
+        }
+        
+        // TABLES MANAGEMENT
+        let tablesRoomId = null;
+        
+        function manageTables(roomId) {
+            const room = allRooms.find(r => r.id === roomId);
+            if (!room) return;
+            tablesRoomId = roomId;
+            document.getElementById('tables-room-name').textContent = room.name + ' - Tische verwalten';
+            document.getElementById('tables-room-id').value = roomId;
+            renderTablesList(room.tables);
+            document.getElementById('tables-modal').classList.add('active');
+        }
+        
+        function closeTablesModal() {
+            document.getElementById('tables-modal').classList.remove('active');
+            tablesRoomId = null;
+        }
+        
+        function renderTablesList(tables) {
+            const container = document.getElementById('tables-list');
+            if (tables.length === 0) {
+                container.innerHTML = '<p style="color: #999; text-align: center; padding: 1rem;">Keine Tische vorhanden</p>';
+                return;
+            }
+            container.innerHTML = `
+                <table class="table">
+                    <thead>
+                        <tr><th>Name</th><th>Plätze</th><th>Form</th><th>Aktion</th></tr>
+                    </thead>
+                    <tbody>
+                        ${tables.map(t => `
+                            <tr>
+                                <td>${t.name}</td>
+                                <td>${t.seats}</td>
+                                <td>${t.shape === 'circle' ? 'Rund' : 'Rechteck'}</td>
+                                <td><button class="btn btn-danger btn-sm" onclick="deleteTable(${t.id})">Löschen</button></td>
+                            </tr>
+                        `).join('')}
+                    </tbody>
+                </table>
+            `;
+        }
+        
+        async function addTable() {
+            const name = document.getElementById('new-table-name').value;
+            const seats = parseInt(document.getElementById('new-table-seats').value);
+            const shape = document.getElementById('new-table-shape').value;
+            
+            if (!name || !seats) {
+                alert('Bitte Name und Plätze eingeben!');
+                return;
+            }
+            
+            const res = await fetch(`/api/admin/rooms/${tablesRoomId}/tables`, {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({name, seats, shape})
+            });
+            
+            const result = await res.json();
+            if (result.status === 'ok') {
+                document.getElementById('new-table-name').value = '';
+                document.getElementById('new-table-seats').value = '';
+                manageTables(tablesRoomId); // Reload
+            } else {
+                alert('Fehler: ' + result.error);
+            }
+        }
+        
+        async function deleteTable(tableId) {
+            if (!confirm('Tisch wirklich löschen?')) return;
+            
+            const res = await fetch(`/api/admin/rooms/${tablesRoomId}/tables/${tableId}`, {method: 'DELETE'});
+            const result = await res.json();
+            if (result.status === 'ok') {
+                manageTables(tablesRoomId); // Reload
+            } else {
+                alert('Fehler: ' + result.error);
+            }
+        }
+        
+        // USERS
         async function loadUsers() {
             const res = await fetch('/api/admin/users');
             const data = await res.json();
-            document.getElementById('stat-users').textContent = data.users.length;
             const container = document.getElementById('users-list');
             container.innerHTML = `
                 <table class="table">
@@ -1122,6 +1436,7 @@ ADMIN_DASHBOARD_HTML = '''
             }
         }
         
+        // TEMPLATES & SMTP
         async function saveTemplates() {
             const res = await fetch('/api/admin/templates', {
                 method: 'POST',
@@ -1203,24 +1518,19 @@ def change_password():
             'force_change': user.get('force_password_change', False)
         })
     
-    # POST: Passwort ändern
     data = request.get_json() or {}
     current_password = data.get('current_password', '')
     new_password = data.get('new_password', '')
     
-    # Validate current password
     if hash_password(current_password) != user['password_hash']:
         return jsonify({'error': 'Aktuelles Passwort ist falsch'}), 400
     
-    # Validate new password
     if len(new_password) < 8:
         return jsonify({'error': 'Neues Passwort muss mindestens 8 Zeichen haben'}), 400
     
-    # Update password
     user['password_hash'] = hash_password(new_password)
     user['force_password_change'] = False
     
-    # Send confirmation email
     try:
         body = email_templates['password_changed'].format(name=user['name'])
         send_email_smtp(user['email'], 'Ihr Passwort wurde geändert', body)
@@ -1243,20 +1553,30 @@ def get_current_user():
         'permissions': ROLE_PERMISSIONS.get(user['role'], [])
     })
 
-# Public API
-@app.route('/api/public/tables')
-def public_get_tables():
-    date_str = request.args.get('date', str(date.today()))
-    time_str = request.args.get('time', '19:00')
-    available = get_available_tables(date_str, time_str)
-    return jsonify({'tables': available})
+# Public API - Räume
+@app.route('/api/public/rooms')
+def public_get_rooms():
+    """Öffentliche Raum-Liste (nicht blockierte Räume)"""
+    available = []
+    for room in rooms:
+        if not room.get('blocked', False):
+            available.append({
+                'id': room['id'],
+                'name': room['name'],
+                'description': room.get('description', ''),
+                'capacity': room.get('capacity', 0),
+                'tables': room['tables']
+            })
+    return jsonify({'rooms': available})
 
+# Public API - Reservierung
 @app.route('/api/public/reservations', methods=['POST'])
 def public_create_reservation():
     global reservations
     data = request.get_json() or {}
     
-    required = ['name', 'email', 'date', 'time', 'guests', 'table_ids']
+    # NEU: room_id statt table_ids
+    required = ['name', 'email', 'date', 'time', 'guests', 'room_id']
     for field in required:
         if not data.get(field):
             return jsonify({'error': f'{field} is required'}), 400
@@ -1264,13 +1584,35 @@ def public_create_reservation():
     if not re.match(r'^[^@]+@[^@]+\.[^@]+$', data['email']):
         return jsonify({'error': 'Invalid email address'}), 400
     
+    room_id = int(data['room_id'])
+    guests = data['guests']
+    date_str = data['date']
+    time_str = data['time']
+    
+    # Raum validieren
+    room = get_room(room_id)
+    if not room:
+        return jsonify({'error': 'Ungültiger Raum'}), 400
+    
+    if room.get('blocked', False):
+        return jsonify({'error': 'Raum ist derzeit nicht verfügbar'}), 400
+    
+    # Kapazität prüfen
+    if guests > room.get('capacity', 0):
+        return jsonify({'error': f'Zu viele Gäste für diesen Raum (max. {room["capacity"]})'}), 400
+    
+    # Automatische Tisch-Zuweisung
+    table_ids, error = auto_assign_tables(room_id, guests, date_str, time_str)
+    if error:
+        return jsonify({'error': error}), 400
+    
     booking_id = generate_booking_id()
     
     table_names = []
-    for table_id in data['table_ids']:
-        table, room = get_table(table_id)
+    for table_id in table_ids:
+        table, _ = get_table(table_id)
         if table:
-            table_names.append(f"{room['name']}/{table['name']}" if room else table['name'])
+            table_names.append(table['name'])
     
     reservation = {
         'id': len(reservations) + 1,
@@ -1278,10 +1620,12 @@ def public_create_reservation():
         'name': data['name'],
         'email': data['email'],
         'phone': data.get('phone', ''),
-        'date': data['date'],
-        'time': data['time'],
-        'guests': data['guests'],
-        'table_ids': data['table_ids'],
+        'date': date_str,
+        'time': time_str,
+        'guests': guests,
+        'room_id': room_id,
+        'room_name': room['name'],
+        'table_ids': table_ids,
         'table_names': ', '.join(table_names),
         'notes': data.get('notes', ''),
         'created_at': datetime.now().isoformat()
@@ -1292,10 +1636,10 @@ def public_create_reservation():
         email_body = email_templates['confirmation'].format(
             name=data['name'],
             booking_id=booking_id,
-            date=data['date'],
-            time=data['time'],
-            guests=data['guests'],
-            tables=', '.join(table_names)
+            date=date_str,
+            time=time_str,
+            guests=guests,
+            room=room['name']
         )
         send_email_smtp(data['email'], f'Ihre Reservierung - {booking_id}', email_body)
     except Exception as e:
@@ -1303,7 +1647,7 @@ def public_create_reservation():
     
     return jsonify({'status': 'ok', 'booking_id': booking_id})
 
-# Admin API
+# Admin API - Reservierungen
 @app.route('/api/admin/reservations')
 def admin_get_reservations():
     if 'user_id' not in session:
@@ -1323,7 +1667,7 @@ def admin_search_reservations():
                query in r.get('email', '').lower() or query in r.get('booking_id', '').lower()]
     return jsonify({'reservations': results})
 
-# Users API
+# Admin API - Users
 @app.route('/api/admin/users')
 def admin_get_users():
     if 'user_id' not in session:
@@ -1367,7 +1711,7 @@ def admin_create_user():
         'email': data['email'],
         'role': data['role'],
         'is_active': True,
-        'force_password_change': True,  # Muss Passwort bei erstem Login ändern
+        'force_password_change': True,
         'created_at': datetime.now().isoformat(),
         'last_login': None
     }
@@ -1387,13 +1731,177 @@ def admin_create_user():
     
     return jsonify({'status': 'ok', 'temp_password': temp_password if not data.get('send_email') else None})
 
-# Rooms, Templates, SMTP API
+# Admin API - Räume (NEU)
+@app.route('/api/admin/rooms')
+def admin_get_rooms():
+    """Liste aller Räume für Admins"""
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    return jsonify({'rooms': rooms})
+
+@app.route('/api/admin/rooms', methods=['POST'])
+def admin_create_room():
+    global rooms
+    
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    
+    data = request.get_json() or {}
+    
+    if not data.get('name'):
+        return jsonify({'error': 'Name erforderlich'}), 400
+    
+    capacity = data.get('capacity', 0)
+    if capacity < 1:
+        return jsonify({'error': 'Kapazität muss mindestens 1 sein'}), 400
+    
+    new_room = {
+        'id': max([r['id'] for r in rooms], default=0) + 1,
+        'name': data['name'],
+        'description': data.get('description', ''),
+        'capacity': capacity,
+        'blocked': False,
+        'tables': []
+    }
+    rooms.append(new_room)
+    
+    return jsonify({'status': 'ok', 'room': new_room})
+
+@app.route('/api/admin/rooms/<int:room_id>', methods=['PUT'])
+def admin_update_room(room_id):
+    global rooms
+    
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    
+    room = get_room(room_id)
+    if not room:
+        return jsonify({'error': 'Raum nicht gefunden'}), 404
+    
+    data = request.get_json() or {}
+    
+    if data.get('name'):
+        room['name'] = data['name']
+    if 'description' in data:
+        room['description'] = data['description']
+    if 'capacity' in data:
+        capacity = data['capacity']
+        if capacity < 1:
+            return jsonify({'error': 'Kapazität muss mindestens 1 sein'}), 400
+        room['capacity'] = capacity
+    
+    return jsonify({'status': 'ok', 'room': room})
+
+@app.route('/api/admin/rooms/<int:room_id>', methods=['DELETE'])
+def admin_delete_room(room_id):
+    global rooms, reservations
+    
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    
+    room = get_room(room_id)
+    if not room:
+        return jsonify({'error': 'Raum nicht gefunden'}), 404
+    
+    # Prüfe auf aktive Reservierungen für diesen Raum
+    active_reservations = [r for r in reservations if r.get('room_id') == room_id]
+    if active_reservations:
+        return jsonify({'error': f'Raum hat {len(active_reservations)} aktive Reservierungen'}), 400
+    
+    rooms = [r for r in rooms if r['id'] != room_id]
+    return jsonify({'status': 'ok'})
+
+@app.route('/api/admin/rooms/<int:room_id>/tables', methods=['POST'])
+def admin_add_table(room_id):
+    global rooms
+    
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    
+    room = get_room(room_id)
+    if not room:
+        return jsonify({'error': 'Raum nicht gefunden'}), 404
+    
+    data = request.get_json() or {}
+    
+    if not data.get('name'):
+        return jsonify({'error': 'Tischname erforderlich'}), 400
+    
+    seats = data.get('seats', 0)
+    if seats < 1:
+        return jsonify({'error': 'Plätze müssen mindestens 1 sein'}), 400
+    
+    # Generiere eindeutige Tisch-ID über alle Räume
+    max_table_id = 0
+    for r in rooms:
+        for t in r['tables']:
+            max_table_id = max(max_table_id, t['id'])
+    
+    new_table = {
+        'id': max_table_id + 1,
+        'name': data['name'],
+        'seats': seats,
+        'shape': data.get('shape', 'rect')
+    }
+    room['tables'].append(new_table)
+    
+    return jsonify({'status': 'ok', 'table': new_table})
+
+@app.route('/api/admin/rooms/<int:room_id>/tables/<int:table_id>', methods=['DELETE'])
+def admin_delete_table(room_id, table_id):
+    global rooms
+    
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    
+    room = get_room(room_id)
+    if not room:
+        return jsonify({'error': 'Raum nicht gefunden'}), 404
+    
+    # Prüfe ob Tisch in Reservierungen verwendet wird
+    for res in reservations:
+        if table_id in res.get('table_ids', []):
+            return jsonify({'error': 'Tisch ist in einer Reservierung'}), 400
+    
+    room['tables'] = [t for t in room['tables'] if t['id'] != table_id]
+    return jsonify({'status': 'ok'})
+
+@app.route('/api/admin/rooms/<int:room_id>/block', methods=['POST'])
+def admin_block_room(room_id):
+    global rooms
+    
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    
+    room = get_room(room_id)
+    if not room:
+        return jsonify({'error': 'Raum nicht gefunden'}), 404
+    
+    room['blocked'] = True
+    return jsonify({'status': 'ok'})
+
+@app.route('/api/admin/rooms/<int:room_id>/unblock', methods=['POST'])
+def admin_unblock_room(room_id):
+    global rooms
+    
+    if 'user_id' not in session:
+        return jsonify({'error': 'Unauthorized'}), 401
+    
+    room = get_room(room_id)
+    if not room:
+        return jsonify({'error': 'Raum nicht gefunden'}), 404
+    
+    room['blocked'] = False
+    return jsonify({'status': 'ok'})
+
+# Rooms API (für Admin-Dashboard)
 @app.route('/api/rooms')
 def get_rooms():
     if 'user_id' not in session:
         return jsonify({'error': 'Unauthorized'}), 401
     return jsonify({'rooms': rooms})
 
+# Templates & SMTP
 @app.route('/api/admin/templates', methods=['GET', 'POST'])
 def handle_templates():
     global email_templates