diff --git a/app.py b/app.py
index 3d67b78..fce9e54 100644
--- a/app.py
+++ b/app.py
@@ -1889,12 +1889,20 @@ def process_beat_tasks():
     
     while True:
         try:
-            pending_tasks = [t for t in tasks if t.get('status') == 'pending' and t.get('type') in ('agent_created', 'manual', 'orchestrated', 'agent_delegated')]
+            # Lade pending Tasks aus Datenbank
+            db_tasks = get_tasks(status='pending')
+            # Konvertiere zu Dict-Format für Legacy-Kompatibilität
+            pending_tasks = []
+            for db_task in db_tasks:
+                if db_task.get('type') in ('agent_created', 'manual', 'orchestrated', 'agent_delegated', 'telegram'):
+                    pending_tasks.append(db_task)
             
             for task in pending_tasks:
                 agent_key = task.get('agent_key') or task.get('assigned_agent', '')
                 
                 if task.get('agent_key') == 'orchestrator':
+                    # Update in DB
+                    update_task_db(task['id'], status='in_progress')
                     task['status'] = 'in_progress'
                     logger.info("[TaskBeat] Planungsphase für Task #%d", task['id'])
                     
@@ -1953,6 +1961,8 @@ Arbeite diesen Teil ab und liefere ein vollständiges Ergebnis.""",
                         created_sub_tasks.append(sub_task_id)
                         logger.info("[TaskBeat] Sub-Task #%d zugewiesen an %s", sub_task_id, assigned)
                     
+                    # Update in DB
+                    update_task_db(task['id'], status='completed')
                     task['status'] = 'completed'
                     task['sub_task_ids'] = created_sub_tasks
                     logger.info("[TaskBeat] Planungs-Task #%d abgeschlossen. %d Sub-Tasks erstellt.", task['id'], len(created_sub_tasks))
@@ -1963,13 +1973,18 @@ Arbeite diesen Teil ab und liefere ein vollständiges Ergebnis.""",
                     if available_agents:
                         agent_key = available_agents[0]
                         task['agent_key'] = agent_key
+                        update_task_db(task['id'], agent_key=agent_key)
                 
                 if agent_key and agent_key in AGENTS:
+                    # Update in DB
+                    update_task_db(task['id'], status='in_progress')
                     task['status'] = 'in_progress'
                     logger.info("[TaskBeat] Verarbeite Task #%d – Agent: %s", task['id'], agent_key)
                     
                     response = execute_agent_task(agent_key, task.get('title', '') + '\n\n' + task.get('description', ''))
                     
+                    # Update in DB
+                    update_task_db(task['id'], response=response)
                     task['response'] = response
                     
                     # Neues Memory-System: Task als strukturierte Erinnerung speichern
