diff --git a/sbas/templates/sbas/exam_take.html b/sbas/templates/sbas/exam_take.html
index 306c2201..547bf5d4 100755
--- a/sbas/templates/sbas/exam_take.html
+++ b/sbas/templates/sbas/exam_take.html
@@ -14,17 +14,22 @@ CID: {{cid}}
     <li data-ans="e">{{question.e_answer}}</li>
 </ul>
 
-{{form}}
 <ul></ul>
  
 <div>
 
+<form method="POST" class="post-form">{% csrf_token %}
+{{form}}
+
 {% if previous > -1 %}
-<a href="{% url 'sbas:exam_take' exam.id previous cid %}">Previous question</a>
+<button type="submit" name="previous" class="btn btn-previous"Previous question</button>
 {% endif %}
 {% if next %}
-<a href="{% url 'sbas:exam_take' exam.id next cid %}">Next question</a>
+<button type="submit" name="next" class="save btn btn-default">Next</button>
+{% else %}
+<button type="submit" name="save" class="save btn btn-default">Save</button>
 {% endif %}
+</form>
 </div>
 
 {% endblock %}