diff --git a/finance/app/routers/gui.py b/finance/app/routers/gui.py
index 7c79b2d..b5b71ed 100644
--- a/finance/app/routers/gui.py
+++ b/finance/app/routers/gui.py
@@ -291,7 +291,6 @@ def planung_page(request: Request, session: Session = Depends(get_session)):
     recurring = _list_recurring(session=session)
     planned = _list_planned(session=session)
     loans = _list_loans(session=session)
-    scenarios = _list_scenarios(session=session)
     return templates.TemplateResponse(request, "planning.html", {
         "categories": categories,
         "category_names": {c.id: c.name for c in categories},
@@ -300,8 +299,23 @@ def planung_page(request: Request, session: Session = Depends(get_session)):
         "suggestions": _recurring_suggestions(session=session),
         "planned": planned,
         "loans": loans,
-        "scenario_rows": _scenario_rows(session, scenarios, loans),
         "rhythms": ["monthly", "quarterly", "yearly"],
         "repayment_types": ["annuity", "bullet"],
+    })
+
+
+@router.get("/szenarien", dependencies=[Depends(gui_session)])
+def szenarien_page(request: Request, session: Session = Depends(get_session)):
+    categories = session.execute(select(Category)).scalars().all()
+    recurring = _list_recurring(session=session)
+    loans = _list_loans(session=session)
+    scenarios = _list_scenarios(session=session)
+    return templates.TemplateResponse(request, "szenarien.html", {
+        "categories": categories,
+        "category_names": {c.id: c.name for c in categories},
+        "recurring": recurring,
+        "recurring_names": {r.id: r.name for r in recurring},
+        "loans": loans,
+        "scenario_rows": _scenario_rows(session, scenarios, loans),
         "modifier_kinds": ["percent", "absolute", "remove", "ende"],
     })
diff --git a/finance/app/templates/base.html b/finance/app/templates/base.html
index 431ed95..c334915 100644
--- a/finance/app/templates/base.html
+++ b/finance/app/templates/base.html
@@ -14,6 +14,7 @@
     <a href="/buchungen">Buchungen</a>
     <a href="/salden">Salden</a>
     <a href="/planung">Planung</a>
+    <a href="/szenarien">Szenarien</a>
     <a href="/admin">Admin</a>
     <a href="/hilfe">Hilfe</a>
     <a href="http://{{ request.url.hostname or '127.0.0.1' }}:8097" target="_blank" rel="noopener">Grafana</a>
@@ -74,6 +75,12 @@
         return JSON.stringify(out);
       }
     });
+
+    function toggleEdit(prefix, id, editing) {
+      // UX-Regel: Zeilen werden versteckt (hidden), nie aus dem DOM entfernt.
+      document.getElementById(prefix + '-row-' + id).hidden = editing;
+      document.getElementById(prefix + '-edit-' + id).hidden = !editing;
+    }
   </script>
   <footer class="version">Finanzberatungs-Tool v{{ app_version }}</footer>
 </body>
diff --git a/finance/app/templates/planning.html b/finance/app/templates/planning.html
index 2ac17e5..9db9ce9 100644
--- a/finance/app/templates/planning.html
+++ b/finance/app/templates/planning.html
@@ -260,278 +260,11 @@
   </fieldset>
 </section>
 