@@ -1988,6 +2003,8 @@ Arbeite diesen Teil ab und liefere ein vollständiges Ergebnis.""",
                     except Exception as e:
                         logger.warning("[TaskBeat] Konnte Erinnerung nicht speichern: %s", str(e))
                     
+                    # Update in DB
+                    update_task_db(task['id'], status='completed')
                     task['status'] = 'completed'
                     logger.info("[TaskBeat] Task #%d abgeschlossen.", task['id'])
                     
diff --git a/templates/orchestrator.html b/templates/orchestrator.html
index 0149a3d..301f532 100644
--- a/templates/orchestrator.html
+++ b/templates/orchestrator.html
@@ -16,63 +16,23 @@
 <div class="row g-4">
   <!-- Sidebar -->
   <div class="col-lg-4">
-    <!-- Task Distribution -->
-    <div class="card mb-3">
-      <div class="card-header bg-info">
-        <h5 class="mb-0">📋 Tasks verteilen</h5>
-      </div>
-      <div class="card-body">
-        <div class="mb-3">
-          <label class="form-label">Aufgaben (eine pro Zeile)</label>
-          <textarea class="form-control" id="todoPrompt" rows="4" placeholder="Recherche Location&#10;Catering planen&#10;Pressemitteilung schreiben"></textarea>
-        </div>
-        <div class="mb-3">
-          <label class="form-label">Agenten auswählen</label>
-          <div id="agentCheckboxes">
-            {% for key, agent in agents.items() %}
-            <div class="form-check">
-              <input class="form-check-input agent-checkbox" type="checkbox" value="{{ key }}" id="agent_{{ key }}" checked>
-              <label class="form-check-label" for="agent_{{ key }}">{{ agent.name }}</label>
-            </div>
-            {% endfor %}
-          </div>
-        </div>
-        <button type="button" class="btn btn-info w-100" onclick="distributeTodos()">Tasks parallel ausführen</button>
-        <div id="todoStatus" class="form-text mt-2"></div>
-      </div>
-    </div>
-
-    <div class="card mb-3">
-      <div class="card-header bg-dark">
-        <h5 class="mb-0">Prompt eingeben</h5>
-      </div>
-      <div class="card-body">
-        <form id="promptForm" method="POST" action="/orchestrator">
-          <div class="mb-3">
-            <label for="prompt" class="form-label">Ihre Anfrage</label>
-            <textarea class="form-control" id="prompt" name="prompt" rows="5"
-              placeholder="Was soll erledigt werden?" required></textarea>
-          </div>
-          <button type="button" class="btn btn-primary w-100 mb-2" id="streamBtn"
-            onclick="sendPromptWithStream()">Live-Antwort anfordern</button>
-          <button type="submit" class="btn btn-secondary w-100">Klassisch senden</button>
-        </form>
-      </div>
-    </div>
-
     <div class="card">
-      <div class="card-header bg-secondary">
-        <h6 class="mb-0">Aktive Agenten</h6>
+      <div class="card-header bg-dark">
+        <h5 class="mb-0">💬 Prompt eingeben</h5>
       </div>
-      <div class="card-body p-0">
-        <ul class="list-group list-group-flush">
-          {% for key, agent in agents.items() %}
-          <li class="list-group-item d-flex justify-content-between align-items-center">
-            <span style="font-size:.85rem;">{{ agent.name }}</span>
-            <span class="badge bg-success" style="font-size:.65rem;">aktiv</span>
-          </li>
-          {% endfor %}
-        </ul>
+      <div class="card-body">
+        <div class="mb-3">
+          <label for="prompt" class="form-label">Ihre Anfrage an den Orchestrator</label>
+          <textarea class="form-control" id="prompt" name="prompt" rows="8"
+            placeholder="Was soll erledigt werden?&#10;&#10;Beispiele:&#10;- Recherchiere Locations für den Diversity Ball&#10;- Erstelle eine Budget-Übersicht&#10;- Verteile diese Tasks an passende Agenten" required></textarea>
+        </div>
+        <button type="button" class="btn btn-primary w-100" id="streamBtn"
+          onclick="sendPromptWithStream()">
+          ▶ Live-Antwort anfordern
+        </button>
+        <p class="form-text mt-2">
+          Der Orchestrator analysiert deine Anfrage und delegiert automatisch an die passenden Agenten.
+        </p>
       </div>
     </div>
   </div>
diff --git a/templates/tasks.html b/templates/tasks.html
index 8d6cdef..3bd05a7 100644
--- a/templates/tasks.html
+++ b/templates/tasks.html
@@ -8,50 +8,7 @@
 </div>
 
 <div class="row g-4">
-  <div class="col-lg-4">
-    <div class="card mb-3">
-      <div class="card-header bg-success">
-        <h5 class="mb-0">Neuen Task erstellen</h5>
-      </div>
-      <div class="card-body">
-        <form method="POST" action="/tasks">
-          <div class="mb-3">
-            <label for="title" class="form-label">Titel</label>
-            <input type="text" class="form-control" id="title" name="title" placeholder="Task-Titel" required>
-          </div>
-          <div class="mb-3">
-            <label for="description" class="form-label">Beschreibung</label>
-            <textarea class="form-control" id="description" name="description" rows="3"
-              placeholder="Optionale Beschreibung"></textarea>
-          </div>
-          <div class="mb-3">
-            <label for="assigned_agent" class="form-label">Agent (optional)</label>
-            <select class="form-select" id="assigned_agent" name="assigned_agent">
-              <option value="">— Agent wählen —</option>
-              {% for key, agent in agents.items() %}
-              <option value="{{ key }}">{{ agent.name }}</option>
-              {% endfor %}
-            </select>
-          </div>
-          <button type="submit" class="btn btn-success w-100">Task erstellen</button>
-        </form>
-      </div>
-    </div>
-    
-    <div class="card">
-      <div class="card-header bg-info">
-        <h5 class="mb-0">ℹ️ Info</h5>
-      </div>
-      <div class="card-body">
-        <p class="mb-0" style="font-size:0.875rem;color:var(--text-muted);">
-          Tasks werden automatisch alle 10 Sekunden vom TaskBeat verarbeitet.
-          <br>Diese Seite aktualisiert sich automatisch alle 15 Sekunden wenn Tasks aktiv sind.
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <div class="col-lg-8">
+  <div class="col-12">
     <div class="card">
       <div class="card-header bg-primary d-flex justify-content-between align-items-center">
         <h5 class="mb-0">Alle Tasks</h5>