diff --git a/web/templates/entry_edit.html b/web/templates/entry_edit.html
index de0e997..2ce4b65 100644
--- a/web/templates/entry_edit.html
+++ b/web/templates/entry_edit.html
@@ -1,95 +1,113 @@
+Absolutely—here’s a complete entry_edit.html that matches your current edit layout and adds the same “auto‑fill Talk Title from Talk Number” behavior you have on the new‑entry form. I also added a tiny convenience so if the title field contains just - or —, it’s treated as empty and will auto‑fill.
+
 {% extends "base.html" %}
-{% load static %}
-{% block title %}Edit Entry #{{ entry.id }} - Illustrations DB{% endblock %}
 {% block body_class %}themed-bg{% endblock %}
+{% load static %}
 
 {% block content %}
-<div class="container">
-  <h1 class="page-title">Edit Illustration</h1>
-  <p class="page-subtitle">
-    Update the details below. Subjects should be comma‑separated; keep scriptures in standard abbreviations.
-  </p>
+<div class="page">
+  <!-- Top bar -->
+  <div class="result-toolbar">
+    <div class="rt-left">
+      <a class="btn btn-secondary" href="{% url 'entry_view' entry.id %}">← Back to Entry</a>
+      <span class="rt-count">Editing: #{{ entry.id }}</span>
+    </div>
+    <div class="rt-right">
+      <a class="btn" href="{% url 'entry_view' entry.id %}">Cancel</a>
+      <button form="entry-edit-form" class="btn btn-primary">Save</button>
+    </div>
+  </div>
 
-  <form id="entry-edit-form" method="post" class="search-form card">
-    {% csrf_token %}
+  <!-- Card -->
+  <div class="card entry-form modern-form">
+    <form id="entry-edit-form" method="post">
+      {% csrf_token %}
 
-    <div class="form-grid">
-      <div class="form-row">
-        <label>Subject</label>
-        {{ form.subject }}
-        {% if form.subject.errors %}<div class="err">{{ form.subject.errors|striptags }}</div>{% endif %}
-      </div>
-
-      <div class="form-row">
-        <label>Illustration</label>
-        {{ form.illustration }}
-        {% if form.illustration.errors %}<div class="err">{{ form.illustration.errors|striptags }}</div>{% endif %}
-      </div>
-
-      <div class="form-row">
-        <label>Application</label>
-        {{ form.application }}
-        {% if form.application.errors %}<div class="err">{{ form.application.errors|striptags }}</div>{% endif %}
-      </div>
-
-      <div class="form-row two">
-        <div>
-          <label>Scripture</label>
-          {{ form.scripture_raw }}
-          {% if form.scripture_raw.errors %}<div class="err">{{ form.scripture_raw.errors|striptags }}</div>{% endif %}
-        </div>
-        <div>
-          <label>Source</label>
-          {{ form.source }}
-          {% if form.source.errors %}<div class="err">{{ form.source.errors|striptags }}</div>{% endif %}
-        </div>
-      </div>
-
-      <div class="form-row two">
-        <div>
-          <label>Talk Title</label>
-          {{ form.talk_title }}
-          {% if form.talk_title.errors %}<div class="err">{{ form.talk_title.errors|striptags }}</div>{% endif %}
-        </div>
-        <div>
-          <label>Talk Number</label>
-          {{ form.talk_number }}
-          {% if form.talk_number.errors %}<div class="err">{{ form.talk_number.errors|striptags }}</div>{% endif %}
-        </div>
-      </div>
-
-      <div class="form-row two">
-        <div>
-          <label>Code</label>
-          {{ form.entry_code }}
-          {% if form.entry_code.errors %}<div class="err">{{ form.entry_code.errors|striptags }}</div>{% endif %}
-        </div>
-        <div>
-          <label>Dates</label>
-          <div class="two">
-            {{ form.date_added }} {{ form.date_edited }}
+      <div class="f-grid">
+        <div class="f-row">
+          <div class="f-label">Subject</div>
+          <div class="f-control">
+            {{ form.subject }}
+          </div>
+        </div>
+
+        <div class="f-row tall">
+          <div class="f-label">Illustration</div>
+          <div class="f-control">
+            {{ form.illustration }}
+          </div>
+        </div>
+
+        <div class="f-row tall">
+          <div class="f-label">Application</div>
+          <div class="f-control">
+            {{ form.application }}
+          </div>
+        </div>
+
+        <div class="f-row">
+          <div class="f-label">Scripture</div>
+          <div class="f-control">
+            {{ form.scripture_raw }}
+          </div>
+        </div>
+
+        <div class="f-row">
+          <div class="f-label">Source</div>
+          <div class="f-control">
+            {{ form.source }}
+          </div>
+        </div>
+
+        <div class="f-row">
+          <div class="f-label">Talk Title</div>
+          <div class="f-control">
+            {{ form.talk_title }}
+          </div>
+        </div>
+
+        <div class="f-row">
+          <div class="f-label">Talk Number</div>
+          <div class="f-control">
+            {{ form.talk_number }}
+          </div>
+        </div>
+
+        <div class="f-row">
+          <div class="f-label">Entry Code</div>
+          <div class="f-control">
+            {{ form.entry_code }}
+          </div>
+        </div>
+
+        <div class="f-row">
+          <div class="f-label">Date Added</div>
+          <div class="f-control">
+            {{ form.date_added }}
+          </div>
+        </div>
+
+        <div class="f-row">
+          <div class="f-label">Date Edited</div>
+          <div class="f-control">
+            {{ form.date_edited }}
           </div>