-<section class="planning-section">
-  <h2>Szenarien</h2>
-  {% for row in scenario_rows %}
-  {% set sc = row.scenario %}
-  <fieldset>
-    <legend>{{ sc.name }}</legend>
-    <p id="sc-row-{{ sc.id }}">
-      {{ sc.description }}
-      · Wiederkehrende Posten: {{ 'ja' if sc.include_recurring else 'nein' }}
-      · Einmalposten: {{ 'ja' if sc.include_planned else 'nein' }}
-      <button type="button" onclick="toggleEdit('sc', {{ sc.id }}, true)">Bearbeiten</button>
-    </p>
-    <div id="sc-edit-{{ sc.id }}" hidden>
-      <form hx-ext="json-form" hx-patch="/api/scenarios/{{ sc.id }}" hx-swap="none"
-            hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-        <label>Name <input type="text" name="name" value="{{ sc.name }}" required></label>
-        <label>Beschreibung <input type="text" name="description" value="{{ sc.description }}"></label>
-        <label><input type="checkbox" name="include_recurring" data-type="bool" {% if sc.include_recurring %}checked{% endif %}> Wiederkehrende Posten einschließen</label>
-        <label><input type="checkbox" name="include_planned" data-type="bool" {% if sc.include_planned %}checked{% endif %}> Einmalposten einschließen</label>
-        <button type="submit">Speichern</button>
-        <button type="button" onclick="toggleEdit('sc', {{ sc.id }}, false)">Abbrechen</button>
-      </form>
-    </div>
-
-    <details>
-      <summary>Kredite zuordnen</summary>
-      {% for l in loans %}
-      <label class="inline-form">
-        <input type="checkbox" {% if l.id in row.assigned_loan_ids %}checked{% endif %}
-               onchange="toggleScenarioLoan({{ sc.id }}, {{ l.id }}, this.checked, this)">
-        {{ l.name }}
-      </label>
-      {% else %}
-      <p>Keine Kredite vorhanden.</p>
-      {% endfor %}
-    </details>
-
-    <h3>Einträge</h3>
-    <table>
-      <thead>
-        <tr><th>Was</th><th>Art</th><th>Wert/Betrag</th><th>Datum</th><th></th></tr>
-      </thead>
-      <tbody>
-        {% for m in row.modifiers %}
-        <tr id="mod-row-{{ m.id }}">
-          <td>
-            {% if m.target_type == "category" %}Kategorie: {{ category_names.get(m.target_id, m.target_id) }}
-            {% else %}Posten: {{ recurring_names.get(m.target_id, m.target_id) }}{% endif %}
-          </td>
-          <td>{{ m.kind|de_label }}</td>
-          <td>{% if m.kind in ('percent', 'absolute') %}{{ m.value|eur }}{% else %}–{% endif %}</td>
-          <td>{% if m.kind == 'ende' %}{{ m.end_date.strftime('%d.%m.%Y') if m.end_date else '–' }}{% else %}–{% endif %}</td>
-          <td>
-            <button type="button" onclick="toggleEdit('mod', {{ m.id }}, true)">Bearbeiten</button>
-            <form class="inline-form" hx-delete="/api/scenarios/{{ sc.id }}/modifiers/{{ m.id }}" hx-swap="none"
-                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-              <button type="submit">Löschen</button>
-            </form>
-          </td>
-        </tr>
-        <tr id="mod-edit-{{ m.id }}" hidden>
-          <td colspan="5">
-            <form hx-ext="json-form" hx-patch="/api/scenarios/{{ sc.id }}/modifiers/{{ m.id }}" hx-swap="none"
-                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-              <label>Ziel-Typ
-                <select name="target_type" data-type="str" onchange="onModTargetTypeChange(this)">
-                  <option value="category" {% if m.target_type == 'category' %}selected{% endif %}>Kategorie</option>
-                  <option value="recurring" {% if m.target_type == 'recurring' %}selected{% endif %}>Wiederkehrender Posten</option>
-                </select>
-              </label>
-              <span class="mod-target-category" {% if m.target_type != 'category' %}style="display:none"{% endif %}>
-                <label>Kategorie
-                  <select name="target_id" data-type="int" {% if m.target_type != 'category' %}disabled{% endif %}>
-                    {% for c in categories %}<option value="{{ c.id }}" {% if m.target_type == 'category' and c.id == m.target_id %}selected{% endif %}>{{ c.name }}</option>{% endfor %}
-                  </select>
-                </label>
-              </span>
-              <span class="mod-target-recurring" {% if m.target_type != 'recurring' %}style="display:none"{% endif %}>
-                <label>Posten
-                  <select name="target_id" data-type="int" {% if m.target_type != 'recurring' %}disabled{% endif %}>
-                    {% for r in recurring %}<option value="{{ r.id }}" {% if m.target_type == 'recurring' and r.id == m.target_id %}selected{% endif %}>{{ r.name }}</option>{% endfor %}
-                  </select>
-                </label>
-              </span>
-              <label>Art
-                <select name="kind" data-type="str" onchange="onEntryArtChange(this)">
-                  {% for k in modifier_kinds %}<option value="{{ k }}" {% if k == m.kind %}selected{% endif %}>{{ k|de_label }}</option>{% endfor %}
-                </select>
-              </label>
-              <label>Wert <input type="text" name="value" data-type="amount" value="{{ m.value|eur }}" {% if m.kind not in ('percent', 'absolute') %}disabled{% endif %}></label>
-              <label>Endet am <input type="date" name="end_date" value="{{ m.end_date.isoformat() if m.end_date else '' }}" {% if m.kind != 'ende' %}disabled{% endif %}></label>
-              <button type="submit">Speichern</button>
-              <button type="button" onclick="toggleEdit('mod', {{ m.id }}, false)">Abbrechen</button>
-            </form>
-          </td>
-        </tr>
-        {% endfor %}
-        {% for sp in row.planned_items %}
-        <tr id="spi-row-{{ sp.id }}">
-          <td>{{ sp.name }}</td>
-          <td>Einmalzahlung</td>
-          <td class="{{ 'neg' if sp.amount < 0 else '' }}">{{ sp.amount|eur }} €</td>
-          <td>{{ sp.due.strftime('%d.%m.%Y') }}</td>
-          <td>
-            <button type="button" onclick="toggleEdit('spi', {{ sp.id }}, true)">Bearbeiten</button>
-            <form class="inline-form" hx-delete="/api/scenarios/{{ sc.id }}/planned/{{ sp.id }}" hx-swap="none"
-                  hx-confirm="„{{ sp.name }}“ wirklich löschen?"
-                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-              <button type="submit">Löschen</button>
-            </form>
-          </td>
-        </tr>
-        <tr id="spi-edit-{{ sp.id }}" hidden>
-          <td colspan="5">
-            <form hx-ext="json-form" hx-patch="/api/scenarios/{{ sc.id }}/planned/{{ sp.id }}" hx-swap="none"
-                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-              <label>Name <input type="text" name="name" value="{{ sp.name }}" required></label>
-              <label>Betrag <input type="text" name="amount" data-type="amount" value="{{ sp.amount|eur }}" required></label>
-              <label>Fällig am <input type="date" name="due" value="{{ sp.due.isoformat() }}" required></label>
-              <button type="submit">Speichern</button>
-              <button type="button" onclick="toggleEdit('spi', {{ sp.id }}, false)">Abbrechen</button>
-            </form>
-          </td>
-        </tr>
-        {% endfor %}
-        {% if not row.modifiers and not row.planned_items %}
-        <tr><td colspan="5">Keine Einträge.</td></tr>
-        {% endif %}
-      </tbody>
-    </table>
-
-    <form hx-ext="json-form" hx-post="/api/scenarios/{{ sc.id }}/modifiers" hx-swap="none"
-          data-modifiers-url="/api/scenarios/{{ sc.id }}/modifiers"
-          data-planned-url="/api/scenarios/{{ sc.id }}/planned"
-          hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-      <strong>Neuer Eintrag:</strong>
-      <label>Eintragsart
-        <select name="kind" data-type="str" onchange="onEntryArtChange(this)">
-          {% for k in modifier_kinds %}<option value="{{ k }}">{{ k|de_label }}</option>{% endfor %}
-          <option value="einmal">Einmalzahlung</option>
-        </select>
-      </label>
-      <label>Ziel-Typ
-        <select name="target_type" data-type="str" onchange="onModTargetTypeChange(this)">
-          <option value="category">Kategorie</option>
-          <option value="recurring">Wiederkehrender Posten</option>
-        </select>
-      </label>
-      <span class="mod-target-category">
-        <label>Kategorie
-          <select name="target_id" data-type="int">
-            {% for c in categories %}<option value="{{ c.id }}">{{ c.name }}</option>{% endfor %}
-          </select>
-        </label>
-      </span>
-      <span class="mod-target-recurring" style="display:none">
-        <label>Posten
-          <select name="target_id" data-type="int" disabled>
-            {% for r in recurring %}<option value="{{ r.id }}">{{ r.name }}</option>{% endfor %}
-          </select>
-        </label>
-      </span>
-      <label>Wert <input type="text" name="value" data-type="amount" value="0"></label>
-      <label>Endet am <input type="date" name="end_date" disabled></label>
-      <label>Name <input type="text" name="name" disabled></label>
-      <label>Betrag <input type="text" name="amount" data-type="amount" placeholder="5000,00" disabled></label>
-      <label>Fällig am <input type="date" name="due" disabled></label>
-      <button type="submit">Hinzufügen</button>
-    </form>
-
-    <form hx-post="/api/scenarios/{{ sc.id }}/project" hx-swap="none"
-          hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-      <button type="submit">Durchrechnen</button>
-    </form>
-
-    {% if row.result %}
-    <p>
-      Tiefpunkt: {{ row.result.low_point_balance|eur }} € am {{ row.result.low_point_date.strftime('%d.%m.%Y') }}<br>
-      {% if row.result.below_zero_date %}Unterschreitet 0 € ab {{ row.result.below_zero_date.strftime('%d.%m.%Y') }}<br>{% endif %}
-      {% if row.result.below_threshold_date %}Unterschreitet Warnschwelle ab {{ row.result.below_threshold_date.strftime('%d.%m.%Y') }}<br>{% endif %}
-      Kurven in <a href="http://{{ request.url.hostname or '127.0.0.1' }}:8097" target="_blank" rel="noopener">Grafana</a> ansehen.
-    </p>
-    {% else %}
-    <p>Noch nicht durchgerechnet.</p>
-    {% endif %}
-  </fieldset>
-  {% else %}
-  <p>Noch keine Szenarien.</p>
-  {% endfor %}
-
-  <fieldset>
-    <legend>Neues Szenario anlegen</legend>
-    <form hx-ext="json-form" hx-post="/api/scenarios" hx-swap="none"
-          hx-on::after-request="if(event.detail.successful){window.location.reload()}">
-      <label>Name <input type="text" name="name" required></label>
-      <label>Beschreibung <input type="text" name="description"></label>
-      <label><input type="checkbox" name="include_recurring" data-type="bool" checked> Wiederkehrende Posten einschließen</label>
-      <label><input type="checkbox" name="include_planned" data-type="bool" checked> Einmalposten einschließen</label>
-      <button type="submit">Szenario anlegen</button>
-    </form>
-  </fieldset>
-</section>
-
 <script>
   // json-form-Extension ist zentral in base.html registriert (eine
   // Definition fuer alle Templates, inkl. data-type="bool"-Handling).
