diff --git a/app/views/quiz/_checkbox_other.html.erb b/app/views/quiz/_checkbox_other.html.erb
index fae8fd1..b9a938c 100644
--- a/app/views/quiz/_checkbox_other.html.erb
+++ b/app/views/quiz/_checkbox_other.html.erb
@@ -2,8 +2,8 @@
   answers = question.answer.nil? ? [] : Array(question.answer['options'])
   other_value = question.answer.nil? ? '' : question.answer['other']
 %>
-<div role="group" aria-labelledby="<%= question.question_id %>">
-  <div id="<%= question.question_id %>">Select all that apply:</div>
+<div role="group" aria-labelledby="<%= question.to_i %>">
+  <div id="<%= question.to_i %>">Select all that apply:</div>
 
   <% question.input_options.each do | option |
     option_id = "#{option.parameterize}_#{question.to_i}"
@@ -20,12 +20,16 @@
     <%
       option_id = "other_#{question.to_i}"
       checkbox_html = {class: "", id: option_id, data: { last: answers.include?('other') ? 'checked' : '' } }
-      text_html = {class: "", id: "text_#{option_id}", data: { last: other_value }}
+      text_html = {class: "", id: "value_#{option_id}", data: { last: other_value }}
     %>
     <%= check_box_tag('answer[answer_hash][options][]', 'other', answers.include?('other'), checkbox_html) %>
     <%= label_tag(option_id, 'Other') %>
-    <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html.merge(id: "#{option_id}_value") %>
   </div>
 </div>
 
+<div>
+  <%= label_tag text_html[:id], 'Other text' %>
+  <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html %>
+</div>
+
 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
diff --git a/app/views/quiz/_radio_other.html.erb b/app/views/quiz/_radio_other.html.erb
index c5d0b3c..dc6c6d0 100644
--- a/app/views/quiz/_radio_other.html.erb
+++ b/app/views/quiz/_radio_other.html.erb
@@ -3,8 +3,8 @@
   other_value = question.answer.nil? ? '' : question.answer['other']
 %>
 
-<div role="group" aria-labelledby="<%= question.question_id %>">
-  <div id="<%= question.question_id %>">Select the best option:</div>
+<div role="group" aria-labelledby="<%= question.to_i %>">
+  <div id="<%= question.to_i %>">Select the best option:</div>
 
   <% question.input_options.each do | option |
     option_id = "#{option.parameterize}_#{question.to_i}"
@@ -21,12 +21,17 @@
     <%
       option_id = "other_#{question.to_i}"
       radio_html = {class: "", id: option_id, data: { last: answer_string }}
-      text_html = {class: "", id: "text_#{option_id}", data: { last: other_value }}
+      text_html = {class: "", id: "value_#{option_id}", data: { last: other_value }}
     %>
     <%= radio_button_tag('answer[answer_hash][options][]', 'other', (answer_string == 'other'), radio_html) %>
     <%= label_tag option_id, 'Other' %>
-    <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html.merge(id: "value_#{option_id}") %>
+
   </div>
 </div>
 
+<div>
+  <%= label_tag text_html[:id], 'Other text' %>
+  <%= text_field_tag 'answer[answer_hash][other]', other_value, text_html %>
+</div>
+
 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
diff --git a/app/views/quiz/summary.html.erb b/app/views/quiz/summary.html.erb
index edd5d18..500e235 100644
--- a/app/views/quiz/summary.html.erb
+++ b/app/views/quiz/summary.html.erb
@@ -26,6 +26,7 @@
     <% end %>
 
     <fieldset disabled>
+      <legend>Review your answer</legend>
       <%= render partial: question.input_type, locals: {question: question, form: form, answer: question.answer} %>
     </fieldset>
 
diff --git a/app/workers/candidate_quiz_question.rb b/app/workers/candidate_quiz_question.rb
index dad8a16..6890baa 100644
--- a/app/workers/candidate_quiz_question.rb
+++ b/app/workers/candidate_quiz_question.rb
@@ -13,11 +13,11 @@ class CandidateQuizQuestion
   def quiz_id
     row["quiz_id"]
   end
-  alias to_i quiz_id
 
   def question_id
     row["question_id"]
   end
+  alias to_i question_id
 
   def answer_id
     row["answer_id"]