diff --git a/physics/templates/physics/exam_take.html b/physics/templates/physics/exam_take.html
index da94cbdd..0566c443 100755
--- a/physics/templates/physics/exam_take.html
+++ b/physics/templates/physics/exam_take.html
@@ -18,22 +18,48 @@
         <div>
 
             <form method="POST" class="post-form">{% csrf_token %}
+                {{ form.non_field_errors }}
                 <div class="form-contents">
-                <ul class="physics-answer-list">
-                    <li data-ans="a">{{question.a|safe}}</li>
-                    <li data-ans="b">{{question.b|safe}}</li>
-                    <li data-ans="c">{{question.c|safe}}</li>
-                    <li data-ans="d">{{question.d|safe}}</li>
-                    <li data-ans="e">{{question.e|safe}}</li>
-                </ul>
-                <ul>
-{{ form.non_field_errors }}
-<div class="fieldWrapper">
-{{ form.a.errors }}
-<label for="{{ form.a.id_for_label }}">{{question.a|safe}}</label>
-{{ form.a }}
-</div>
-                </ul>
+                    <ul class="physics-answer-list">
+                        <li data-ans="a">
+                            <div class="fieldWrapper">
+                                {{ form.a.errors }}
+                                <label for="{{ form.a.id_for_label }}">{{question.a|safe}}</label>
+                                {{ form.a }}
+                            </div>
+                        </li>
+                        <li data-ans="b">
+                            <div class="fieldWrapper">
+                                {{ form.b.errors }}
+                                <label for="{{ form.b.id_for_label }}">{{question.b|safe}}</label>
+                                {{ form.b }}
+                            </div>
+                        </li>
+                        <li data-ans="c">
+                            <div class="fieldWrapper">
+                                {{ form.c.errors }}
+                                <label for="{{ form.a.id_for_label }}">{{question.c|safe}}</label>
+                                {{ form.c }}
+                            </div>
+                        </li>
+                        <li data-ans="d">
+                            <div class="fieldWrapper">
+                                {{ form.d.errors }}
+                                <label for="{{ form.d.id_for_label }}">{{question.d|safe}}</label>
+                                {{ form.d }}
+                            </div>
+                        </li>
+                        <li data-ans="e">
+                            <div class="fieldWrapper">
+                                {{ form.e.errors }}
+                                <label for="{{ form.a.id_for_label }}">{{question.e|safe}}</label>
+                                {{ form.e }}
+                            </div>
+                        </li>
+                    </ul>
+                    <ul>
+
+                    </ul>
                 </div>
 
                 {% if previous > -1 %}