diff --git a/web/templates/entry_view.html b/web/templates/entry_view.html
index a19fd61..11ae244 100644
--- a/web/templates/entry_view.html
+++ b/web/templates/entry_view.html
@@ -2,99 +2,96 @@
 {% load static %}
 
 {% block content %}
-<div class="container">
+<div class="result-wrap">
 
-  <!-- Top toolbar: back to search + pager + actions -->
-  <div class="toolbar">
-    <div class="toolbar-left">
+  <!-- Top bar: back + counter + clear Prev/Next -->
+  <div class="result-toolbar">
+    <div class="rt-left">
       <a class="btn btn-secondary" href="{% url 'search' %}">← Back to Search</a>
       {% if count %}
-        <span class="toolbar-count">{{ position }} of {{ count }}</span>
+        <span class="rt-count">{{ position }} of {{ count }}</span>
       {% endif %}
     </div>
-    <div class="toolbar-right">
+    <div class="rt-right">
       <form method="get" action="{% url 'nav_prev' %}" class="inline">
         <input type="hidden" name="i" value="{{ position|add:'-2' }}">
-        <button class="btn" {% if position <= 1 %}disabled{% endif %}>‹ Prev</button>
+        <button class="btn btn-lg" {% if position <= 1 %}disabled{% endif %}>‹ Prev</button>
       </form>
       <form method="get" action="{% url 'nav_next' %}" class="inline">
         <input type="hidden" name="i" value="{{ position|add:'0' }}">
-        <button class="btn" {% if position >= count %}disabled{% endif %}>Next ›</button>
+        <button class="btn btn-lg btn-primary" {% if position >= count %}disabled{% endif %}>Next ›</button>
       </form>
 
       {% if user.is_authenticated and user.is_staff %}
-        <a class="btn btn-primary" href="{% url 'entry_edit' entry.id %}">Unlock / Edit</a>
+        <a class="btn btn-outline" href="{% url 'entry_edit' entry.id %}">Unlock / Edit</a>
         <a class="btn btn-danger" href="{% url 'entry_delete' entry.id %}">Delete</a>
       {% endif %}
     </div>
   </div>
 
-  <!-- Entry card -->
-  <div class="card">
-    <div class="card-header">
-      <h1 class="card-title">
-        {% if entry.talk_title %}{{ entry.talk_title }}{% else %}Untitled{% endif %}
-      </h1>
-      <div class="meta">
-        {% if entry.talk_number %}<span class="chip">Talk #{{ entry.talk_number }}</span>{% endif %}
-        {% if entry.entry_code %}<span class="chip chip-muted">Code: {{ entry.entry_code }}</span>{% endif %}
-        {% if entry.date_added %}<span class="chip chip-muted">Added: {{ entry.date_added }}</span>{% endif %}
-        {% if entry.date_edited %}<span class="chip chip-muted">Edited: {{ entry.date_edited }}</span>{% endif %}
+  <!-- Main card -->
+  <div class="result-card">
+    <!-- SUBJECT as the main title -->
+    <h1 class="subject-title">
+      {{ entry.subject|default:"(no subject)" }}
+    </h1>
+
+    <!-- ILLUSTRATION -->
+    <div class="section">
+      <div class="section-label">Illustration</div>
+      <div class="section-body lead-text">
+        {{ entry.illustration|linebreaksbr|default:"—" }}
       </div>
     </div>
 
-    <div class="card-body grid-2">
-      <div class="field">
-        <div class="label">Subject</div>
-        <div class="value">
-          {% if subject_list %}
-            {% for s in subject_list %}<span class="chip">{{ s }}</span>{% endfor %}
-          {% else %}
-            <span class="muted">—</span>
-          {% endif %}
-        </div>
+    <!-- APPLICATION -->
+    <div class="section">
+      <div class="section-label">Application</div>
+      <div class="section-body lead-text">
+        {{ entry.application|linebreaksbr|default:"—" }}
+      </div>
+    </div>
+
+    <!-- Meta (smaller) -->
+    <div class="meta-grid">
+      <div class="meta-item">
+        <div class="meta-label">Source</div>
+        <div class="meta-value">{{ entry.source|default:"—" }}</div>
       </div>
 
-      <div class="field">
-        <div class="label">Source</div>
-        <div class="value">{{ entry.source|default:"—" }}</div>
-      </div>
-
-      <div class="field col-span-2">
-        <div class="label">Illustration</div>
-        <div class="value prose">{{ entry.illustration|linebreaksbr|default:"—" }}</div>
-      </div>
-
-      <div class="field col-span-2">
-        <div class="label">Application</div>
-        <div class="value prose">{{ entry.application|linebreaksbr|default:"—" }}</div>
-      </div>
-
-      <div class="field col-span-2">
-        <div class="label">Scripture</div>
-        <div class="value">
+      <div class="meta-item">
+        <div class="meta-label">Scripture</div>
+        <div class="meta-value">
           {% if scripture_list %}
-            {% for sc in scripture_list %}<span class="chip chip-link">{{ sc }}</span>{% endfor %}
-          {% else %}
-            <span class="muted">—</span>
-          {% endif %}
+            {% for sc in scripture_list %}
+              <span class="chip chip-link">{{ sc }}</span>
+            {% endfor %}
+          {% else %}—{% endif %}
+        </div>
+      </div>
+
+      <div class="meta-item">
+        <div class="meta-label">Code</div>
+        <div class="meta-value">{{ entry.entry_code|default:"—" }}</div>
+      </div>
+
+      <div class="meta-item">
+        <div class="meta-label">Talk</div>
+        <div class="meta-value">
+          {% if entry.talk_title %}{{ entry.talk_title }}{% else %}—{% endif %}
+          {% if entry.talk_number %}<span class="chip chip-muted">#{{ entry.talk_number }}</span>{% endif %}
+        </div>
+      </div>
+
+      <div class="meta-item">
+        <div class="meta-label">Dates</div>
+        <div class="meta-value small">
+          {% if entry.date_added %}Added: {{ entry.date_added }}{% else %}Added: —{% endif %}
+          {% if entry.date_edited %} • Edited: {{ entry.date_edited }}{% endif %}
         </div>
       </div>
     </div>
   </div>
 
-  <!-- Bottom pager (mobile friendly) -->
-  <div class="pager">
-    <form method="get" action="{% url 'nav_prev' %}" class="inline">
-      <input type="hidden" name="i" value="{{ position|add:'-2' }}">
-      <button class="btn btn-wide" {% if position <= 1 %}disabled{% endif %}>‹ Prev</button>
-    </form>
-    <div class="pager-spacer">{{ position }} / {{ count }}</div>
-    <form method="get" action="{% url 'nav_next' %}" class="inline">
-      <input type="hidden" name="i" value="{{ position|add:'0' }}">
-      <button class="btn btn-wide" {% if position >= count %}disabled{% endif %}>Next ›</button>
-    </form>
-  </div>
-
 </div>
 {% endblock %}
\ No newline at end of file