diff --git a/atlas/templates/atlas/collection_case_view.html b/atlas/templates/atlas/collection_case_view.html
index eacd61a4..df205a89 100644
--- a/atlas/templates/atlas/collection_case_view.html
+++ b/atlas/templates/atlas/collection_case_view.html
@@ -55,15 +55,29 @@
 {% endif %}
 
 {% if take %}
-<h1>TAKE</h1>
-<div>
-    {% if previous %}
-    <a href="{% url 'atlas:collection_case_view_take' pk=collection.pk case_number=case_number|add:-1 cid=cid passcode=passcode %}">Previous</a>
-    {% endif %}
-    {% if next %}
-    <a href="{% url 'atlas:collection_case_view_take' pk=collection.pk case_number=case_number|add:1 cid=cid passcode=passcode %}">Next</a>
-    {% endif %}
-</div>
+        <form method="POST" class="post-form">{% csrf_token %}
+            <div class="form-contents">
+                {{form}}
+            </div>
+            {% if previous > -1 %}
+            <button type="submit" name="previous" class="save btn btn-default">Previous</button>
+            {% endif %}
+            {% if next %}
+            <button type="submit" name="next" class="save btn btn-default">Next</button>
+            {% else %}
+            {% if not exam.publish_results %}
+            <button type="submit" name="save" class="save btn btn-default">Save</button>
+            {% endif %}
+            {% endif %}
+
+            {% if exam.publish_results and question.feedback %}
+            <h3>Feedback</h3>
+            <p>{{question.feedback|safe}}</p>
+            {% endif %}
+            <br />
+            <button type="submit" name="finish" class="save btn btn-default">Overview</button>
+            <button type="submit" id="goto-button" value="test" name="goto" class="hide">goto</button>
+        </form>
 {% else %}
 <div>
     {% if previous %}