diff --git a/app/views/candidate/question.html.erb b/app/views/candidate/question.html.erb
index 0610e88..3762b96 100644
--- a/app/views/candidate/question.html.erb
+++ b/app/views/candidate/question.html.erb
@@ -6,33 +6,31 @@
 %>
 
 <%= form_for(@answer, url: post_answer_path(@answer.id), html:{method: :post, id: 'answer-form', data: {qid: @question.question_id}}) do |form| %>
-  <main class="questions_tpl">
-    <article class="answer-sec <%= @question.input_type %>-type" data-qid="<%= @question.question_id %>">
-      <h2 class="question-text"><%= @question.question %></h2>
+  <main class="answer-sec <%= @question.input_type %>-type questions_tpl" data-qid="<%= @question.question_id %>">
+    <h2 class="question-text"><%= @question.question %></h2>
 
-      <div class="content-well">
-        <%= hidden_field_tag 'answer[question_id]', @question.question_id %>
-        <%= hidden_field_tag 'answer[answer_id]', @question.answer_id %>
-        <%= render partial: @question.input_type, locals: {question: @question, form: form} %>
+    <div class="content-well">
+      <%= hidden_field_tag 'answer[question_id]', @question.question_id %>
+      <%= hidden_field_tag 'answer[answer_id]', @question.answer_id %>
+      <%= render partial: @question.input_type, locals: {question: @question, form: form} %>
+    </div>
+
+    <% if @status.on_summary %>
+
+      <div class="btn-container-summary">
+        <input type="submit" name="update" value="Save and return to summary">
       </div>
 
-      <% if @status.on_summary %>
+    <% else %>
 
-        <div class="btn-container-summary">
-          <input type="submit" name="update" value="Save and return to summary">
-        </div>
+      <div class="btn-container-left">
+        <input type="submit" name="save" value="Save">
+      </div>
+      <div class="btn-container-right">
+        <input type="submit" name="submit" value="Next">
+      </div>
 
-      <% else %>
-
-        <div class="btn-container-left">
-          <input type="submit" name="save" value="Save">
-        </div>
-        <div class="btn-container-right">
-          <input type="submit" name="submit" value="Next">
-        </div>
-
-      <% end %>
-    </article>
+    <% end %>
   </main>
 <% end %>