diff --git a/web/templates/entry_edit.html b/web/templates/entry_edit.html
index 0924b35..0499d68 100644
--- a/web/templates/entry_edit.html
+++ b/web/templates/entry_edit.html
@@ -4,8 +4,7 @@
 
 {% block content %}
 <div class="page">
-
-  <!-- Toolbar -->
+  <!-- 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>
@@ -13,89 +12,93 @@
     </div>
     <div class="rt-right">
       <a class="btn" href="{% url 'entry_view' entry.id %}">Cancel</a>
-      <button form="edit-form" class="btn btn-primary btn-lg">Save</button>
+      <button form="entry-edit-form" class="btn btn-primary">Save</button>
     </div>
   </div>
 
-  <!-- Form Card -->
-  <div class="card form-card">
-    <form id="edit-form" method="post" novalidate>
+  <!-- Card -->
+  <div class="card entry-form modern-form">
+    <form id="entry-edit-form" method="post">
       {% csrf_token %}
 
-      <div class="form-grid">
-
-        <!-- Subject -->
-        <div class="field span-2">
-          <label for="id_subject" class="label">Subject</label>
-          <textarea id="id_subject" name="subject" class="input textarea tall-2" placeholder="Comma-separated subjects…">{{ entry.subject }}</textarea>
-          <div class="hint">Examples: <code>Love</code>, <code>Faith</code>, <code>Family</code> (comma-separated tags work nicely)</div>
+      <div class="f-grid">
+        <div class="f-row">
+          <div class="f-label">Subject</div>
+          <div class="f-control">
+            {{ form.subject }}
+          </div>
         </div>
 
-        <!-- Illustration -->
-        <div class="field span-2">
-          <label for="id_illustration" class="label">Illustration</label>
-          <textarea id="id_illustration" name="illustration" class="input textarea tall-3" placeholder="The story / example…">{{ entry.illustration }}</textarea>
+        <div class="f-row tall">
+          <div class="f-label">Illustration</div>
+          <div class="f-control">
+            {{ form.illustration }}
+          </div>
         </div>
 
-        <!-- Application -->
-        <div class="field span-2">
-          <label for="id_application" class="label">Application</label>
-          <textarea id="id_application" name="application" class="input textarea tall-3" placeholder="How to use it in a talk…">{{ entry.application }}</textarea>
+        <div class="f-row tall">
+          <div class="f-label">Application</div>
+          <div class="f-control">
+            {{ form.application }}
+          </div>
         </div>
 
-        <!-- Scripture -->
-        <div class="field span-2">
-          <label for="id_scripture_raw" class="label">Scripture</label>
-          <textarea id="id_scripture_raw" name="scripture_raw" class="input textarea" placeholder="e.g., John 13:34,35; Romans 14:4">{{ entry.scripture_raw }}</textarea>
-          <div class="hint">Separate multiple references with semicolons <code>;</code>. These will show as clickable chips.</div>
+        <div class="f-row">
+          <div class="f-label">Scripture</div>
+          <div class="f-control">
+            {{ form.scripture_raw }}
+          </div>
         </div>
 
-        <!-- Source -->
-        <div class="field">
-          <label for="id_source" class="label">Source</label>
-          <input id="id_source" name="source" type="text" class="input" value="{{ entry.source|default_if_none:'' }}" placeholder="Publisher / speaker / book…">
+        <div class="f-row">
+          <div class="f-label">Source</div>
+          <div class="f-control">
+            {{ form.source }}
+          </div>
         </div>
 
-        <!-- Talk Title -->
-        <div class="field">
-          <label for="id_talk_title" class="label">Talk Title</label>
-          <input id="id_talk_title" name="talk_title" type="text" class="input" value="{{ entry.talk_title|default_if_none:'' }}" placeholder="Title if any…">
+        <div class="f-row">
+          <div class="f-label">Talk Title</div>
+          <div class="f-control">
+            {{ form.talk_title }}
+          </div>
         </div>
 
-        <!-- Talk Number -->
-        <div class="field">
-          <label for="id_talk_number" class="label">Talk Number</label>
-          <input id="id_talk_number" name="talk_number" type="number" class="input" value="{{ entry.talk_number|default_if_none:'' }}" placeholder="e.g., 72">
+        <div class="f-row">
+          <div class="f-label">Talk Number</div>
+          <div class="f-control">
+            {{ form.talk_number }}
+          </div>
         </div>
 
-        <!-- Code -->
-        <div class="field">
-          <label for="id_entry_code" class="label">Entry Code</label>
-          <input id="id_entry_code" name="entry_code" type="text" class="input" value="{{ entry.entry_code|default_if_none:'' }}" placeholder="Your internal code…">
+        <div class="f-row">
+          <div class="f-label">Entry Code</div>
+          <div class="f-control">
+            {{ form.entry_code }}
+          </div>
         </div>
 
-        <!-- Dates -->
-        <div class="field">
-          <label for="id_date_added" class="label">Date Added</label>
-          <input id="id_date_added" name="date_added" type="date" class="input"
-                 value="{{ entry.date_added|date:'Y-m-d' }}">
+        <div class="f-row">
+          <div class="f-label">Date Added</div>
+          <div class="f-control">
+            {{ form.date_added }}
+          </div>
         </div>
 
-        <div class="field">
-          <label for="id_date_edited" class="label">Date Edited</label>
-          <input id="id_date_edited" name="date_edited" type="date" class="input"
-                 value="{{ entry.date_edited|date:'Y-m-d' }}">
+        <div class="f-row">
+          <div class="f-label">Date Edited</div>
+          <div class="f-control">
+            {{ form.date_edited }}
+          </div>
         </div>
-
       </div>
 
-      <!-- Actions (mobile friendly duplicate at bottom) -->
-      <div class="form-actions">
-        <a class="btn" href="{% url 'entry_view' entry.id %}">Cancel</a>
+      <!-- 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">Save</button>
       </div>
     </form>
   </div>
-
 </div>
 {% endblock %}
\ No newline at end of file