-
-  function toggleEdit(prefix, id, editing) {
-    // UX-Regel: Zeilen werden versteckt (hidden), nie aus dem DOM entfernt.
-    document.getElementById(prefix + '-row-' + id).hidden = editing;
-    document.getElementById(prefix + '-edit-' + id).hidden = !editing;
-  }
-
-  function onModTargetTypeChange(select) {
-    var form = select.closest('form');
-    var catSpan = form.querySelector('.mod-target-category');
-    var recSpan = form.querySelector('.mod-target-recurring');
-    var catSelect = catSpan.querySelector('select');
-    var recSelect = recSpan.querySelector('select');
-    var isCategory = select.value === 'category';
-    catSpan.style.display = isCategory ? '' : 'none';
-    recSpan.style.display = isCategory ? 'none' : '';
-    catSelect.disabled = !isCategory;
-    recSelect.disabled = isCategory;
-  }
-
-  function onEntryArtChange(select) {
-    // Umschaltmatrix "Neuer Eintrag"/Modifikator-Edit: Felder nur per
-    // disabled schalten (UX-Regel). Fehlt ein Feld (Edit-Formulare haben
-    // kein name/amount/due), wird es uebersprungen.
-    var form = select.closest('form');
-    var art = select.value;
-    var isMod = art !== 'einmal';
-    function setDisabled(name, disabled) {
-      var el = form.querySelector('[name="' + name + '"]');
-      if (el) { el.disabled = disabled; }
-    }
-    setDisabled('value', !(art === 'percent' || art === 'absolute'));
-    setDisabled('end_date', art !== 'ende');
-    setDisabled('name', isMod);
-    setDisabled('amount', isMod);
-    setDisabled('due', isMod);
-    var typeSelect = form.querySelector('[name="target_type"]');
-    if (typeSelect) {
-      typeSelect.disabled = !isMod;
-      var isCategory = typeSelect.value === 'category';
-      var catSelect = form.querySelector('.mod-target-category select');
-      var recSelect = form.querySelector('.mod-target-recurring select');
-      if (catSelect) { catSelect.disabled = !isMod || !isCategory; }
-      if (recSelect) { recSelect.disabled = !isMod || isCategory; }
-    }
-    // POST-Ziel nur beim Anlege-Formular wechseln (Edit-Formulare patchen fix).
-    if (form.hasAttribute('data-planned-url')) {
-      form.setAttribute('hx-post', isMod ? form.getAttribute('data-modifiers-url')
-                                         : form.getAttribute('data-planned-url'));
-      htmx.process(form);
-    }
-  }
-
-  function toggleScenarioLoan(scenarioId, loanId, checked, checkbox) {
-    fetch('/api/scenarios/' + scenarioId + '/loans/' + loanId, { method: checked ? 'POST' : 'DELETE' })
-      .then(function (resp) {
-        if (!resp.ok) {
-          throw new Error('HTTP ' + resp.status);
-        }
-        window.location.reload();
-      })
-      .catch(function (err) {
-        checkbox.checked = !checked;
-        alert('Zuordnung fehlgeschlagen: ' + err.message);
-      });
-  }
+  // toggleEdit ist ebenfalls zentral in base.html definiert (wird auf
+  // mehreren Seiten fuer Inline-Edit-Formulare gebraucht).
 
   var loadedSchedules = {};
   function formatIsoDate(iso) {
diff --git a/finance/app/templates/szenarien.html b/finance/app/templates/szenarien.html
new file mode 100644
index 0000000..d0f7739
--- /dev/null
+++ b/finance/app/templates/szenarien.html
@@ -0,0 +1,269 @@
+{% extends "base.html" %}
+{% block title %}Szenarien – Finanzberatung{% endblock %}
+{% block content %}
+<h1>Szenarien</h1>
+
+<section class="planning-section">
+  {% for row in scenario_rows %}
+  {% set sc = row.scenario %}
+  <fieldset>
+    <legend>{{ sc.name }}</legend>
+    <p id="sc-row-{{ sc.id }}">
+      {{ sc.description }}
+      · Wiederkehrende Posten: {{ 'ja' if sc.include_recurring else 'nein' }}
+      · Einmalposten: {{ 'ja' if sc.include_planned else 'nein' }}
+      <button type="button" onclick="toggleEdit('sc', {{ sc.id }}, true)">Bearbeiten</button>
+    </p>
+    <div id="sc-edit-{{ sc.id }}" hidden>
+      <form hx-ext="json-form" hx-patch="/api/scenarios/{{ sc.id }}" hx-swap="none"
+            hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+        <label>Name <input type="text" name="name" value="{{ sc.name }}" required></label>
+        <label>Beschreibung <input type="text" name="description" value="{{ sc.description }}"></label>
+        <label><input type="checkbox" name="include_recurring" data-type="bool" {% if sc.include_recurring %}checked{% endif %}> Wiederkehrende Posten einschließen</label>
+        <label><input type="checkbox" name="include_planned" data-type="bool" {% if sc.include_planned %}checked{% endif %}> Einmalposten einschließen</label>
+        <button type="submit">Speichern</button>
+        <button type="button" onclick="toggleEdit('sc', {{ sc.id }}, false)">Abbrechen</button>
+      </form>
+    </div>
+
+    <details>
+      <summary>Kredite zuordnen</summary>
+      {% for l in loans %}
+      <label class="inline-form">
+        <input type="checkbox" {% if l.id in row.assigned_loan_ids %}checked{% endif %}
+               onchange="toggleScenarioLoan({{ sc.id }}, {{ l.id }}, this.checked, this)">
+        {{ l.name }}
+      </label>
+      {% else %}
+      <p>Keine Kredite vorhanden.</p>
+      {% endfor %}
+    </details>
+
+    <h3>Einträge</h3>
+    <table>
+      <thead>
+        <tr><th>Was</th><th>Art</th><th>Wert/Betrag</th><th>Datum</th><th></th></tr>
+      </thead>
+      <tbody>
+        {% for m in row.modifiers %}
+        <tr id="mod-row-{{ m.id }}">
+          <td>
+            {% if m.target_type == "category" %}Kategorie: {{ category_names.get(m.target_id, m.target_id) }}
+            {% else %}Posten: {{ recurring_names.get(m.target_id, m.target_id) }}{% endif %}
+          </td>
+          <td>{{ m.kind|de_label }}</td>
+          <td>{% if m.kind in ('percent', 'absolute') %}{{ m.value|eur }}{% else %}–{% endif %}</td>
+          <td>{% if m.kind == 'ende' %}{{ m.end_date.strftime('%d.%m.%Y') if m.end_date else '–' }}{% else %}–{% endif %}</td>
+          <td>
+            <button type="button" onclick="toggleEdit('mod', {{ m.id }}, true)">Bearbeiten</button>
+            <form class="inline-form" hx-delete="/api/scenarios/{{ sc.id }}/modifiers/{{ m.id }}" hx-swap="none"
+                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+              <button type="submit">Löschen</button>
+            </form>
+          </td>
+        </tr>
+        <tr id="mod-edit-{{ m.id }}" hidden>
+          <td colspan="5">
+            <form hx-ext="json-form" hx-patch="/api/scenarios/{{ sc.id }}/modifiers/{{ m.id }}" hx-swap="none"
+                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+              <label>Ziel-Typ
+                <select name="target_type" data-type="str" onchange="onModTargetTypeChange(this)">
+                  <option value="category" {% if m.target_type == 'category' %}selected{% endif %}>Kategorie</option>
+                  <option value="recurring" {% if m.target_type == 'recurring' %}selected{% endif %}>Wiederkehrender Posten</option>
+                </select>
+              </label>
+              <span class="mod-target-category" {% if m.target_type != 'category' %}style="display:none"{% endif %}>
+                <label>Kategorie
+                  <select name="target_id" data-type="int" {% if m.target_type != 'category' %}disabled{% endif %}>
+                    {% for c in categories %}<option value="{{ c.id }}" {% if m.target_type == 'category' and c.id == m.target_id %}selected{% endif %}>{{ c.name }}</option>{% endfor %}
+                  </select>
+                </label>
+              </span>
+              <span class="mod-target-recurring" {% if m.target_type != 'recurring' %}style="display:none"{% endif %}>
+                <label>Posten
+                  <select name="target_id" data-type="int" {% if m.target_type != 'recurring' %}disabled{% endif %}>
+                    {% for r in recurring %}<option value="{{ r.id }}" {% if m.target_type == 'recurring' and r.id == m.target_id %}selected{% endif %}>{{ r.name }}</option>{% endfor %}
+                  </select>
+                </label>
+              </span>
+              <label>Art
+                <select name="kind" data-type="str" onchange="onEntryArtChange(this)">
+                  {% for k in modifier_kinds %}<option value="{{ k }}" {% if k == m.kind %}selected{% endif %}>{{ k|de_label }}</option>{% endfor %}
+                </select>
+              </label>
+              <label>Wert <input type="text" name="value" data-type="amount" value="{{ m.value|eur }}" {% if m.kind not in ('percent', 'absolute') %}disabled{% endif %}></label>
+              <label>Endet am <input type="date" name="end_date" value="{{ m.end_date.isoformat() if m.end_date else '' }}" {% if m.kind != 'ende' %}disabled{% endif %}></label>
+              <button type="submit">Speichern</button>
+              <button type="button" onclick="toggleEdit('mod', {{ m.id }}, false)">Abbrechen</button>
+            </form>
+          </td>
+        </tr>
+        {% endfor %}
+        {% for sp in row.planned_items %}
+        <tr id="spi-row-{{ sp.id }}">
+          <td>{{ sp.name }}</td>
+          <td>Einmalzahlung</td>
+          <td class="{{ 'neg' if sp.amount < 0 else '' }}">{{ sp.amount|eur }} €</td>
+          <td>{{ sp.due.strftime('%d.%m.%Y') }}</td>
+          <td>
+            <button type="button" onclick="toggleEdit('spi', {{ sp.id }}, true)">Bearbeiten</button>
+            <form class="inline-form" hx-delete="/api/scenarios/{{ sc.id }}/planned/{{ sp.id }}" hx-swap="none"
+                  hx-confirm="„{{ sp.name }}“ wirklich löschen?"
+                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+              <button type="submit">Löschen</button>
+            </form>
+          </td>
+        </tr>
+        <tr id="spi-edit-{{ sp.id }}" hidden>
+          <td colspan="5">
+            <form hx-ext="json-form" hx-patch="/api/scenarios/{{ sc.id }}/planned/{{ sp.id }}" hx-swap="none"
+                  hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+              <label>Name <input type="text" name="name" value="{{ sp.name }}" required></label>
+              <label>Betrag <input type="text" name="amount" data-type="amount" value="{{ sp.amount|eur }}" required></label>
+              <label>Fällig am <input type="date" name="due" value="{{ sp.due.isoformat() }}" required></label>
+              <button type="submit">Speichern</button>
+              <button type="button" onclick="toggleEdit('spi', {{ sp.id }}, false)">Abbrechen</button>
+            </form>
+          </td>
+        </tr>
+        {% endfor %}
+        {% if not row.modifiers and not row.planned_items %}
+        <tr><td colspan="5">Keine Einträge.</td></tr>
+        {% endif %}
+      </tbody>
+    </table>
+
+    <form hx-ext="json-form" hx-post="/api/scenarios/{{ sc.id }}/modifiers" hx-swap="none"
+          data-modifiers-url="/api/scenarios/{{ sc.id }}/modifiers"
+          data-planned-url="/api/scenarios/{{ sc.id }}/planned"
+          hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+      <strong>Neuer Eintrag:</strong>
+      <label>Eintragsart
+        <select name="kind" data-type="str" onchange="onEntryArtChange(this)">
+          {% for k in modifier_kinds %}<option value="{{ k }}">{{ k|de_label }}</option>{% endfor %}
+          <option value="einmal">Einmalzahlung</option>
+        </select>
+      </label>
+      <label>Ziel-Typ
+        <select name="target_type" data-type="str" onchange="onModTargetTypeChange(this)">
+          <option value="category">Kategorie</option>
+          <option value="recurring">Wiederkehrender Posten</option>
+        </select>
+      </label>
+      <span class="mod-target-category">
+        <label>Kategorie
+          <select name="target_id" data-type="int">
+            {% for c in categories %}<option value="{{ c.id }}">{{ c.name }}</option>{% endfor %}
+          </select>
+        </label>
+      </span>
+      <span class="mod-target-recurring" style="display:none">
+        <label>Posten
+          <select name="target_id" data-type="int" disabled>
+            {% for r in recurring %}<option value="{{ r.id }}">{{ r.name }}</option>{% endfor %}
+          </select>
+        </label>
+      </span>
+      <label>Wert <input type="text" name="value" data-type="amount" value="0"></label>
+      <label>Endet am <input type="date" name="end_date" disabled></label>
+      <label>Name <input type="text" name="name" disabled></label>
+      <label>Betrag <input type="text" name="amount" data-type="amount" placeholder="5000,00" disabled></label>
+      <label>Fällig am <input type="date" name="due" disabled></label>
+      <button type="submit">Hinzufügen</button>
+    </form>
+
+    <form hx-post="/api/scenarios/{{ sc.id }}/project" hx-swap="none"
+          hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+      <button type="submit">Durchrechnen</button>
+    </form>
+
+    {% if row.result %}
+    <p>
+      Tiefpunkt: {{ row.result.low_point_balance|eur }} € am {{ row.result.low_point_date.strftime('%d.%m.%Y') }}<br>
+      {% if row.result.below_zero_date %}Unterschreitet 0 € ab {{ row.result.below_zero_date.strftime('%d.%m.%Y') }}<br>{% endif %}
+      {% if row.result.below_threshold_date %}Unterschreitet Warnschwelle ab {{ row.result.below_threshold_date.strftime('%d.%m.%Y') }}<br>{% endif %}
+      Kurven in <a href="http://{{ request.url.hostname or '127.0.0.1' }}:8097" target="_blank" rel="noopener">Grafana</a> ansehen.
+    </p>
+    {% else %}
+    <p>Noch nicht durchgerechnet.</p>
+    {% endif %}
+  </fieldset>
+  {% else %}
+  <p>Noch keine Szenarien.</p>
+  {% endfor %}
+
+  <fieldset>
+    <legend>Neues Szenario anlegen</legend>
+    <form hx-ext="json-form" hx-post="/api/scenarios" hx-swap="none"
+          hx-on::after-request="if(event.detail.successful){window.location.reload()}">
+      <label>Name <input type="text" name="name" required></label>
+      <label>Beschreibung <input type="text" name="description"></label>
+      <label><input type="checkbox" name="include_recurring" data-type="bool" checked> Wiederkehrende Posten einschließen</label>
+      <label><input type="checkbox" name="include_planned" data-type="bool" checked> Einmalposten einschließen</label>
+      <button type="submit">Szenario anlegen</button>
+    </form>
+  </fieldset>
+</section>
+
+<script>
+  function onModTargetTypeChange(select) {
+    var form = select.closest('form');
+    var catSpan = form.querySelector('.mod-target-category');
+    var recSpan = form.querySelector('.mod-target-recurring');
+    var catSelect = catSpan.querySelector('select');
+    var recSelect = recSpan.querySelector('select');
+    var isCategory = select.value === 'category';
+    catSpan.style.display = isCategory ? '' : 'none';
+    recSpan.style.display = isCategory ? 'none' : '';
+    catSelect.disabled = !isCategory;
+    recSelect.disabled = isCategory;
+  }
+
+  function onEntryArtChange(select) {
+    // Umschaltmatrix "Neuer Eintrag"/Modifikator-Edit: Felder nur per
+    // disabled schalten (UX-Regel). Fehlt ein Feld (Edit-Formulare haben
+    // kein name/amount/due), wird es uebersprungen.
+    var form = select.closest('form');
+    var art = select.value;
+    var isMod = art !== 'einmal';
+    function setDisabled(name, disabled) {
+      var el = form.querySelector('[name="' + name + '"]');
+      if (el) { el.disabled = disabled; }
+    }
+    setDisabled('value', !(art === 'percent' || art === 'absolute'));
+    setDisabled('end_date', art !== 'ende');
+    setDisabled('name', isMod);
+    setDisabled('amount', isMod);
+    setDisabled('due', isMod);
+    var typeSelect = form.querySelector('[name="target_type"]');
+    if (typeSelect) {
+      typeSelect.disabled = !isMod;
+      var isCategory = typeSelect.value === 'category';
+      var catSelect = form.querySelector('.mod-target-category select');
+      var recSelect = form.querySelector('.mod-target-recurring select');
+      if (catSelect) { catSelect.disabled = !isMod || !isCategory; }
+      if (recSelect) { recSelect.disabled = !isMod || isCategory; }
+    }
+    // POST-Ziel nur beim Anlege-Formular wechseln (Edit-Formulare patchen fix).
+    if (form.hasAttribute('data-planned-url')) {
+      form.setAttribute('hx-post', isMod ? form.getAttribute('data-modifiers-url')
+                                         : form.getAttribute('data-planned-url'));
+      htmx.process(form);
+    }
+  }
+
+  function toggleScenarioLoan(scenarioId, loanId, checked, checkbox) {
+    fetch('/api/scenarios/' + scenarioId + '/loans/' + loanId, { method: checked ? 'POST' : 'DELETE' })
+      .then(function (resp) {
+        if (!resp.ok) {
+          throw new Error('HTTP ' + resp.status);
+        }
+        window.location.reload();
+      })
+      .catch(function (err) {
+        checkbox.checked = !checked;
+        alert('Zuordnung fehlgeschlagen: ' + err.message);
+      });
+  }
+</script>
+{% endblock %}
diff --git a/finance/tests/test_gui.py b/finance/tests/test_gui.py
index 76a2fcc..0173b13 100644
--- a/finance/tests/test_gui.py
+++ b/finance/tests/test_gui.py
@@ -9,7 +9,7 @@ H = {"Authorization": "Bearer test-key"}
 
 
 def test_pages_require_login(client):
-    for path in ("/", "/buchungen", "/import", "/salden", "/planung", "/hilfe"):
+    for path in ("/", "/buchungen", "/import", "/salden", "/planung", "/szenarien", "/hilfe"):
         r = client.get(path, follow_redirects=False)
         assert r.status_code in (302, 303), path
         assert r.headers["location"] == "/login"
@@ -17,7 +17,7 @@ def test_pages_require_login(client):
 
 def test_pages_render_after_login(client):
     client.post("/login", data={"username": "admin", "password": "geheim"})
-    for path in ("/", "/buchungen", "/import", "/salden", "/planung", "/hilfe"):
+    for path in ("/", "/buchungen", "/import", "/salden", "/planung", "/szenarien", "/hilfe"):
         r = client.get(path)
         assert r.status_code == 200
         assert "Finanzberatung" in r.text
@@ -317,15 +317,23 @@ def test_planung_hat_bearbeiten_formulare(client, db):
     db.add(Loan(name="EditL", principal=Decimal("1000.00"),
                 annual_rate_pct=Decimal("4.50"), term_months=12,
                 payout_date=date(2026, 8, 1), repayment_type="annuity"))
-    db.add(Scenario(name="EditS", description="d"))
     db.commit()
     r = client.get("/planung").text
-    assert r.count(">Bearbeiten</button>") >= 4
+    assert r.count(">Bearbeiten</button>") >= 3
     for fragment in ('hx-patch="/api/recurring/', 'hx-patch="/api/planned/',
-                     'hx-patch="/api/loans/', 'hx-patch="/api/scenarios/'):
+                     'hx-patch="/api/loans/'):
         assert fragment in r, fragment
 
 
