diff --git a/web/templates/base.html b/web/templates/base.html
index 2a7f813..4155859 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -3,44 +3,146 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>{{ title or "Arbitrade" }}</title>
+    <title>{% block title %}{{ title or "Arbitrade" }}{% endblock %}</title>
     <script src="https://unpkg.com/htmx.org@1.9.12"></script>
+    {% block head_scripts %}{% endblock %}
     <style>
-      :root {
-        --bg: #f4f7f5;
-        --ink: #122118;
-        --accent: #1f7a4c;
-        --card: #ffffff;
-      }
       body {
         margin: 0;
-        font-family: "Segoe UI", sans-serif;
-        color: var(--ink);
-        background: radial-gradient(circle at top, #e9f7ef, var(--bg));
+        font-family: Arial, sans-serif;
+        background: #0b1220;
+        color: #e5eefb;
       }
-      .wrap {
-        max-width: 720px;
-        margin: 4rem auto;
-        padding: 0 1rem;
+      .shell {
+        max-width: 1120px;
+        margin: 0 auto;
+        padding: 32px 20px 48px;
+      }
+      .hero {
+        display: flex;
+        justify-content: space-between;
+        gap: 24px;
+        align-items: end;
+        margin-bottom: 24px;
+      }
+      .title {
+        font-size: 2rem;
+        margin: 0 0 8px;
+      }
+      .subtitle {
+        margin: 0;
+        color: #9fb2d0;
+      }
+      .panel {
+        background: rgba(255, 255, 255, 0.04);
+        border: 1px solid rgba(255, 255, 255, 0.08);
+        border-radius: 16px;
+        padding: 20px;
+      }
+      .grid {
+        display: grid;
+        gap: 16px;
+        grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
       }
       .card {
-        background: var(--card);
-        border: 1px solid #d8e7dd;
-        border-radius: 12px;
-        padding: 1.25rem;
-        box-shadow: 0 6px 24px rgba(18, 33, 24, 0.08);
+        background: rgba(255, 255, 255, 0.04);
+        border-radius: 14px;
+        padding: 16px;
+        border: 1px solid rgba(255, 255, 255, 0.08);
       }
-      .badge {
-        display: inline-block;
-        background: #d9f3e5;
-        color: var(--accent);
-        border-radius: 999px;
-        padding: 0.2rem 0.6rem;
+      .label {
+        color: #9fb2d0;
+        font-size: 0.85rem;
+        margin-bottom: 8px;
+      }
+      .value {
+        font-size: 1.4rem;
+        font-weight: 700;
+      }
+      .meta {
+        margin-top: 18px;
+        color: #7f95b7;
         font-size: 0.85rem;
       }
+      .toolbar {
+        display: flex;
+        gap: 12px;
+        flex-wrap: wrap;
+      }
+      .toolbar form {
+        margin: 0;
+      }
+      .button {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border: 0;
+        cursor: pointer;
+        padding: 10px 14px;
+        border-radius: 999px;
+        background: #2d6cdf;
+        color: white;
+        text-decoration: none;
+        font: inherit;
+      }
+      .button.secondary {
+        background: transparent;
+        border: 1px solid rgba(255, 255, 255, 0.14);
+      }
+      .button.danger {
+        background: #ba3d4f;
+      }
+      .form-grid {
+        display: grid;
+        gap: 12px;
+      }
+      .field {
+        display: grid;
+        gap: 6px;
+        color: #9fb2d0;
+        font-size: 0.9rem;
+      }
+      .field input {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 10px 12px;
+        border-radius: 10px;
+        border: 1px solid rgba(255, 255, 255, 0.14);
+        background: rgba(255, 255, 255, 0.04);
+        color: #e5eefb;
+        font: inherit;
+      }
+      .field.checkbox {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+      .field.checkbox input {
+        width: auto;
+      }
+      .control-actions {
+        display: flex;
+        gap: 12px;
+        flex-wrap: wrap;
+      }
+      .chart-head {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 12px;
+        flex-wrap: wrap;
+      }
+      .chart-canvas {
+        width: 100%;
+        min-height: 260px;
+      }
     </style>
+    {% block extra_style %}{% endblock %}
   </head>
   <body>
-    <main class="wrap">{% block content %}{% endblock %}</main>
+    <main class="{% block main_class %}shell{% endblock %}">
+      {% block content %}{% endblock %}
+    </main>
+    {% block scripts %}{% endblock %}
   </body>
 </html>
diff --git a/web/templates/dashboard.html b/web/templates/dashboard.html
index d35a9ea..e7c2ca1 100644
--- a/web/templates/dashboard.html
+++ b/web/templates/dashboard.html
@@ -1,311 +1,169 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>{{ title }}</title>
-    <script src="https://unpkg.com/htmx.org@1.9.12"></script>
-    <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.3/dist/chart.umd.min.js"></script>
-    <style>
-      body {
-        margin: 0;
-        font-family: Arial, sans-serif;
-        background: #0b1220;
-        color: #e5eefb;
-      }
-      .shell {
-        max-width: 1120px;
-        margin: 0 auto;
-        padding: 32px 20px 48px;
-      }
-      .hero {
-        display: flex;
-        justify-content: space-between;
-        gap: 24px;
-        align-items: end;
-        margin-bottom: 24px;
-      }
-      .title {
-        font-size: 2rem;
-        margin: 0 0 8px;
-      }
-      .subtitle {
-        margin: 0;
-        color: #9fb2d0;
-      }
-      .panel {
-        background: rgba(255, 255, 255, 0.04);
-        border: 1px solid rgba(255, 255, 255, 0.08);
-        border-radius: 16px;
-        padding: 20px;
-      }
-      .grid {
-        display: grid;
-        gap: 16px;
-        grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
-      }
-      .card {
-        background: rgba(255, 255, 255, 0.04);
-        border-radius: 14px;
-        padding: 16px;
-        border: 1px solid rgba(255, 255, 255, 0.08);
-      }
-      .label {
-        color: #9fb2d0;
-        font-size: 0.85rem;
-        margin-bottom: 8px;
-      }
-      .value {
-        font-size: 1.4rem;
-        font-weight: 700;
-      }
-      .meta {
-        margin-top: 18px;
-        color: #7f95b7;
-        font-size: 0.85rem;
-      }
-      .toolbar {
-        display: flex;
-        gap: 12px;
-        flex-wrap: wrap;
-      }
-      .toolbar form {
-        margin: 0;
-      }
-      .button {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        border: 0;
-        cursor: pointer;
-        padding: 10px 14px;
-        border-radius: 999px;
-        background: #2d6cdf;
-        color: white;
-        text-decoration: none;
-        font: inherit;
-      }
-      .button.secondary {
-        background: transparent;
-        border: 1px solid rgba(255, 255, 255, 0.14);
-      }
-      .button.danger {
-        background: #ba3d4f;
-      }
-      .form-grid {
-        display: grid;
-        gap: 12px;
-      }
-      .field {
-        display: grid;
-        gap: 6px;
-        color: #9fb2d0;
-        font-size: 0.9rem;
-      }
-      .field input {
-        width: 100%;
-        box-sizing: border-box;
-        padding: 10px 12px;
-        border-radius: 10px;
-        border: 1px solid rgba(255, 255, 255, 0.14);
-        background: rgba(255, 255, 255, 0.04);
-        color: #e5eefb;
-        font: inherit;
-      }
-      .field.checkbox {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-      }
-      .field.checkbox input {
-        width: auto;
-      }
-      .control-actions {
-        display: flex;
-        gap: 12px;
-        flex-wrap: wrap;
-      }
-      .chart-head {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        gap: 12px;
-        flex-wrap: wrap;
-      }
-      .chart-canvas {
-        width: 100%;
-        min-height: 260px;
-      }
-    </style>
-  </head>
-  <body>
-    <main class="shell">
-      <section class="hero">
-        <div>
-          <h1 class="title">Arbitrade Dashboard</h1>
-          <p class="subtitle">Live execution, P&amp;L, and system state.</p>
-        </div>
-        <div class="toolbar">
-          <a
-            class="button"
-            href="{{ metrics_endpoint }}"
-            hx-get="{{ metrics_endpoint }}"
-            hx-target="#metrics-panel"
-            hx-swap="outerHTML"
-            >Refresh metrics</a
-          >
-          <a class="button secondary" href="/health">Health</a>
-        </div>
-      </section>
+{% extends "base.html" %} {% block title %}{{ title }}{% endblock %} {% block
+head_scripts %}
+<script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.3/dist/chart.umd.min.js"></script>
+{% endblock %} {% block main_class %}shell{% endblock %} {% block content %}
+<section class="hero">
+  <div>
+    <h1 class="title">Arbitrade Dashboard</h1>
+    <p class="subtitle">Live execution, P&amp;L, and system state.</p>
+  </div>
+  <div class="toolbar">
+    <a
+      class="button"
+      href="{{ metrics_endpoint }}"
+      hx-get="{{ metrics_endpoint }}"
+      hx-target="#metrics-panel"
+      hx-swap="outerHTML"
+      >Refresh metrics</a
+    >
+    <a class="button secondary" href="/health">Health</a>
+  </div>
+</section>
 
-      <section
-        id="metrics-shell"
-        hx-get="{{ metrics_endpoint }}"
-        hx-target="this"
-        hx-trigger="load, every 15s"
-        hx-swap="outerHTML"
-      >
-        {% include "partials/metrics.html" %}
-      </section>
+<section
+  id="metrics-shell"
+  hx-get="{{ metrics_endpoint }}"
+  hx-target="this"
+  hx-trigger="load, every 15s"
+  hx-swap="outerHTML"
+>
+  {% include "partials/metrics.html" %}
+</section>
 
-      <section
-        id="overview-shell"
-        hx-get="{{ overview_endpoint }}"
-        hx-target="this"
-        hx-trigger="load, every 10s"
-        hx-swap="outerHTML"
-      >
-        {% include "partials/overview.html" %}
-      </section>
+<section
+  id="overview-shell"
+  hx-get="{{ overview_endpoint }}"
+  hx-target="this"
+  hx-trigger="load, every 10s"
+  hx-swap="outerHTML"
+>
+  {% include "partials/overview.html" %}
+</section>
 
-      <section
-        id="controls-shell"
-        hx-get="{{ controls_endpoint }}"
-        hx-target="this"
-        hx-trigger="load, every 20s"
-        hx-swap="outerHTML"
-      >
-        {% include "partials/controls.html" %}
-      </section>
+<section
+  id="controls-shell"
+  hx-get="{{ controls_endpoint }}"
+  hx-target="this"
+  hx-trigger="load, every 20s"
+  hx-swap="outerHTML"
+>
+  {% include "partials/controls.html" %}
+</section>
 
-      <section
-        id="charts-shell"
-        hx-get="{{ charts_endpoint }}"
-        hx-target="this"
-        hx-trigger="load, every 30s"
-        hx-swap="outerHTML"
-      >
-        {% include "partials/charts.html" %}
-      </section>
+<section
+  id="charts-shell"
+  hx-get="{{ charts_endpoint }}"
+  hx-target="this"
+  hx-trigger="load, every 30s"
+  hx-swap="outerHTML"
+>
+  {% include "partials/charts.html" %}
+</section>
+{% endblock %} {% block scripts %}
+<script>
+  window.arbitradeRenderCharts = (payload) => {
+    const chartHost = document.getElementById("opportunity-chart");
+    if (!chartHost || typeof Chart === "undefined") {
+      return;
+    }
 
-      <script>
-        window.arbitradeRenderCharts = (payload) => {
-          const chartHost = document.getElementById("opportunity-chart");
-          if (!chartHost || typeof Chart === "undefined") {
-            return;
-          }
+    const existing = Chart.getChart(chartHost);
+    if (existing) {
+      existing.destroy();
+    }
 
-          const existing = Chart.getChart(chartHost);
-          if (existing) {
-            existing.destroy();
-          }
+    const data = JSON.parse(payload);
+    if (!data.has_chart_data) {
+      return;
+    }
 
-          const data = JSON.parse(payload);
-          if (!data.has_chart_data) {
-            return;
-          }
-
-          new Chart(chartHost, {
-            type: "line",
-            data: {
-              labels: data.labels,
-              datasets: [
-                {
-                  label: "Net %",
-                  data: data.net_pct_values,
-                  borderColor: "#2d6cdf",
-                  backgroundColor: "rgba(45, 108, 223, 0.18)",
-                  tension: 0.3,
-                  fill: true,
-                  yAxisID: "y",
-                },
-                {
-                  label: "Est profit USD",
-                  data: data.est_profit_values,
-                  borderColor: "#52c41a",
-                  backgroundColor: "rgba(82, 196, 26, 0.12)",
-                  tension: 0.3,
-                  fill: false,
-                  yAxisID: "y1",
-                },
-              ],
+    new Chart(chartHost, {
+      type: "line",
+      data: {
+        labels: data.labels,
+        datasets: [
+          {
+            label: "Net %",
+            data: data.net_pct_values,
+            borderColor: "#2d6cdf",
+            backgroundColor: "rgba(45, 108, 223, 0.18)",
+            tension: 0.3,
+            fill: true,
+            yAxisID: "y",
+          },
+          {
+            label: "Est profit USD",
+            data: data.est_profit_values,
+            borderColor: "#52c41a",
+            backgroundColor: "rgba(82, 196, 26, 0.12)",
+            tension: 0.3,
+            fill: false,
+            yAxisID: "y1",
+          },
+        ],
+      },
+      options: {
+        responsive: true,
+        maintainAspectRatio: false,
+        interaction: {
+          mode: "index",
+          intersect: false,
+        },
+        plugins: {
+          legend: {
+            labels: {
+              color: "#e5eefb",
             },
-            options: {
-              responsive: true,
-              maintainAspectRatio: false,
-              interaction: {
-                mode: "index",
-                intersect: false,
-              },
-              plugins: {
-                legend: {
-                  labels: {
-                    color: "#e5eefb",
-                  },
-                },
-              },
-              scales: {
-                x: {
-                  ticks: {
-                    color: "#9fb2d0",
-                    maxRotation: 0,
-                    autoSkip: true,
-                  },
-                  grid: {
-                    color: "rgba(255, 255, 255, 0.06)",
-                  },
-                },
-                y: {
-                  position: "left",
-                  ticks: {
-                    color: "#9fb2d0",
-                  },
-                  grid: {
-                    color: "rgba(255, 255, 255, 0.06)",
-                  },
-                },
-                y1: {
-                  position: "right",
-                  ticks: {
-                    color: "#9fb2d0",
-                  },
-                  grid: {
-                    drawOnChartArea: false,
-                  },
-                },
-              },
+          },
+        },
+        scales: {
+          x: {
+            ticks: {
+              color: "#9fb2d0",
+              maxRotation: 0,
+              autoSkip: true,
             },
-          });
-        };
+            grid: {
+              color: "rgba(255, 255, 255, 0.06)",
+            },
+          },
+          y: {
+            position: "left",
+            ticks: {
+              color: "#9fb2d0",
+            },
+            grid: {
+              color: "rgba(255, 255, 255, 0.06)",
+            },
+          },
+          y1: {
+            position: "right",
+            ticks: {
+              color: "#9fb2d0",
+            },
+            grid: {
+              drawOnChartArea: false,
+            },
+          },
+        },
+      },
+    });
+  };
 
-        const stream = new EventSource("{{ stream_endpoint }}");
-        stream.addEventListener("metrics", (event) => {
-          const panel = document.getElementById("metrics-panel");
-          if (panel) {
-            panel.outerHTML = JSON.parse(event.data);
-          }
-        });
-        const overviewStream = new EventSource(
-          "{{ overview_stream_endpoint }}",
-        );
-        overviewStream.addEventListener("overview", (event) => {
-          const panel = document.getElementById("overview-panel");
-          if (panel) {
-            panel.outerHTML = JSON.parse(event.data);
-          }
-        });
-      </script>
-    </main>
-  </body>
-</html>
+  const stream = new EventSource("{{ stream_endpoint }}");
+  stream.addEventListener("metrics", (event) => {
+    const panel = document.getElementById("metrics-panel");
+    if (panel) {
+      panel.outerHTML = JSON.parse(event.data);
+    }
+  });
+  const overviewStream = new EventSource("{{ overview_stream_endpoint }}");
+  overviewStream.addEventListener("overview", (event) => {
+    const panel = document.getElementById("overview-panel");
+    if (panel) {
+      panel.outerHTML = JSON.parse(event.data);
+    }
+  });
+</script>
+{% endblock %}
