diff --git a/web/templates/entry_view.html b/web/templates/entry_view.html
index 942f288..8c042d8 100644
--- a/web/templates/entry_view.html
+++ b/web/templates/entry_view.html
@@ -15,12 +15,10 @@
     </div>
     <div class="rt-right">
       <form method="get" action="{% url 'nav_prev' %}" class="inline">
-        <!-- send current zero-based index (position-1); view will subtract 1 -->
         <input type="hidden" name="i" value="{{ position|add:'-1' }}">
         <button class="btn btn-lg" {% if position <= 1 %}disabled{% endif %}>‹ Prev</button>
       </form>
       <form method="get" action="{% url 'nav_next' %}" class="inline">
-        <!-- send current zero-based index (position-1); view will add 1 -->
         <input type="hidden" name="i" value="{{ position|add:'-1' }}">
         <button class="btn btn-lg btn-primary" {% if position >= count %}disabled{% endif %}>Next ›</button>
       </form>
@@ -70,7 +68,15 @@
     <div class="meta-grid">
       <div class="meta-item">
         <div class="meta-label">Source</div>
-        <div class="meta-value">{{ entry.source|default:"—" }}</div>
+        <div class="meta-value">
+          {% if entry.source %}
+            <a class="chip chip-link"
+               href="https://wol.jw.org/en/wol/l/r1/lp-e?q={{ entry.source|urlencode }}"
+               target="_blank" rel="noopener noreferrer">
+              {{ entry.source }}
+            </a>
+          {% else %}—{% endif %}
+        </div>
       </div>
 
       <div class="meta-item">
@@ -79,8 +85,8 @@
           {% if scripture_list %}
             {% for sc in scripture_list %}
               <a class="chip chip-link"
-                href="https://wol.jw.org/en/wol/l/r1/lp-e?q={{ sc|urlencode }}"
-                target="_blank" rel="noopener noreferrer">
+                 href="https://wol.jw.org/en/wol/l/r1/lp-e?q={{ sc|urlencode }}"
+                 target="_blank" rel="noopener noreferrer">
                 {{ sc }}
               </a>
             {% endfor %}
@@ -114,26 +120,26 @@
 </div>
 
 <style>
-  .subject-pills{
-    display:flex;
-    flex-wrap:wrap;
-    gap:10px;
-    margin:0 0 10px;
+  .subject-pills {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    margin: 0 0 10px;
   }
-  .chip-subject{
-    font-weight:700;
-    font-size:16px;
-    padding:8px 14px;
-    border-radius:999px;
-    background:#eef5fc;
-    border:1px solid #d7e6f7;
-    color:#0f172a;
-    text-decoration:none;
-    text-transform: capitalize; /* Capitalize each word */
+  .chip-subject {
+    font-weight: 700;
+    font-size: 16px;
+    padding: 8px 14px;
+    border-radius: 999px;
+    background: #eef5fc;
+    border: 1px solid #d7e6f7;
+    color: #0f172a;
+    text-decoration: none;
+    text-transform: capitalize;
   }
-  .chip-subject:hover{
-    background:#e2effc;
-    border-color:#c9def5;
+  .chip-subject:hover {
+    background: #e2effc;
+    border-color: #c9def5;
   }
 </style>
 {% endblock %}
\ No newline at end of file