diff --git a/djangorota/djangorota/templates/rota/rota_detail.html b/djangorota/djangorota/templates/rota/rota_detail.html
index 473bdf2..3767591 100644
--- a/djangorota/djangorota/templates/rota/rota_detail.html
+++ b/djangorota/djangorota/templates/rota/rota_detail.html
@@ -1,144 +1,98 @@
 {% extends 'base.html' %}
-<html>
-<head>
-  <title>Rota: {{ rota.name }}</title>
+{% block head %}
   <link href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css" rel="stylesheet">
-  <script src="https://unpkg.com/htmx.org@1.9.2"></script>
   {% include 'rota/partials/flatpickr_includes.html' %}
-</head>
-<body>
+{% endblock %}
+{% block content %}
   <section class="section">
     <div class="container">
       <h1 class="title">{{ rota.name }}</h1>
-      <p>
-        <a class="button is-small" href="{% url 'rota:rota_edit' rota.id %}">Edit rota</a>
-      </p>
+      <p><a class="button is-small" href="{% url 'rota:rota_edit' rota.id %}">Edit rota</a></p>
+      <p class="subtitle">{{ rota.description }}</p>
       <p>Period: {{ rota.start_date }} → {{ rota.end_date }}</p>
 
       <div class="mb-4">
-        <p>
-          <button class="button is-link" hx-get="{% url 'rota:worker_add' %}?rota_id={{ rota.id }}" hx-target="#modal" hx-swap="innerHTML">Add worker</button>
-        </p>
-        {% block head %}
-          <link href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css" rel="stylesheet">
-          {% include 'rota/partials/flatpickr_includes.html' %}
-        {% endblock %}
-        {% block content %}
-          <section class="section">
-            <div class="container">
-              <h1 class="title">{{ rota.name }}</h1>
-              <p>
-                <a class="button is-small" href="{% url 'rota:rota_edit' rota.id %}">Edit rota</a>
-              </p>
-              <p class="subtitle">{{ rota.description }}</p>
-              <p>Period: {{ rota.start_date }} → {{ rota.end_date }}</p>
+        <p><button class="button is-link" hx-get="{% url 'rota:worker_add' %}?rota_id={{ rota.id }}" hx-target="#modal" hx-swap="innerHTML">Add worker</button></p>
+        {% include 'rota/partials/worker_list.html' %}
+      </div>
 
-              <div class="mb-4">
-                <p>
-                  <button class="button is-link" hx-get="{% url 'rota:worker_add' %}?rota_id={{ rota.id }}" hx-target="#modal" hx-swap="innerHTML">Add worker</button>
-                </p>
-                {% include 'rota/partials/worker_list.html' %}
-              </div>
+      <div class="mb-4">
+        <h2 class="subtitle">Historic runs</h2>
+        <div class="box">
+          <div style="margin-bottom:0.5em;">
+            <form method="post" action="{% url 'rota:rota_runs_clear' rota.id %}" style="display:inline" onsubmit="return confirm('Delete all historic runs for this rota? This cannot be undone.')">
+              {% csrf_token %}
+              <button class="button is-danger is-light is-small" type="submit">Clear all runs</button>
+            </form>
+          </div>
+          <ul>
+            {% for run in rota.runs.all %}
+              <li>
+                <a href="{% url 'rota:rota_run_detail' run.id %}">Run {{ run.id }}</a> — {{ run.get_status_display }}
+                {% if run.finished_at %} — finished {{ run.finished_at }}{% endif %}
+                <span class="ml-2"><a class="button is-small is-light" href="{% url 'rota:rota_run_export_html' run.id %}" target="_blank">Export</a></span>
+              </li>
+            {% empty %}
+              <li>No previous runs</li>
+            {% endfor %}
+          </ul>
+        </div>
+      </div>
 
-              <div class="mb-4">
-                <h2 class="subtitle">Historic runs</h2>
-                <div class="box">
-                  <div style="margin-bottom:0.5em;">
-                    <form method="post" action="{% url 'rota:rota_runs_clear' rota.id %}" style="display:inline" onsubmit="return confirm('Delete all historic runs for this rota? This cannot be undone.')">
-                      {% csrf_token %}
-                      <button class="button is-danger is-light is-small" type="submit">Clear all runs</button>
-                    </form>
-                  </div>
-                  <ul>
-                    {% for run in rota.runs.all %}
-                      <li>
-                        <a href="{% url 'rota:rota_run_detail' run.id %}">Run {{ run.id }}</a> —
-                        {{ run.get_status_display }}
-                        {% if run.finished_at %} — finished {{ run.finished_at }}{% endif %}
-                        <span class="ml-2">
-                          <a class="button is-small is-light" href="{% url 'rota:rota_run_export_html' run.id %}" target="_blank">Export</a>
-                        </span>
-                      </li>
-                    {% empty %}
-                      <li>No previous runs</li>
-                    {% endfor %}
-                  </ul>
-                </div>
-              </div>
+      <div class="mb-4">
+        <h2 class="subtitle">Constraint options</h2>
+        <div class="box">
+          <p class="help">Configure typed rota constraint options. Click Edit to open the form showing typed fields and descriptions.</p>
+          <p><button class="button is-link" hx-get="{% url 'rota:rota_options' rota.id %}" hx-target="#modal" hx-swap="innerHTML">Edit constraint options</button></p>
+          <hr />
+          <h3 class="subtitle is-6">Configured constraint values</h3>
+          <div style="max-height:200px; overflow:auto; margin-bottom:0.75em;">
+            {% if configured_constraints %}
+              <table class="table is-fullwidth is-striped is-narrow">
+                <thead><tr><th>Key</th><th>Value</th><th></th></tr></thead>
+                <tbody>
+                  {% for key, info in configured_constraints.items %}
+                    <tr id="constraint-row-{{ key }}">
+                      <td style="vertical-align:middle;"><code title="{{ info.description|default:'' }}">{{ key }}</code></td>
+                      <td style="vertical-align:middle;"><pre style="white-space:pre-wrap; margin:0;">{{ info.pretty }}</pre></td>
+                      <td style="vertical-align:middle;">
+                        <a href="javascript:void(0)" class="button is-small is-light" role="button" hx-get="{% url 'rota:rota_option_edit' rota.id %}?key={{ key }}" hx-target="#modal" hx-swap="innerHTML">Edit</a>
+                        <form method="post" hx-post="{% url 'rota:rota_option_delete' rota.id %}" hx-target="#constraint-row-{{ key }}" hx-swap="outerHTML" style="display:inline">
+                          {% csrf_token %}
+                          <input type="hidden" name="key" value="{{ key }}" />
+                          <input type="hidden" name="inline" value="1" />
+                          <button class="button is-small is-danger is-light" type="submit">Delete</button>
+                        </form>
+                      </td>
+                    </tr>
+                  {% endfor %}
+                </tbody>
+              </table>
+            {% else %}
+              <p class="help">No typed constraint options have been configured for this rota.</p>
+            {% endif %}
+          </div>
+        </div>
+      </div>
 
