diff --git a/fahari/templates/fragments/atoms/sims/question_display.html b/fahari/templates/fragments/atoms/sims/question_display.html
index 990e82f7..a9e45d11 100644
--- a/fahari/templates/fragments/atoms/sims/question_display.html
+++ b/fahari/templates/fragments/atoms/sims/question_display.html
@@ -21,14 +21,13 @@
                 <div class="row mt-3 mb-0 pt-2">
                     <div class="col-sm-1"></div>
                     <div class="col-sm-7 border-left border-secondary">
-                        {{ question.precedence }}.
-                        {% include "fragments/atoms/sims/question_details_and_comment_block.html" %}
+                        {% include "fragments/atoms/sims/sub_question_details_and_comment_block.html" %}
                     </div>
                     <div class="col-sm-1">
                         <!-- This empty column acts as spacer between the answer and the question. -->
                     </div>
                     <div class="col-sm-3">
-                        {% include "fragments/atoms/sims/capture_question_answer_block.html" %}
+                        {% include "fragments/atoms/sims/sub_question_capture_question_answer_block.html" %}
                     </div>
                 </div>
             {% endfor %}
diff --git a/fahari/templates/fragments/atoms/sims/sub_question_capture_question_answer_block.html b/fahari/templates/fragments/atoms/sims/sub_question_capture_question_answer_block.html
new file mode 100644
index 00000000..1512d26d
--- /dev/null
+++ b/fahari/templates/fragments/atoms/sims/sub_question_capture_question_answer_block.html
@@ -0,0 +1,11 @@
+{% load static i18n compress %}
+<div class="row">
+    <div class="col">
+        {% include "fragments/atoms/sims/capture_question_answer_block.html" %}
+    </div>
+</div>
+{% with question as parent_question %}
+    {% for question in parent_question.sub_questions.active.by_precedence %}
+        {% include "fragments/atoms/sims/sub_question_capture_question_answer_block.html" %}
+    {% endfor %}
+{% endwith %}
diff --git a/fahari/templates/fragments/atoms/sims/sub_question_details_and_comment_block.html b/fahari/templates/fragments/atoms/sims/sub_question_details_and_comment_block.html
new file mode 100644
index 00000000..4c6f3f6e
--- /dev/null
+++ b/fahari/templates/fragments/atoms/sims/sub_question_details_and_comment_block.html
@@ -0,0 +1,11 @@
+{% load static i18n compress %}
+    {{ question.precedence }}.
+    {% include "fragments/atoms/sims/question_details_and_comment_block.html" %}
+
+<div class="col border-left border-secondary">
+    {% with question as parent_question %}
+        {% for question in parent_question.sub_questions.active.by_precedence %}
+            {% include "fragments/atoms/sims/sub_question_details_and_comment_block.html" %}
+        {% endfor %}
+    {% endwith %}
+</div>