diff --git a/survey_run.py b/survey_run.py
index d7dcc466..80b24bad 100644
--- a/survey_run.py
+++ b/survey_run.py
@@ -30,8 +30,10 @@ def index():
     results[question][random_num]['A'] = a
     results[question][random_num]['B'] = b
     
-    a = data[data_type][a]
-    b = data[data_type][b]
+    a = random.choice(data[data_type][a])
+    b = random.choice(data[data_type][b])
+    results[question][random_num]['A value'] = a
+    results[question][random_num]['B value'] = b
     
     return flask.render_template('survey.html', question=question, a=a, b=b, random_num=random_num)
     
diff --git a/templates/survey.html b/templates/survey.html
index 9bb39544..a72a6b42 100644
--- a/templates/survey.html
+++ b/templates/survey.html
@@ -36,49 +36,56 @@
 		<h1><center>{{ question }}</center></h1>
 	</div>
 	<input type=hidden id="id" value="{{ random_num }}"/>
-	<table>
+	<table border=1>
 		<tr>
 			<td>
-				<h2><center><input type=radio autocomplete="off" name="answer" id="A" onclick="send_results();">A</center></h2>
+				<input type=radio autocomplete="off" name="answer" id="A" onclick="send_results();">
 			</td>
 			<td>
-				<h2><center><input type=radio autocomplete="off" name="answer" id="B" onclick="send_results();">B</center></h2>
-			</td>
-			<td>
-				<h2><center><input type=radio autocomplete="off" name="answer" id="C" onclick="send_results();">About the same</center></h2>
-			</td>
-			<td>
-				<h2><center><input type=radio autocomplete="off" name="answer" id="D" onclick="send_results();">A is incoherent</center></h2>
-			</td>
-			<td>
-				<h2><center><input type=radio autocomplete="off" name="answer" id="E" onclick="send_results();">B is incoherent</center></h2>
-			</td>
-			<td>
-				<h2><center><input type=radio autocomplete="off" name="answer" id="F" onclick="send_results();">Both are incoherent</center></h2>
+				{{ a }}
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<table border=1>
-					{% for item in a %}
-					<tr>
-						<td>
-							{{ item }}
-						</td>
-					</tr>
-					{% endfor %}
-				</table>
+				<input type=radio autocomplete="off" name="answer" id="B" onclick="send_results();">
 			</td>
 			<td>
-				<table border=1>
-					{% for item in b %}
-					<tr>
-						<td>
-							{{ item }}
-						</td>
-					</tr>
-					{% endfor %}
-				</table>
+				{{ b }}
+			</td>
+		</tr>
+		<tr>
+			<td colspan=2>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>
+				<input type=radio autocomplete="off" name="answer" id="C" onclick="send_results();">
+			</td>
+			<td>
+				About the same
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type=radio autocomplete="off" name="answer" id="D" onclick="send_results();">
+			</td>
+			<td>
+				The first is incoherent
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type=radio autocomplete="off" name="answer" id="E" onclick="send_results();">
+			</td>
+			<td>
+				The second is incoherent
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type=radio autocomplete="off" name="answer" id="F" onclick="send_results();">
+			</td>
+			<td>
+				Both the first and second are incoherent
 			</td>
 		</tr>
 	</table>