diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index ecc5681a..9e077eca 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -4,49 +4,52 @@
 <a href="{% url 'longs:exam_question_detail' exam.id question_details.current %}" title="View the Question">View</a>
 <a href="{% url 'longs:long_update' question.id %}" title="Edit the Question">Edit</a> <a
     href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Question using the admin interface">Admin
-    Edit</a>
+    Edit</a><a
+    href="{% url 'admin:longs_ciduseranswer_change' answer.id %}" title="Edit the user answer using the admin interface">Admin
+    Edit (user answer)</a>
 <h2>Marking question <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}"
         title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
-        
+
 <span>Marking CID: {{answer.cid}} ({{unmarked|length}} answer(s) left to mark)</span>
 <div>
     <details open>
-    <summary>Mark Scheme</summary>
-    {{ question.mark_scheme | safe}}
+        <summary>Mark Scheme</summary>
+        {{ question.mark_scheme | safe}}
     </details>
 </div>
-    <details open>
+<details open>
     <summary>User answers</summary>
-<div>
-    <div class="long-answer">
-        <span class="answer-heading">User observations:</span>
-        <pre>{{answer.answer_observations}}</pre>
-    </div>
-    <div class="long-answer">
-        <span class="answer-heading">User interpretation:</span>
-        <pre>{{answer.answer_interpretation}}</pre>
-    </div>
-    <div class="long-answer">
-        <span class="answer-heading">User principle diagnosis:</span>
-        <pre>{{answer.answer_principle_diagnosis}}</pre>
-    </div>
-    <div class="long-answer">
-        <span class="answer-heading">User differential diagnosis:</span>
-        <pre>{{answer.answer_differential_diagnosis}}</pre>
-    </div>
-    <div class="long-answer">
-        <span class="answer-heading">User management:</span>
-        <pre>{{answer.answer_management}}</pre>
-    </div>
+    <div>
+        <div class="long-answer">
+            <span class="answer-heading">User observations:</span>
+            <pre>{{answer.answer_observations}}</pre>
+        </div>
+        <div class="long-answer">
+            <span class="answer-heading">User interpretation:</span>
+            <pre>{{answer.answer_interpretation}}</pre>
+        </div>
+        <div class="long-answer">
+            <span class="answer-heading">User principle diagnosis:</span>
+            <pre>{{answer.answer_principle_diagnosis}}</pre>
+        </div>
+        <div class="long-answer">
+            <span class="answer-heading">User differential diagnosis:</span>
+            <pre>{{answer.answer_differential_diagnosis}}</pre>
+        </div>
+        <div class="long-answer">
+            <span class="answer-heading">User management:</span>
+            <pre>{{answer.answer_management}}</pre>
+        </div>
 
-</div>
-    </details>
+    </div>
+</details>
 <div class="marking">
     <form method="POST" class="post-form">{% csrf_token %}
         {{ form.as_p }}
         <button type="submit" name="save" class="save btn btn-default" title="Save answer">Save</button>
         {% if next_unmarked_id %}
-        <button type="submit" name="next" class="save btn btn-default" title="Save answer and move to next question">Next answer</button>
+        <button type="submit" name="next" class="save btn btn-default"
+            title="Save answer and move to next question">Next answer</button>
         <!-- <button type="submit" name="skip" class="save btn btn-default">Skip</button> -->
         {% else %}
         {% if not unmarked %}