diff --git a/src/pobsync_backend/templates/pobsync_backend/base.html b/src/pobsync_backend/templates/pobsync_backend/base.html
index a54e024..0d321f5 100644
--- a/src/pobsync_backend/templates/pobsync_backend/base.html
+++ b/src/pobsync_backend/templates/pobsync_backend/base.html
@@ -1,118 +1,261 @@
 <!doctype html>
 <html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>{% block title %}pobsync{% endblock %}</title>
-  <style>
-    :root {
-      color-scheme: light;
-      --bg: #f5f7fa;
-      --panel: #ffffff;
-      --border: #d9e0e8;
-      --text: #17202a;
-      --muted: #657386;
-      --link: #0b5cad;
-      --success: #176b3a;
-      --failed: #a12828;
-      --running: #8a5a00;
-    }
-    * { box-sizing: border-box; }
-    body {
-      margin: 0;
-      background: var(--bg);
-      color: var(--text);
-      font: 14px/1.45 system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
-    }
-    a { color: var(--link); text-decoration: none; }
-    a:hover { text-decoration: underline; }
-    header {
-      background: var(--panel);
-      border-bottom: 1px solid var(--border);
-      padding: 14px 24px;
-    }
-    nav {
-      display: flex;
-      align-items: center;
-      gap: 18px;
-      max-width: 1180px;
-      margin: 0 auto;
-    }
-    nav strong { font-size: 16px; }
-    nav .spacer { flex: 1; }
-    main {
-      max-width: 1180px;
-      margin: 0 auto;
-      padding: 24px;
-    }
-    h1 { font-size: 26px; margin: 0 0 18px; }
-    h2 { font-size: 18px; margin: 0 0 12px; }
-    .grid {
-      display: grid;
-      grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
-      gap: 12px;
-      margin-bottom: 22px;
-    }
-    .metric, .panel {
-      background: var(--panel);
-      border: 1px solid var(--border);
-      border-radius: 8px;
-    }
-    .metric { padding: 14px; }
-    .metric .label { color: var(--muted); font-size: 12px; text-transform: uppercase; }
-    .metric .value { font-size: 26px; font-weight: 650; margin-top: 4px; }
-    .metric.failed { border-color: #e8b4b4; background: #fff7f7; }
-    .metric.warning { border-color: #e7cf8a; background: #fffaf0; }
-    .metric.running { border-color: #e7cf8a; background: #fffaf0; }
-    .metric.queued { border-color: #b5cdea; background: #eef6ff; }
-    .panel { padding: 16px; margin-bottom: 18px; overflow: auto; }
-    .panel.highlight { border-left: 4px solid var(--border); }
-    .panel.highlight.failed { border-left-color: var(--failed); background: #fff7f7; }
-    .panel.highlight.warning { border-left-color: var(--running); background: #fffaf0; }
-    .panel.highlight.success { border-left-color: var(--success); background: #f5fbf7; }
-    table { width: 100%; border-collapse: collapse; min-width: 640px; }
-    th, td { border-bottom: 1px solid var(--border); padding: 9px 8px; text-align: left; vertical-align: top; }
-    th { color: var(--muted); font-size: 12px; font-weight: 650; text-transform: uppercase; }
-    tr:last-child td { border-bottom: 0; }
-    .muted { color: var(--muted); }
-    .status {
-      display: inline-block;
-      border: 1px solid var(--border);
-      border-radius: 999px;
-      padding: 2px 8px;
-      white-space: nowrap;
-    }
+	<head>
+	  <meta charset="utf-8">
+	  <meta name="viewport" content="width=device-width, initial-scale=1">
+	  <title>{% block title %}pobsync{% endblock %}</title>
+	  <style>
+	    :root {
+	      color-scheme: light;
+	      --bg: #f2f5f8;
+	      --bg-soft: #f8fafc;
+	      --panel: #ffffff;
+	      --panel-subtle: #fbfcfe;
+	      --border: #d8e1eb;
+	      --border-strong: #c7d2df;
+	      --text: #121a24;
+	      --muted: #65758a;
+	      --muted-strong: #46566a;
+	      --link: #075fae;
+	      --link-strong: #064b89;
+	      --success: #17633a;
+	      --failed: #a73333;
+	      --running: #8a5a00;
+	      --queued: #075fae;
+	      --shadow-sm: 0 1px 2px rgba(18, 26, 36, 0.05);
+	      --shadow-md: 0 10px 28px rgba(18, 26, 36, 0.08);
+	      --radius: 8px;
+	    }
+	    * { box-sizing: border-box; }
+	    body {
+	      margin: 0;
+	      background: var(--bg);
+	      color: var(--text);
+	      font: 14px/1.5 system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+	    }
+	    a { color: var(--link); font-weight: 560; text-decoration: none; }
+	    a:hover { text-decoration: underline; }
+	    a:focus-visible,
+	    button:focus-visible,
+	    input:focus-visible,
+	    select:focus-visible,
+	    textarea:focus-visible {
+	      outline: 3px solid rgba(7, 95, 174, 0.24);
+	      outline-offset: 2px;
+	    }
+	    body > header {
+	      background: var(--panel);
+	      border-bottom: 1px solid var(--border);
+	      box-shadow: var(--shadow-sm);
+	      padding: 0 24px;
+	      position: sticky;
+	      top: 0;
+	      z-index: 20;
+	    }
+	    nav {
+	      display: flex;
+	      align-items: center;
+	      gap: 6px;
+	      max-width: 1180px;
+	      margin: 0 auto;
+	      min-height: 48px;
+	    }
+	    nav strong {
+	      font-size: 16px;
+	      margin-right: 10px;
+	    }
+	    nav a {
+	      border-radius: 6px;
+	      color: var(--muted-strong);
+	      padding: 6px 8px;
+	    }
+	    nav a:hover {
+	      background: var(--bg-soft);
+	      color: var(--link-strong);
+	      text-decoration: none;
+	    }
+	    nav strong a {
+	      color: var(--link-strong);
+	      font-weight: 750;
+	      padding-left: 0;
+	    }
+	    nav strong a:hover { background: transparent; }
+	    nav .spacer { flex: 1; }
+	    main {
+	      max-width: 1180px;
+	      margin: 0 auto;
+	      padding: 28px 24px 42px;
+	    }
+	    h1 {
+	      font-size: clamp(28px, 3vw, 36px);
+	      letter-spacing: 0;
+	      line-height: 1.15;
+	      margin: 0 0 18px;
+	    }
+	    h2 {
+	      font-size: 18px;
+	      letter-spacing: 0;
+	      line-height: 1.25;
+	      margin: 0 0 14px;
+	    }
+	    h3 {
+	      font-size: 15px;
+	      letter-spacing: 0;
+	      margin: 16px 0 8px;
+	    }
+	    p { margin: 0 0 12px; }
+	    p:last-child { margin-bottom: 0; }
+	    .page-header {
+	      align-items: end;
+	      display: flex;
+	      gap: 18px;
+	      justify-content: space-between;
+	      margin-bottom: 20px;
+	    }
+	    .page-title {
+	      display: grid;
+	      gap: 5px;
+	      min-width: 0;
+	    }
+	    .page-title h1 { margin-bottom: 0; overflow-wrap: anywhere; }
+	    .page-kicker {
+	      color: var(--muted);
+	      font-size: 12px;
+	      font-weight: 750;
+	      letter-spacing: 0.05em;
+	      text-transform: uppercase;
+	    }
+	    .page-subtitle {
+	      color: var(--muted);
+	      max-width: 760px;
+	    }
+	    .page-header .actions {
+	      flex: 0 0 auto;
+	      justify-content: flex-end;
+	      margin-bottom: 0;
+	    }
+	    .grid {
+	      display: grid;
+	      grid-template-columns: repeat(auto-fit, minmax(170px, 1fr));
+	      gap: 12px;
+	      margin-bottom: 20px;
+	    }
+	    .metric, .panel {
+	      background: var(--panel);
+	      border: 1px solid var(--border);
+	      border-radius: var(--radius);
+	      box-shadow: var(--shadow-sm);
+	    }
+	    .metric {
+	      min-height: 88px;
+	      padding: 14px 15px;
+	    }
+	    .metric .label {
+	      color: var(--muted);
+	      font-size: 11px;
+	      font-weight: 700;
+	      letter-spacing: 0.04em;
+	      text-transform: uppercase;
+	    }
+	    .metric .value {
+	      font-size: 27px;
+	      font-weight: 760;
+	      line-height: 1.15;
+	      margin-top: 6px;
+	      overflow-wrap: anywhere;
+	    }
+	    .metric.failed { border-color: #e8b4b4; background: #fff7f7; }
+	    .metric.warning { border-color: #e7cf8a; background: #fffaf0; }
+	    .metric.running { border-color: #e7cf8a; background: #fffaf0; }
+	    .metric.queued { border-color: #b5cdea; background: #eef6ff; }
+	    .panel {
+	      margin-bottom: 18px;
+	      overflow: auto;
+	      padding: 18px;
+	    }
+	    .panel > h2:first-child {
+	      align-items: center;
+	      display: flex;
+	      gap: 10px;
+	      justify-content: space-between;
+	    }
+	    .panel.highlight { border-left: 4px solid var(--border); }
+	    .panel.highlight.failed { border-left-color: var(--failed); background: #fff7f7; }
+	    .panel.highlight.warning { border-left-color: var(--running); background: #fffaf0; }
+	    .panel.highlight.success { border-left-color: var(--success); background: #f5fbf7; }
+	    table {
+	      border-collapse: collapse;
+	      min-width: 640px;
+	      width: 100%;
+	    }
+	    th, td {
+	      border-bottom: 1px solid var(--border);
+	      padding: 10px 9px;
+	      text-align: left;
+	      vertical-align: top;
+	    }
+	    th {
+	      background: var(--panel-subtle);
+	      color: var(--muted);
+	      font-size: 11px;
+	      font-weight: 750;
+	      letter-spacing: 0.04em;
+	      text-transform: uppercase;
+	    }
+	    tbody tr:hover td { background: #f9fbfd; }
+	    tr:last-child td { border-bottom: 0; }
+	    .muted { color: var(--muted); }
+	    .status {
+	      display: inline-block;
+	      border: 1px solid var(--border);
+	      border-radius: 999px;
+	      font-size: 12px;
+	      font-weight: 700;
+	      line-height: 1.35;
+	      padding: 3px 8px;
+	      white-space: nowrap;
+	    }
     .status.success { color: var(--success); border-color: #a7d8b9; background: #edf8f1; }
     .status.ok { color: var(--success); border-color: #a7d8b9; background: #edf8f1; }
     .status.failed { color: var(--failed); border-color: #e8b4b4; background: #fff0f0; }
     .status.blocked { color: var(--failed); border-color: #e8b4b4; background: #fff0f0; }
     .status.running { color: var(--running); border-color: #e7cf8a; background: #fff8df; }
     .status.warning { color: var(--running); border-color: #e7cf8a; background: #fff8df; }
-    .status.queued { color: var(--link); border-color: #b5cdea; background: #eef6ff; }
-    .status.skipped { color: var(--muted); background: #f7f9fb; }
-    .stack { display: grid; gap: 4px; }
-    .stack.spaced { margin-bottom: 14px; }
-    .two-col { display: grid; gap: 18px; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); }
-    .actions { display: flex; flex-wrap: wrap; gap: 10px; margin: 0 0 18px; }
-    .actions.inline { margin: 12px 0 0; }
-    button, .button-link {
-      appearance: none;
-      background: #17202a;
-      border: 1px solid #17202a;
-      border-radius: 6px;
-      color: #fff;
-      cursor: pointer;
-      font: inherit;
-      font-weight: 650;
-      padding: 8px 12px;
-    }
-    button:hover, .button-link:hover { background: #2a394a; text-decoration: none; }
-    button.secondary,
-    .button-link.secondary {
-      background: #fff;
-      border-color: var(--border);
-      color: var(--text);
-    }
+	    .status.queued { color: var(--queued); border-color: #b5cdea; background: #eef6ff; }
+	    .status.skipped { color: var(--muted); background: #f7f9fb; }
+	    .stack { display: grid; gap: 5px; }
+	    .stack.spaced { margin-bottom: 14px; }
+	    .two-col { display: grid; gap: 18px; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); }
+	    .actions {
+	      align-items: center;
+	      display: flex;
+	      flex-wrap: wrap;
+	      gap: 10px;
+	      margin: 0 0 20px;
+	    }
+	    .actions.inline { margin: 12px 0 0; }
+	    button, .button-link {
+	      appearance: none;
+	      background: var(--text);
+	      border: 1px solid var(--text);
+	      border-radius: 6px;
+	      color: #fff;
+	      cursor: pointer;
+	      font: inherit;
+	      font-weight: 700;
+	      line-height: 1.25;
+	      padding: 8px 13px;
+	    }
+	    button:hover, .button-link:hover {
+	      background: #273343;
+	      text-decoration: none;
+	    }
+	    button.secondary,
+	    .button-link.secondary {
+	      background: #fff;
+	      border-color: var(--border-strong);
+	      color: var(--text);
+	    }
     button.secondary:hover,
     .button-link.secondary:hover { background: #eef3f8; }
     button:disabled {
@@ -126,24 +269,24 @@
       display: grid;
       gap: 8px;
     }
-    .status-summary {
-      align-items: center;
-      border: 1px solid var(--border);
-      border-radius: 6px;
-      display: flex;
-      flex-wrap: wrap;
-      gap: 8px;
-      padding: 10px;
-    }
+	    .status-summary {
+	      align-items: center;
+	      border: 1px solid var(--border);
+	      border-radius: var(--radius);
+	      display: flex;
+	      flex-wrap: wrap;
+	      gap: 8px;
+	      padding: 11px 12px;
+	    }
     .status-summary.failed { border-color: #e8b4b4; background: #fff7f7; color: var(--failed); }
     .status-summary.warning,
     .status-summary.running { border-color: #e7cf8a; background: #fffaf0; color: var(--running); }
     .status-summary.queued { border-color: #b5cdea; background: #eef6ff; color: var(--link); }
-    .operator-state {
-      align-items: center;
-      display: flex;
-      flex-wrap: wrap;
-      gap: 8px;
+	    .operator-state {
+	      align-items: center;
+	      display: flex;
+	      flex-wrap: wrap;
+	      gap: 8px;
       margin-bottom: 14px;
     }
     .trend-bars {
@@ -170,10 +313,10 @@
       font-size: 12px;
       gap: 10px;
     }
-    .insight-grid {
-      display: grid;
-      gap: 18px 24px;
-      grid-template-columns: minmax(260px, 1.3fr) repeat(auto-fit, minmax(180px, 1fr));
+	    .insight-grid {
+	      display: grid;
+	      gap: 18px 24px;
+	      grid-template-columns: minmax(260px, 1.3fr) repeat(auto-fit, minmax(180px, 1fr));
     }
     .insight-main,
     .insight-item {
@@ -188,12 +331,12 @@
       font-weight: 650;
       text-transform: uppercase;
     }
-    .insight-main .value,
-    .insight-item .value {
-      font-size: 22px;
-      font-weight: 650;
-      overflow-wrap: anywhere;
-    }
+	    .insight-main .value,
+	    .insight-item .value {
+	      font-size: 22px;
+	      font-weight: 760;
+	      overflow-wrap: anywhere;
+	    }
     .storage-meter {
       background: #edf2f7;
       border-radius: 999px;
@@ -211,11 +354,16 @@
       display: grid;
       gap: 12px;
     }
-    .host-card {
-      border: 1px solid var(--border);
-      border-radius: 8px;
-      padding: 16px;
-    }
+	    .host-card {
+	      border: 1px solid var(--border);
+	      border-radius: var(--radius);
+	      box-shadow: var(--shadow-sm);
+	      padding: 16px;
+	    }
+	    .host-card:hover {
+	      border-color: var(--border-strong);
+	      box-shadow: var(--shadow-md);
+	    }
     .host-card-header {
       align-items: start;
       display: flex;
@@ -228,11 +376,11 @@
       gap: 3px;
       min-width: 0;
     }
-    .host-card-title a {
-      font-size: 17px;
-      font-weight: 650;
-      overflow-wrap: anywhere;
-    }
+	    .host-card-title a {
+	      font-size: 17px;
+	      font-weight: 750;
+	      overflow-wrap: anywhere;
+	    }
     .host-card-status {
       display: flex;
       flex: 0 1 auto;
@@ -263,14 +411,16 @@
       gap: 16px 22px;
       grid-template-columns: repeat(auto-fit, minmax(210px, 1fr));
     }
-    .host-card-stats {
-      align-content: start;
-      display: grid;
-      border-top: 1px solid #e6edf4;
-      gap: 12px 18px;
-      grid-template-columns: repeat(2, minmax(0, 1fr));
-      padding-top: 12px;
-    }
+	    .host-card-stats {
+	      align-content: start;
+	      display: grid;
+	      background: var(--bg-soft);
+	      border: 1px solid #e6edf4;
+	      border-radius: var(--radius);
+	      gap: 12px 18px;
+	      grid-template-columns: repeat(2, minmax(0, 1fr));
+	      padding: 12px;
+	    }
     .host-card-item {
       display: grid;
       gap: 3px;
@@ -296,11 +446,11 @@
       font-weight: 650;
       text-transform: uppercase;
     }
-    .host-card-stat .value {
-      font-size: 16px;
-      font-weight: 650;
-      overflow-wrap: anywhere;
-    }
+	    .host-card-stat .value {
+	      font-size: 16px;
+	      font-weight: 750;
+	      overflow-wrap: anywhere;
+	    }
     .host-card-stat.wide {
       grid-column: 1 / -1;
     }
@@ -316,32 +466,38 @@
       padding: 10px;
     }
     .messages { display: grid; gap: 8px; margin-bottom: 18px; }
-    .message {
-      background: var(--panel);
-      border: 1px solid var(--border);
-      border-radius: 8px;
-      padding: 10px 12px;
-    }
-    .message.success { border-color: #a7d8b9; background: #edf8f1; color: var(--success); }
-    .message.error { border-color: #e8b4b4; background: #fff0f0; color: var(--failed); }
-    .message.warning { border-color: #e7cf8a; background: #fff8df; color: var(--running); }
-    .form-grid { display: grid; gap: 14px; max-width: 680px; }
-    .field { display: grid; gap: 5px; }
-    .field label { font-weight: 650; }
-    .field input[type="text"], .field input[type="number"], .field select, .field textarea {
-      border: 1px solid var(--border);
-      border-radius: 6px;
-      font: inherit;
-      padding: 8px 10px;
-      width: 100%;
-    }
-    .field textarea { min-height: 92px; resize: vertical; }
-    .field .helptext { color: var(--muted); font-size: 12px; }
+	    .message {
+	      background: var(--panel);
+	      border: 1px solid var(--border);
+	      border-radius: var(--radius);
+	      padding: 10px 12px;
+	    }
+	    .message.success { border-color: #a7d8b9; background: #edf8f1; color: var(--success); }
+	    .message.error { border-color: #e8b4b4; background: #fff0f0; color: var(--failed); }
+	    .message.warning { border-color: #e7cf8a; background: #fff8df; color: var(--running); }
+	    .form-grid { display: grid; gap: 15px; max-width: 720px; }
+	    .field { display: grid; gap: 6px; }
+	    .field label { font-weight: 700; }
+	    .field input[type="text"], .field input[type="number"], .field select, .field textarea {
+	      border: 1px solid var(--border);
+	      border-radius: 6px;
+	      font: inherit;
+	      padding: 9px 10px;
+	      width: 100%;
+	    }
+	    .field input[type="text"]:focus,
+	    .field input[type="number"]:focus,
+	    .field select:focus,
+	    .field textarea:focus {
+	      border-color: #8bb9e3;
+	    }
+	    .field textarea { min-height: 92px; resize: vertical; }
+	    .field .helptext { color: var(--muted); font-size: 12px; }
     .field input[type="checkbox"] { justify-self: start; }
-    pre {
-      background: #101820;
-      border-radius: 6px;
-      color: #edf4fb;
+	    pre {
+	      background: #101820;
+	      border-radius: var(--radius);
+	      color: #edf4fb;
       line-height: 1.5;
       margin: 0;
       overflow: auto;
@@ -355,11 +511,24 @@
       margin: 0;
       padding: 0;
     }
-    @media (max-width: 800px) {
-      main { padding: 16px; }
-      nav { padding: 0; }
-      .two-col { grid-template-columns: 1fr; }
-      .host-card-header { display: grid; }
+	    @media (max-width: 800px) {
+	      body > header { padding: 0 14px; position: static; }
+	      main { padding: 18px 14px 32px; }
+	      nav {
+	        align-items: flex-start;
+	        flex-wrap: wrap;
+	        gap: 4px;
+	        padding: 8px 0;
+	      }
+	      nav strong { flex-basis: 100%; margin-right: 0; }
+	      nav .spacer { display: none; }
+	      .page-header {
+	        align-items: stretch;
+	        display: grid;
+	      }
+	      .page-header .actions { justify-content: flex-start; }
+	      .two-col { grid-template-columns: 1fr; }
+	      .host-card-header { display: grid; }
       .host-card-status { justify-content: flex-start; max-width: none; }
       .host-card-layout { grid-template-columns: 1fr; }
       .host-card-stats { grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); }
diff --git a/src/pobsync_backend/templates/pobsync_backend/changelog.html b/src/pobsync_backend/templates/pobsync_backend/changelog.html
index 0e5b38a..719f846 100644
--- a/src/pobsync_backend/templates/pobsync_backend/changelog.html
+++ b/src/pobsync_backend/templates/pobsync_backend/changelog.html
@@ -3,11 +3,16 @@
 {% block title %}Changelog - pobsync{% endblock %}
 
 {% block content %}
-  <h1>Changelog</h1>
-
-  <section class="actions" aria-label="Changelog actions">
-    <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Release notes</div>
+      <h1>Changelog</h1>
+      <div class="page-subtitle">Installed release notes rendered from the repository changelog.</div>
+    </div>
+    <section class="actions" aria-label="Changelog actions">
+      <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
+    </section>
+  </header>
 
   <section class="panel">
     <div class="stack spaced">
diff --git a/src/pobsync_backend/templates/pobsync_backend/dashboard.html b/src/pobsync_backend/templates/pobsync_backend/dashboard.html
index b6067fb..358fd72 100644
--- a/src/pobsync_backend/templates/pobsync_backend/dashboard.html
+++ b/src/pobsync_backend/templates/pobsync_backend/dashboard.html
@@ -3,12 +3,17 @@
 {% block title %}pobsync dashboard{% endblock %}
 
 {% block content %}
-  <h1>Dashboard</h1>
-
-  <section class="actions" aria-label="Dashboard actions">
-    <a class="button-link" href="{% url 'create_host_config' %}">New host</a>
-    <a class="button-link secondary" href="{% url 'edit_global_config' %}">{% if global_config %}Edit global config{% else %}Create global config{% endif %}</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Control panel</div>
+      <h1>Dashboard</h1>
+      <div class="page-subtitle">Backup health, required action, storage pressure, and recent activity in one place.</div>
+    </div>
+    <section class="actions" aria-label="Dashboard actions">
+      <a class="button-link" href="{% url 'create_host_config' %}">New host</a>
+      <a class="button-link secondary" href="{% url 'edit_global_config' %}">{% if global_config %}Edit global config{% else %}Create global config{% endif %}</a>
+    </section>
+  </header>
 
   {% if not global_config or not counts.hosts %}
     <section class="panel">
diff --git a/src/pobsync_backend/templates/pobsync_backend/global_form.html b/src/pobsync_backend/templates/pobsync_backend/global_form.html
index 135f8cd..98fe535 100644
--- a/src/pobsync_backend/templates/pobsync_backend/global_form.html
+++ b/src/pobsync_backend/templates/pobsync_backend/global_form.html
@@ -3,11 +3,16 @@
 {% block title %}Global Config{% endblock %}
 
 {% block content %}
-  <h1>{% if global_config %}Global Config{% else %}Create Global Config{% endif %}</h1>
-
-  <section class="actions" aria-label="Global config actions">
-    <a class="button-link" href="{% url 'dashboard' %}">Back to dashboard</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Configuration</div>
+      <h1>{% if global_config %}Global Config{% else %}Create Global Config{% endif %}</h1>
+      <div class="page-subtitle">Defaults used by hosts unless a host overrides them explicitly.</div>
+    </div>
+    <section class="actions" aria-label="Global config actions">
+      <a class="button-link" href="{% url 'dashboard' %}">Back to dashboard</a>
+    </section>
+  </header>
 
   <section class="panel">
     <h2>{% if global_config %}Edit Global Config{% else %}Create Global Config{% endif %}</h2>
diff --git a/src/pobsync_backend/templates/pobsync_backend/host_detail.html b/src/pobsync_backend/templates/pobsync_backend/host_detail.html
index ae530e2..60bbae8 100644
--- a/src/pobsync_backend/templates/pobsync_backend/host_detail.html
+++ b/src/pobsync_backend/templates/pobsync_backend/host_detail.html
@@ -3,29 +3,34 @@
 {% block title %}{{ host.host }} | pobsync{% endblock %}
 
 {% block content %}
-  <h1>{{ host.host }}</h1>
-
-  <section class="actions" aria-label="Host actions">
-    <a class="button-link" href="{% url 'edit_host_config' host.host %}">Edit config</a>
-    <form method="post" action="{% url 'discover_host_snapshots' host.host %}">
-      {% csrf_token %}
-      <button type="submit">Discover snapshots</button>
-    </form>
-    <a class="button-link" href="{% url 'host_retention_plan' host.host %}">Plan retention</a>
-    <a class="button-link" href="{% url 'edit_host_schedule' host.host %}">Edit schedule</a>
-    <form method="post" action="{% url 'prepare_host_directories' host.host %}">
-      {% csrf_token %}
-      <button type="submit" class="secondary">Prepare directories</button>
-    </form>
-    <form method="post" action="{% url 'scan_host_known_key' host.host %}">
-      {% csrf_token %}
-      <button type="submit" class="secondary">Scan SSH host key</button>
-    </form>
-    <form method="post" action="{% url 'run_host_preflight' host.host %}">
-      {% csrf_token %}
-      <button type="submit" class="secondary">Run connection preflight</button>
-    </form>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Host</div>
+      <h1>{{ host.host }}</h1>
+      <div class="page-subtitle">{{ host.address }} · {{ host.enabled|yesno:"enabled,disabled" }}</div>
+    </div>
+    <section class="actions" aria-label="Host actions">
+      <a class="button-link" href="{% url 'edit_host_config' host.host %}">Edit config</a>
+      <form method="post" action="{% url 'discover_host_snapshots' host.host %}">
+        {% csrf_token %}
+        <button type="submit">Discover snapshots</button>
+      </form>
+      <a class="button-link" href="{% url 'host_retention_plan' host.host %}">Plan retention</a>
+      <a class="button-link" href="{% url 'edit_host_schedule' host.host %}">Edit schedule</a>
+      <form method="post" action="{% url 'prepare_host_directories' host.host %}">
+        {% csrf_token %}
+        <button type="submit" class="secondary">Prepare directories</button>
+      </form>
+      <form method="post" action="{% url 'scan_host_known_key' host.host %}">
+        {% csrf_token %}
+        <button type="submit" class="secondary">Scan SSH host key</button>
+      </form>
+      <form method="post" action="{% url 'run_host_preflight' host.host %}">
+        {% csrf_token %}
+        <button type="submit" class="secondary">Run connection preflight</button>
+      </form>
+    </section>
+  </header>
 
   <section class="grid" aria-label="Host summary">
     <div class="metric"><div class="label">Snapshots</div><div class="value">{{ counts.snapshots }}</div></div>
diff --git a/src/pobsync_backend/templates/pobsync_backend/host_form.html b/src/pobsync_backend/templates/pobsync_backend/host_form.html
index fa1b0e5..6847561 100644
--- a/src/pobsync_backend/templates/pobsync_backend/host_form.html
+++ b/src/pobsync_backend/templates/pobsync_backend/host_form.html
@@ -3,15 +3,20 @@
 {% block title %}{% if host %}Config | {{ host.host }}{% else %}New Host{% endif %}{% endblock %}
 
 {% block content %}
-  <h1>{% if host %}Config: {{ host.host }}{% else %}New Host{% endif %}</h1>
-
-  <section class="actions" aria-label="Config actions">
-    {% if host %}
-      <a class="button-link" href="{% url 'host_detail' host.host %}">Back to host</a>
-    {% else %}
-      <a class="button-link" href="{% url 'dashboard' %}">Back to dashboard</a>
-    {% endif %}
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Configuration</div>
+      <h1>{% if host %}Config: {{ host.host }}{% else %}New Host{% endif %}</h1>
+      <div class="page-subtitle">Host-specific backup, retention, SSH, include, and exclude settings.</div>
+    </div>
+    <section class="actions" aria-label="Config actions">
+      {% if host %}
+        <a class="button-link" href="{% url 'host_detail' host.host %}">Back to host</a>
+      {% else %}
+        <a class="button-link" href="{% url 'dashboard' %}">Back to dashboard</a>
+      {% endif %}
+    </section>
+  </header>
 
   <section class="panel">
     <h2>{% if host %}Edit Host Config{% else %}Create Host Config{% endif %}</h2>
diff --git a/src/pobsync_backend/templates/pobsync_backend/logs.html b/src/pobsync_backend/templates/pobsync_backend/logs.html
index 537fb3d..8eb57d2 100644
--- a/src/pobsync_backend/templates/pobsync_backend/logs.html
+++ b/src/pobsync_backend/templates/pobsync_backend/logs.html
@@ -3,11 +3,16 @@
 {% block title %}Logs | pobsync{% endblock %}
 
 {% block content %}
-  <h1>Logs</h1>
-
-  <section class="actions" aria-label="Log actions">
-    <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Operations</div>
+      <h1>Logs</h1>
+      <div class="page-subtitle">Filter pobsync service logs by unit, priority, host, run, or message content.</div>
+    </div>
+    <section class="actions" aria-label="Log actions">
+      <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
+    </section>
+  </header>
 
   <section class="panel">
     <h2>Filter</h2>
diff --git a/src/pobsync_backend/templates/pobsync_backend/purged_snapshots.html b/src/pobsync_backend/templates/pobsync_backend/purged_snapshots.html
index 8f54524..d6ed8ce 100644
--- a/src/pobsync_backend/templates/pobsync_backend/purged_snapshots.html
+++ b/src/pobsync_backend/templates/pobsync_backend/purged_snapshots.html
@@ -3,11 +3,16 @@
 {% block title %}Purged Snapshots | pobsync{% endblock %}
 
 {% block content %}
-  <h1>Purged Snapshots</h1>
-
-  <section class="actions" aria-label="Purged snapshot actions">
-    <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Retention</div>
+      <h1>Purged Snapshots</h1>
+      <div class="page-subtitle">Audit trail for snapshots removed by retention or manual purge actions.</div>
+    </div>
+    <section class="actions" aria-label="Purged snapshot actions">
+      <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
+    </section>
+  </header>
 
   <section class="panel">
     <h2>Filters</h2>
diff --git a/src/pobsync_backend/templates/pobsync_backend/retention_plan.html b/src/pobsync_backend/templates/pobsync_backend/retention_plan.html
index ba88c9c..c1547b8 100644
--- a/src/pobsync_backend/templates/pobsync_backend/retention_plan.html
+++ b/src/pobsync_backend/templates/pobsync_backend/retention_plan.html
@@ -3,15 +3,20 @@
 {% block title %}Retention plan | {{ host.host }}{% endblock %}
 
 {% block content %}
-  <h1>Retention Plan: {{ host.host }}</h1>
-
-  <section class="actions" aria-label="Retention filters">
-    <a class="button-link" href="{% url 'host_detail' host.host %}">Back to host</a>
-    <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind=scheduled">Scheduled</a>
-    <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind=manual">Manual</a>
-    <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind=all">All</a>
-    <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind={{ kind }}&protect_bases=1">Protect bases</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Retention</div>
+      <h1>{{ host.host }}</h1>
+      <div class="page-subtitle">Preview which snapshots stay, which would be deleted, and whether incomplete cleanup is needed.</div>
+    </div>
+    <section class="actions" aria-label="Retention filters">
+      <a class="button-link" href="{% url 'host_detail' host.host %}">Back to host</a>
+      <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind=scheduled">Scheduled</a>
+      <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind=manual">Manual</a>
+      <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind=all">All</a>
+      <a class="button-link" href="{% url 'host_retention_plan' host.host %}?kind={{ kind }}&protect_bases=1">Protect bases</a>
+    </section>
+  </header>
 
   <section class="grid" aria-label="Retention plan summary">
     <div class="metric"><div class="label">Kind</div><div class="value">{{ plan.kind }}</div></div>
diff --git a/src/pobsync_backend/templates/pobsync_backend/run_detail.html b/src/pobsync_backend/templates/pobsync_backend/run_detail.html
index 4fbf6aa..8f042f9 100644
--- a/src/pobsync_backend/templates/pobsync_backend/run_detail.html
+++ b/src/pobsync_backend/templates/pobsync_backend/run_detail.html
@@ -3,25 +3,30 @@
 {% block title %}Run {{ run.id }} | {{ run.host.host }}{% endblock %}
 
 {% block content %}
-  <h1>Run {{ run.id }}</h1>
-
-  <section class="actions" aria-label="Run actions">
-    <a class="button-link" href="{% url 'host_detail' run.host.host %}">Back to host</a>
-    {% if can_cancel %}
-      <form method="post" action="{% url 'cancel_run' run.id %}">
-        {% csrf_token %}
-        <button type="submit" class="secondary">Cancel run</button>
-      </form>
-    {% endif %}
-    {% if run.status == "failed" or run.status == "warning" %}
-      {% if not run.reviewed_at %}
-        <form method="post" action="{% url 'resolve_run_review' run.id %}">
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Backup run</div>
+      <h1>Run {{ run.id }}</h1>
+      <div class="page-subtitle">{{ run.host.host }} · {{ run.run_type }} · {{ run.status }}</div>
+    </div>
+    <section class="actions" aria-label="Run actions">
+      <a class="button-link" href="{% url 'host_detail' run.host.host %}">Back to host</a>
+      {% if can_cancel %}
+        <form method="post" action="{% url 'cancel_run' run.id %}">
           {% csrf_token %}
-          <button type="submit" class="secondary">Mark reviewed</button>
+          <button type="submit" class="secondary">Cancel run</button>
         </form>
       {% endif %}
-    {% endif %}
-  </section>
+      {% if run.status == "failed" or run.status == "warning" %}
+        {% if not run.reviewed_at %}
+          <form method="post" action="{% url 'resolve_run_review' run.id %}">
+            {% csrf_token %}
+            <button type="submit" class="secondary">Mark reviewed</button>
+          </form>
+        {% endif %}
+      {% endif %}
+    </section>
+  </header>
 
   <section class="grid" aria-label="Run summary">
     <div class="metric"><div class="label">Host</div><div class="value">{{ run.host.host }}</div></div>
diff --git a/src/pobsync_backend/templates/pobsync_backend/schedule_form.html b/src/pobsync_backend/templates/pobsync_backend/schedule_form.html
index cbe7f98..9aa7581 100644
--- a/src/pobsync_backend/templates/pobsync_backend/schedule_form.html
+++ b/src/pobsync_backend/templates/pobsync_backend/schedule_form.html
@@ -3,11 +3,16 @@
 {% block title %}Schedule | {{ host.host }}{% endblock %}
 
 {% block content %}
-  <h1>Schedule: {{ host.host }}</h1>
-
-  <section class="actions" aria-label="Schedule actions">
-    <a class="button-link" href="{% url 'host_detail' host.host %}">Back to host</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Schedule</div>
+      <h1>{{ host.host }}</h1>
+      <div class="page-subtitle">Automatic backup timing and scheduled prune behavior for this host.</div>
+    </div>
+    <section class="actions" aria-label="Schedule actions">
+      <a class="button-link" href="{% url 'host_detail' host.host %}">Back to host</a>
+    </section>
+  </header>
 
   <section class="panel">
     <h2>{% if schedule %}Edit Schedule{% else %}Create Schedule{% endif %}</h2>
diff --git a/src/pobsync_backend/templates/pobsync_backend/self_check.html b/src/pobsync_backend/templates/pobsync_backend/self_check.html
index 6bcb385..df294fe 100644
--- a/src/pobsync_backend/templates/pobsync_backend/self_check.html
+++ b/src/pobsync_backend/templates/pobsync_backend/self_check.html
@@ -3,11 +3,16 @@
 {% block title %}Self Check | pobsync{% endblock %}
 
 {% block content %}
-  <h1>Self Check</h1>
-
-  <section class="actions" aria-label="Self check actions">
-    <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Operations</div>
+      <h1>Self Check</h1>
+      <div class="page-subtitle">Runtime, filesystem, service, and configuration checks for this pobsync installation.</div>
+    </div>
+    <section class="actions" aria-label="Self check actions">
+      <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
+    </section>
+  </header>
 
   <section class="grid" aria-label="Self check summary">
     <div class="metric"><div class="label">OK</div><div class="value">{{ summary.ok }}</div></div>
diff --git a/src/pobsync_backend/templates/pobsync_backend/snapshot_detail.html b/src/pobsync_backend/templates/pobsync_backend/snapshot_detail.html
index c37b5ee..9520853 100644
--- a/src/pobsync_backend/templates/pobsync_backend/snapshot_detail.html
+++ b/src/pobsync_backend/templates/pobsync_backend/snapshot_detail.html
@@ -3,11 +3,16 @@
 {% block title %}Snapshot {{ snapshot.dirname }} | {{ snapshot.host.host }}{% endblock %}
 
 {% block content %}
-  <h1>{{ snapshot.dirname }}</h1>
-
-  <section class="actions" aria-label="Snapshot actions">
-    <a class="button-link" href="{% url 'host_detail' snapshot.host.host %}">Back to host</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Snapshot</div>
+      <h1>{{ snapshot.dirname }}</h1>
+      <div class="page-subtitle">{{ snapshot.host.host }} · {{ snapshot.kind }} · {{ snapshot.status }}</div>
+    </div>
+    <section class="actions" aria-label="Snapshot actions">
+      <a class="button-link" href="{% url 'host_detail' snapshot.host.host %}">Back to host</a>
+    </section>
+  </header>
 
   <section class="grid" aria-label="Snapshot summary">
     <div class="metric"><div class="label">Host</div><div class="value">{{ snapshot.host.host }}</div></div>
diff --git a/src/pobsync_backend/templates/pobsync_backend/ssh_credential_form.html b/src/pobsync_backend/templates/pobsync_backend/ssh_credential_form.html
index 543915d..092480f 100644
--- a/src/pobsync_backend/templates/pobsync_backend/ssh_credential_form.html
+++ b/src/pobsync_backend/templates/pobsync_backend/ssh_credential_form.html
@@ -3,11 +3,16 @@
 {% block title %}{% if credential %}SSH Key | {{ credential.name }}{% else %}New SSH Key{% endif %} | pobsync{% endblock %}
 
 {% block content %}
-  <h1>{% if credential %}SSH Key: {{ credential.name }}{% else %}New SSH Key{% endif %}</h1>
-
-  <section class="actions" aria-label="SSH key form actions">
-    <a class="button-link" href="{% url 'ssh_credentials' %}">Back to SSH keys</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Access</div>
+      <h1>{% if credential %}SSH Key: {{ credential.name }}{% else %}New SSH Key{% endif %}</h1>
+      <div class="page-subtitle">{% if credential %}Review key metadata, known hosts, and deletion safety for this credential.{% else %}Register an existing private key for use by pobsync backups.{% endif %}</div>
+    </div>
+    <section class="actions" aria-label="SSH key form actions">
+      <a class="button-link" href="{% url 'ssh_credentials' %}">Back to SSH keys</a>
+    </section>
+  </header>
 
   <section class="panel">
     <h2>{% if credential %}Edit SSH Credential{% else %}Create SSH Credential{% endif %}</h2>
diff --git a/src/pobsync_backend/templates/pobsync_backend/ssh_credential_generate.html b/src/pobsync_backend/templates/pobsync_backend/ssh_credential_generate.html
index 7d8b593..1b5933c 100644
--- a/src/pobsync_backend/templates/pobsync_backend/ssh_credential_generate.html
+++ b/src/pobsync_backend/templates/pobsync_backend/ssh_credential_generate.html
@@ -3,11 +3,16 @@
 {% block title %}Generate SSH Key | pobsync{% endblock %}
 
 {% block content %}
-  <h1>Generate SSH Key</h1>
-
-  <section class="actions" aria-label="SSH key form actions">
-    <a class="button-link" href="{% url 'ssh_credentials' %}">Back to SSH keys</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Access</div>
+      <h1>Generate SSH Key</h1>
+      <div class="page-subtitle">Create a pobsync-managed SSH key pair for one or more backup targets.</div>
+    </div>
+    <section class="actions" aria-label="SSH key form actions">
+      <a class="button-link" href="{% url 'ssh_credentials' %}">Back to SSH keys</a>
+    </section>
+  </header>
 
   <section class="panel">
     <h2>Create Key Pair</h2>
diff --git a/src/pobsync_backend/templates/pobsync_backend/ssh_credentials.html b/src/pobsync_backend/templates/pobsync_backend/ssh_credentials.html
index cc031a6..df15f37 100644
--- a/src/pobsync_backend/templates/pobsync_backend/ssh_credentials.html
+++ b/src/pobsync_backend/templates/pobsync_backend/ssh_credentials.html
@@ -3,13 +3,18 @@
 {% block title %}SSH Keys | pobsync{% endblock %}
 
 {% block content %}
-  <h1>SSH Keys</h1>
-
-  <section class="actions" aria-label="SSH key actions">
-    <a class="button-link" href="{% url 'generate_ssh_credential' %}">Generate SSH key</a>
-    <a class="button-link secondary" href="{% url 'create_ssh_credential' %}">Add existing key</a>
-    <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
-  </section>
+  <header class="page-header">
+    <div class="page-title">
+      <div class="page-kicker">Access</div>
+      <h1>SSH Keys</h1>
+      <div class="page-subtitle">Manage the key pairs pobsync uses to reach backup targets.</div>
+    </div>
+    <section class="actions" aria-label="SSH key actions">
+      <a class="button-link" href="{% url 'generate_ssh_credential' %}">Generate SSH key</a>
+      <a class="button-link secondary" href="{% url 'create_ssh_credential' %}">Add existing key</a>
+      <a class="button-link secondary" href="{% url 'dashboard' %}">Back to dashboard</a>
+    </section>
+  </header>
 
   <section class="panel">
     <h2>Credentials</h2>
diff --git a/src/pobsync_backend/tests/test_views.py b/src/pobsync_backend/tests/test_views.py
index a731ba5..510f77f 100644
--- a/src/pobsync_backend/tests/test_views.py
+++ b/src/pobsync_backend/tests/test_views.py
@@ -101,6 +101,8 @@ class ViewTests(TestCase):
         response = self.client.get(reverse("dashboard"))
 
         self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Control panel")
+        self.assertContains(response, "Backup health, required action, storage pressure, and recent activity in one place.")
         self.assertContains(response, "Dashboard")
         self.assertContains(response, "web-01")
         self.assertContains(response, "20260519-021500Z__ABCDEFGH")
@@ -293,6 +295,7 @@ class ViewTests(TestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "Self Check")
+        self.assertContains(response, "Runtime, filesystem, service, and configuration checks")
         self.assertContains(response, "Django debug")
         self.assertContains(response, "Database connection")
         self.assertContains(response, "State root")
@@ -327,6 +330,7 @@ class ViewTests(TestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "Logs")
+        self.assertContains(response, "Filter pobsync service logs")
         self.assertContains(response, "web-01 failed backup run 12")
         self.assertNotContains(response, "web-02 failed backup run 12")
         self.assertNotContains(response, "started")
@@ -356,6 +360,7 @@ class ViewTests(TestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "Purged Snapshots")
+        self.assertContains(response, "Audit trail for snapshots removed")
         self.assertContains(response, "20260518-021500Z__OLDSNAP")
         self.assertContains(response, "outside retention policy")
         self.assertContains(response, "Scheduled")
@@ -410,6 +415,7 @@ class ViewTests(TestCase):
             )
 
         self.assertRedirects(response, reverse("ssh_credentials"))
+        self.assertContains(response, "Manage the key pairs pobsync uses")
         self.assertContains(response, "SSH credential saved for backup-key.")
         self.assertContains(response, "backup-key")
         credential = SshCredential.objects.get(name="backup-key")
@@ -639,6 +645,7 @@ class ViewTests(TestCase):
         response = self.client.get(reverse("edit_global_config"))
 
         self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Defaults used by hosts unless a host overrides them")
         self.assertContains(response, f'value="{credential.id}" selected')
         self.assertContains(response, "--archive")
         self.assertContains(response, "/proc/***")
@@ -869,6 +876,8 @@ class ViewTests(TestCase):
         response = self.client.get(reverse("host_detail", args=[host.host]))
 
         self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Host")
+        self.assertContains(response, "web-01.example.test")
         self.assertContains(response, "Effective Config")
         self.assertContains(response, "Backup source:")
         self.assertNotContains(response, "Source root:")
@@ -1425,6 +1434,8 @@ class ViewTests(TestCase):
         response = self.client.get(reverse("run_detail", args=[run.id]))
 
         self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Backup run")
+        self.assertContains(response, "web-01")
         self.assertContains(response, "Failure")
         self.assertContains(response, "transport")
         self.assertContains(response, "Check network connectivity.")
@@ -1615,6 +1626,7 @@ class ViewTests(TestCase):
         response = self.client.get(reverse("snapshot_detail", args=[base.id]))
 
         self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Snapshot")
         self.assertContains(response, base.dirname)
         self.assertContains(response, "BASESNAP")
         self.assertContains(response, "Stats")
@@ -1697,7 +1709,9 @@ class ViewTests(TestCase):
         response = self.client.get(reverse("host_retention_plan", args=[host.host]))
 
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "Retention Plan: web-01")
+        self.assertContains(response, "Retention")
+        self.assertContains(response, "Preview which snapshots stay")
+        self.assertContains(response, "web-01")
         self.assertContains(response, old_snapshot.dirname)
         self.assertContains(response, new_snapshot.dirname)
         self.assertContains(response, "newest")
@@ -2022,6 +2036,7 @@ class ViewTests(TestCase):
         response = self.client.get(reverse("edit_host_schedule", args=[host.host]))
 
         self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Automatic backup timing and scheduled prune behavior")
         self.assertContains(response, "Create Schedule")
         self.assertContains(response, "Schedule expression")
         self.assertContains(response, "evaluated by the pobsync scheduler service")