-              <div class="mb-4">
-                <h2 class="subtitle">Constraint options</h2>
-                <div class="box">
-                  <p class="help">Configure typed rota constraint options. Click Edit to open the form showing typed fields and descriptions.</p>
-                  <p>
-                    <button class="button is-link" hx-get="{% url 'rota:rota_options' rota.id %}" hx-target="#modal" hx-swap="innerHTML">Edit constraint options</button>
-                  </p>
-                  <hr />
-                  <h3 class="subtitle is-6">Configured constraint values</h3>
-                  <div style="max-height:200px; overflow:auto; margin-bottom:0.75em;">
-                    {% if configured_constraints %}
-                    <table class="table is-fullwidth is-striped is-narrow">
-                      <thead>
-                        <tr><th>Key</th><th>Value</th><th></th></tr>
-                      </thead>
-                      <tbody>
-                        {% for key, info in configured_constraints.items %}
-                        <tr id="constraint-row-{{ key }}">
-                          <td style="vertical-align:middle;"><code title="{{ info.description|default:'' }}">{{ key }}</code></td>
-                          <td style="vertical-align:middle;"><pre style="white-space:pre-wrap; margin:0;">{{ info.pretty }}</pre></td>
-                          <td style="vertical-align:middle;">
-                            <a href="javascript:void(0)" class="button is-small is-light" role="button" hx-get="{% url 'rota:rota_option_edit' rota.id %}?key={{ key }}" hx-target="#modal" hx-swap="innerHTML">Edit</a>
-                            <form method="post" hx-post="{% url 'rota:rota_option_delete' rota.id %}" hx-target="#constraint-row-{{ key }}" hx-swap="outerHTML" style="display:inline">
-                              {% csrf_token %}
-                              <input type="hidden" name="key" value="{{ key }}" />
-                              <input type="hidden" name="inline" value="1" />
-                              <button class="button is-small is-danger is-light" type="submit">Delete</button>
-                            </form>
-                          </td>
-                        </tr>
-                        {% endfor %}
-                      </tbody>
-                    </table>
-                    {% else %}
-                      <p class="help">No typed constraint options have been configured for this rota.</p>
-                    {% endif %}
-                  </div>
+      <form method="post">
+        {% csrf_token %}
+        <div class="field is-grouped is-grouped-multiline">
+          <div class="control"><label class="checkbox"><input type="checkbox" name="generate_builder" value="1"> Generate HTML export</label></div>
+          <div class="control"><label class="checkbox"><input type="checkbox" name="builder_solve" value="1"> Solve when exporting (may be slow)</label></div>
+          <div class="control"><button class="button is-primary" type="submit">Run scheduler (background)</button></div>
+        </div>
+      </form>
 
-                </div>
-              </div>
+      <hr />
 
-              <form method="post">
-                {% csrf_token %}
-                <div class="field is-grouped is-grouped-multiline">
-                  <div class="control">
-                    <label class="checkbox">
-                      <input type="checkbox" name="generate_builder" value="1"> Generate HTML export
-                    </label>
-                  </div>
-                  <div class="control">
-                    <label class="checkbox">
-                      <input type="checkbox" name="builder_solve" value="1"> Solve when exporting (may be slow)
-                    </label>
-                  </div>
-                  <div class="control">
-                    <button class="button is-primary" type="submit">Run scheduler (background)</button>
-                  </div>
-                </div>
-              </form>
+      <div>
+        <h2 class="subtitle">Edit shifts</h2>
+        <p><button class="button is-link" hx-get="{% url 'rota:shift_add' rota.id %}" hx-target="#shift-form" hx-swap="innerHTML">Add shift</button></p>
+        <div id="shift-form">{# Load form via HTMX when user clicks 'Add shift' - initial empty state #}</div>
+        {% include 'rota/partials/shift_list.html' %}
+      </div>
 
-              <hr>
-
-              <div>
-                <h2 class="subtitle">Edit shifts</h2>
-                <p>
-                  <button class="button is-link" hx-get="{% url 'rota:shift_add' rota.id %}" hx-target="#shift-form" hx-swap="innerHTML">Add shift</button>
-                </p>
-
-              <div id="shift-form">
-                {# Load form via HTMX when user clicks 'Add shift' - initial empty state #}
-              </div>
-
-              {% include 'rota/partials/shift_list.html' %}
-              </div>
-            </div>
-        {% endblock %}
+    </div>
+  </section>
+{% endblock %}