+def test_szenarien_hat_bearbeiten_formular(client, db):
+    client.post("/login", data={"username": "admin", "password": "geheim"})
+    db.add(Scenario(name="EditS", description="d"))
+    db.commit()
+    r = client.get("/szenarien").text
+    assert r.count(">Bearbeiten</button>") >= 1
+    assert 'hx-patch="/api/scenarios/' in r
+
+
 def test_salden_shows_ohne_anker_footnote(client, db):
     # UX-Regel: Konten ohne Anker sind immer sichtbar als relative Werte
     # gekennzeichnet, nicht stillschweigend wie geankerte Konten dargestellt.
@@ -350,7 +358,7 @@ def test_szenario_gui_ende_und_einmalzahlungen(client, db):
     db.add(ScenarioPlannedItem(scenario_id=sc.id, name="Zufluss-GUI",
                                amount=Decimal("5000.00"), due=date(2026, 7, 30)))
     db.commit()
-    r = client.get("/planung").text
+    r = client.get("/szenarien").text
     assert 'value="ende"' in r                     # neue Art im Dropdown
     assert 'name="end_date"' in r                  # Datumsfeld im Modifikator-Formular
     assert "31.08.2026" in r                       # ende-Modifikator zeigt Datum
@@ -372,7 +380,7 @@ def test_szenario_eintraege_tabelle(client, db):
     db.add(ScenarioPlannedItem(scenario_id=sc.id, name="Zufluss-Eintrag",
                                amount=Decimal("5000.00"), due=date(2026, 7, 30)))
     db.commit()
