diff --git a/sbas/models.py b/sbas/models.py
index 2f2d2969..3d080218 100644
--- a/sbas/models.py
+++ b/sbas/models.py
@@ -30,11 +30,11 @@ class Question(models.Model):
     answer_help_text = "Answer text"
 
     BEST_ANSWER_CHOICES = (
-        ('a', 'answer_a'),
-        ('b', 'answer_b'),
-        ('c', 'answer_c'),
-        ('d', 'answer_d'),
-        ('e', 'answer_e'),
+        ('a', 'a_answer'),
+        ('b', 'b_answer'),
+        ('c', 'c_answer'),
+        ('d', 'd_answer'),
+        ('e', 'e_answer'),
     )
 
     # I doubt this is the best way to structure the model
diff --git a/sbas/templates/sbas/exam_take.html b/sbas/templates/sbas/exam_take.html
index cd390131..2ff29927 100755
--- a/sbas/templates/sbas/exam_take.html
+++ b/sbas/templates/sbas/exam_take.html
@@ -6,6 +6,13 @@ CID: {{cid}}
 <h2>Question [{{pos}}/{{exam_length}}]</h2>
 
 <div><p>{{question.stem}}</p></div>
+<ul>
+    <li>{{question.a_answer}}</li>
+    <li>{{question.b_answer}}</li>
+    <li>{{question.c_answer}}</li>
+    <li>{{question.d_answer}}</li>
+    <li>{{question.e_answer}}</li>
+</ul>
 
 {{form}}
 <ul></ul>
diff --git a/sbas/views.py b/sbas/views.py
index fc8814ba..694d22d2 100644
--- a/sbas/views.py
+++ b/sbas/views.py
@@ -274,7 +274,7 @@ def exam_take(request, pk, sk, cid):
             "form": form,
             "cid": cid,
             "exam": exam,
-            "questions": question,
+            "question": question,
             "next": next,
             "previous": previous,
             "exam_length": exam_length,