diff --git a/kjvstudy_org/templates/chapter.html b/kjvstudy_org/templates/chapter.html
index d14b329..eb9a3a7 100644
--- a/kjvstudy_org/templates/chapter.html
+++ b/kjvstudy_org/templates/chapter.html
@@ -52,14 +52,21 @@ hr::before {
     color: #111;
 }
 
-.verse-link {
+.verse-number-link {
+    font-family: et-book-roman-old-style;
+    font-size: 1rem;
+    vertical-align: super;
     text-decoration: none;
     color: inherit;
-    cursor: pointer;
+    position: relative;
+    top: -0.5rem;
+    left: 0.1rem;
+    margin-right: 0.2rem;
 }
 
-.verse-link:hover {
+.verse-number-link:hover {
     color: #111;
+    text-decoration: underline;
 }
 </style>
 {% endblock %}
@@ -79,12 +86,7 @@ hr::before {
     {% for verse in verses %}
     {% set commentary = commentaries[verse.verse] if commentaries and verse.verse in commentaries else none %}
     <p id="verse-{{ verse.verse }}">
-        <a href="#verse-{{ verse.verse }}" class="verse-link"><label for="sn-{{ verse.verse }}" class="margin-toggle sidenote-number"></label></a>
-        <input type="checkbox" id="sn-{{ verse.verse }}" class="margin-toggle"/>
-        {% if commentary and commentary.analysis %}
-        <span class="sidenote">{{ commentary.analysis|safe }}</span>
-        {% endif %}
-        {{ verse.text }}
+        <a href="/book/{{ book }}/chapter/{{ chapter }}/verse/{{ verse.verse }}" class="verse-number-link">{{ verse.verse }}</a> {{ verse.text }}
         {% if commentary and commentary.cross_references %}
             {% for ref in commentary.cross_references %}
             <label for="sn-{{ verse.verse }}-ref-{{ loop.index }}" class="margin-toggle">⊕</label>