-    r = client.get("/planung").text
+    r = client.get("/szenarien").text
     assert "Einträge" in r
     # alte details-Abschnitte sind ersetzt
     assert "<summary>Modifikatoren</summary>" not in r
@@ -387,3 +395,22 @@ def test_szenario_eintraege_tabelle(client, db):
     assert 'value="einmal"' in r
     assert f'data-planned-url="/api/scenarios/{sc.id}/planned"' in r
     assert "onEntryArtChange" in r and "onModKindChange" not in r
+
+
+def test_szenarien_seite_und_nav(client, db):
+    client.post("/login", data={"username": "admin", "password": "geheim"})
+    db.add(Scenario(name="Seiten-Test", description="d"))
+    db.commit()
+    r = client.get("/szenarien")
+    assert r.status_code == 200
+    assert "Seiten-Test" in r.text and "Neues Szenario anlegen" in r.text
+    assert 'href="/szenarien"' in r.text  # Nav-Punkt
+    # Planung enthaelt keine Szenarien-Sektion mehr:
+    p = client.get("/planung").text
+    assert "Seiten-Test" not in p and "Neues Szenario anlegen" not in p
+    assert "Wiederkehrende Posten" in p and "Kredite" in p
+
+
+def test_szenarien_seite_braucht_login(client):
+    r = client.get("/szenarien", follow_redirects=False)
+    assert r.status_code in (302, 303) and r.headers["location"] == "/login"