-          {% if form.date_added.errors %}<div class="err">{{ form.date_added.errors|striptags }}</div>{% endif %}
-          {% if form.date_edited.errors %}<div class="err">{{ form.date_edited.errors|striptags }}</div>{% endif %}
         </div>
       </div>
-    </div>
 
-    <div class="result-toolbar" style="margin-top:18px;">
-      <div class="rt-left">
-        <a class="btn" href="{% url 'entry_view' entry.id %}">← Back to Entry</a>
-      </div>
-      <div class="rt-right">
+      <!-- bottom actions (hidden by CSS if you prefer only the top bar) -->
+      <div class="form-actions bottom-actions">
         <a class="btn btn-secondary" href="{% url 'entry_view' entry.id %}">Cancel</a>
-        <button class="btn btn-primary" type="submit">Save</button>
+        <button class="btn btn-primary">Save</button>
       </div>
-    </div>
-  </form>
+    </form>
+  </div>
 </div>
 
-<!-- Same talk-title autofill behavior as entry_add -->
+<!-- Talk title auto-fill (same behavior as entry_add) -->
 <script>
 (function () {
+  // Location of your mapping file
   const talksUrl = "{% static 'talks.json' %}";
 
   function wireAutofill(talkMap) {
@@ -97,30 +115,42 @@
     const titleEl  = document.getElementById("id_talk_title");
     if (!numberEl || !titleEl) return;
 
+    // Consider "-" or "—" as empty (lets autofill replace them)
+    const isEffectivelyEmpty = (s) => {
+      const t = (s || "").trim();
+      return t === "" || t === "-" || t === "—";
+    };
+
+    // Track if user has typed something custom
     let userTyped = false;
+
     titleEl.addEventListener("input", () => {
-      userTyped = titleEl.value.trim().length > 0;
+      userTyped = !isEffectivelyEmpty(titleEl.value);
       if (!userTyped) titleEl.dataset.autofilled = "0";
     });
 
     function maybeAutofill() {
       const n = numberEl.value;
       const mapped = talkMap && talkMap[n] ? talkMap[n] : "";
+
       if (!userTyped) {
         if (mapped) {
           titleEl.value = mapped;
           titleEl.dataset.autofilled = "1";
         } else if (titleEl.dataset.autofilled === "1") {
+          // Previously autofilled but new number has no title: clear it
           titleEl.value = "";
           titleEl.dataset.autofilled = "0";
         }
       }
     }
 
+    // Change -> try to fill
     numberEl.addEventListener("change", maybeAutofill);
 
-    // Initial fill: if empty, we allow autofill; if not, respect user content.
-    if (titleEl.value.trim() === "") {
+    // Initial fill on page load:
+    // If current title is empty/hyphen, allow autofill; otherwise respect user text
+    if (isEffectivelyEmpty(titleEl.value)) {
       userTyped = false;
       maybeAutofill();
     } else {
@@ -128,6 +158,7 @@
     }
   }
 
+  // Fetch the mapping; if it fails, no worries—form still works
   fetch(talksUrl, {cache: "no-store"})
     .then(r => r.ok ? r.json() : {})
     .then(map => wireAutofill(map))