diff --git a/app/components/check_answers_summary_list_card_component.html.erb b/app/components/check_answers_summary_list_card_component.html.erb
index c93f28b60..c2e3c8ee5 100644
--- a/app/components/check_answers_summary_list_card_component.html.erb
+++ b/app/components/check_answers_summary_list_card_component.html.erb
@@ -1,25 +1,37 @@
-<div class="check-answers-summary-list">
-<%= govuk_summary_list do |summary_list| %>
-  <% applicable_questions.each do |question| %>
-    <% summary_list.row do |row| %>
-      <% row.key { question.check_answer_label.to_s.presence || question.header.to_s } %>
-      <% row.value do %>
-        <span class="govuk-!-margin-right-4"><%= get_answer_label(question) %></span>
-        <% extra_value = question.get_extra_check_answer_value(case_log) %>
-        <% if extra_value %>
-          <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= extra_value %></span>
-        <% end %>
-        <br>
-        <% question.get_inferred_answers(case_log).each do |inferred_answer| %>
-          <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
+<div class="x-govuk-summary-card govuk-!-margin-bottom-6">
+  <% if applicable_questions.first.check_answers_card_number != 0 %>
+    <div class="x-govuk-summary-card__header">
+      <% if applicable_questions.first.check_answers_card_number == 1 %>
+        <h3 class="x-govuk-summary-card__title">Lead tenant</h3>
+      <% end %>
+      <% if applicable_questions.first.check_answers_card_number > 1 %>
+        <h3 class="x-govuk-summary-card__title">Person <%= applicable_questions.first.check_answers_card_number %></h3>
+      <% end %>
+    </div>
+  <% end %>
+  <div class="x-govuk-summary-card__body">
+    <%= govuk_summary_list do |summary_list| %>
+      <% applicable_questions.each do |question| %>
+        <% summary_list.row do |row| %>
+          <% row.key { question.check_answer_label.to_s.presence || question.header.to_s } %>
+          <% row.value do %>
+            <span class="govuk-!-margin-right-4"><%= get_answer_label(question) %></span>
+            <% extra_value = question.get_extra_check_answer_value(case_log) %>
+            <% if extra_value %>
+              <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= extra_value %></span>
+            <% end %>
+            <br>
+            <% question.get_inferred_answers(case_log).each do |inferred_answer| %>
+              <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
+            <% end %>
+          <% end %>
+          <% row.action(
+            text: question.action_text(case_log),
+            href: question.action_href(case_log, question.page.id),
+            visually_hidden_text: question.check_answer_label.to_s.downcase,
+          ) %>
         <% end %>
       <% end %>
-      <% row.action(
-        text: question.action_text(case_log),
-        href: question.action_href(case_log, question.page.id),
-        visually_hidden_text: question.check_answer_label.to_s.downcase,
-      ) %>
     <% end %>
-  <% end %>
-<% end %>
+  </div>
 </div>
diff --git a/app/helpers/check_answers_helper.rb b/app/helpers/check_answers_helper.rb
index f412c5464..760c08ab0 100644
--- a/app/helpers/check_answers_helper.rb
+++ b/app/helpers/check_answers_helper.rb
@@ -41,4 +41,8 @@ private
   def total_applicable_questions(subsection, case_log, current_user)
     subsection.applicable_questions(case_log).reject { |q| q.hidden_in_check_answers?(case_log, current_user) }
   end
+
+  def get_answer_label(question, case_log)
+    question.answer_label(case_log).presence || "<span class=\"app-!-colour-muted\">You didn’t answer this question</span>".html_safe
+  end
 end
diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb
index abd0ed914..3e8dd5815 100644
--- a/app/views/form/check_answers.html.erb
+++ b/app/views/form/check_answers.html.erb
@@ -17,11 +17,15 @@
     <% end %>
     <%= display_answered_questions_summary(subsection, @case_log, current_user) %>
 
-    <% subsection.applicable_questions(@case_log).group_by(&:check_answers_card_number).values.each do |question_group| %>
-      <%= render CheckAnswersSummaryListCardComponent.new(questions: question_group, case_log: @case_log, user: current_user) %>
-      <br>
-      <br>
-      <br>
+    <% if subsection.id == "household_characteristics" %>
+      <% subsection.applicable_questions(@case_log).group_by(&:check_answers_card_number).values.each do |question_group| %>
+        <%= render CheckAnswersSummaryListCardComponent.new(questions: question_group, case_log: @case_log, user: current_user) %>
+      <% end %>
+    <% else %>
+      <%= render partial: "form/check_answers_summary_list", locals: {
+        subsection:,
+        case_log: @case_log,
+      } %>
     <% end %>
 
     <%= form_with model: @case_log, method: "get" do |f| %>
diff --git a/app/views/form/review.html.erb b/app/views/form/review.html.erb
index ec1db6f2a..3c8777359 100644
--- a/app/views/form/review.html.erb
+++ b/app/views/form/review.html.erb
@@ -21,7 +21,10 @@
             <h3 class="x-govuk-summary-card__title"><%= subsection.label %></h3>
           </div>
           <div class="x-govuk-summary-card__body">
-           <%= render CheckAnswersSummaryListCardComponent.new(questions: subsection.applicable_questions(@case_log), case_log: @case_log, user: current_user) %>
+            <%= render partial: "form/check_answers_summary_list", locals: {
+              subsection:,
+              case_log: @case_log,
+            } %>
           </div>
         </div>
       <% end %>
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 10d0e93e3..d22cdde81 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1205,6 +1205,7 @@
                   }
                 },
                 "age1": {
+                  "check_answers_card_number": 1,
                   "header": "Age",
                   "check_answer_label": "Lead tenant’s age",
                   "type": "numeric",
@@ -1423,7 +1424,7 @@
               "questions": {
                 "ethnic_group": {
                   "check_answer_label": "Lead tenant’s ethnic group",
-                  "check_answers_card_number": 0,
+                  "check_answers_card_number": 1,
                   "header": "What is the lead tenant’s ethnic group?",
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
                   "type": "radio",
@@ -1459,6 +1460,7 @@
               "description": "",
               "questions": {
                 "ethnic": {
+                  "check_answers_card_number": 1,
                   "check_answer_label": "Lead tenant’s ethnic background",
                   "header": "Which of the following best describes the lead tenant’s Arab background?",
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
@@ -1480,6 +1482,7 @@
               "description": "",
               "questions": {
                 "ethnic": {
+                  "check_answers_card_number": 1,
                   "check_answer_label": "Lead tenant’s ethnic background",
                   "header": "Which of the following best describes the lead tenant’s Asian or Asian British background?",
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
@@ -1510,6 +1513,7 @@
               "description": "",
               "questions": {
                 "ethnic": {
+                  "check_answers_card_number": 1,
                   "check_answer_label": "Lead tenant’s ethnic background",
                   "header": "Which of the following best describes the lead tenant’s Black, African, Caribbean or Black British background?",
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
@@ -1534,6 +1538,7 @@
               "description": "",
               "questions": {
                 "ethnic": {
+                  "check_answers_card_number": 1,
                   "check_answer_label": "Lead tenant’s ethnic background",
                   "header": "Which of the following best describes the lead tenant’s Mixed or Multiple ethnic groups background?",
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
@@ -1561,6 +1566,7 @@
               "description": "",
               "questions": {
                 "ethnic": {
+                  "check_answers_card_number": 1,
                   "check_answer_label": "Lead tenant’s ethnic background",
                   "header": "Which of the following best describes the lead tenant’s White background?",
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
@@ -1588,6 +1594,7 @@
               "description": "",
               "questions": {
                 "national": {
+                  "check_answers_card_number": 1,
                   "check_answer_label": "Lead tenant’s nationality",
                   "header": "What is the lead tenant’s nationality?",
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
@@ -1657,7 +1664,7 @@
                 "ecstat1": {
                   "check_answer_label": "Lead tenant’s working situation",
                   "header": "Which of these best describes the lead tenant’s working situation?",
-                  "check_answers_card_number": 0,
+                  "check_answers_card_number": 1,
                   "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
                   "type": "radio",
                   "answer_options": {
@@ -1795,7 +1802,7 @@
               "questions": {
                 "details_known_2": {
                   "check_answer_label": "Details known for person 2",
-                  "check_answers_card_number": 1,
+                  "check_answers_card_number": 2,
                   "header": "Do you know details for person 2?",
                   "hint_text": "You must provide details for everyone in the household if you know them.",
                   "type": "radio",
@@ -1839,7 +1846,7 @@
               "questions": {
                 "relat2": {
                   "check_answer_label": "Person 2’s relationship to the lead tenant",
-                  "check_answers_card_number": 1,
+                  "check_answers_card_number": 2,
                   "header": "What is person 2’s relationship to the lead tenant?",
                   "hint_text": "",
                   "type": "radio",
@@ -2013,7 +2020,7 @@
                 "sex2": {
                   "check_answer_label": "Person 2’s gender identity",
                   "header": "Which of these best describes person 2’s gender identity?",
-                  "check_answers_card_number": 1,
+                  "check_answers_card_number": 2,
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
@@ -2135,7 +2142,7 @@
               "questions": {
                 "ecstat2": {
                   "check_answer_label": "Person 2’s working situation",
-                  "check_answers_card_number": 1,
+                  "check_answers_card_number": 2,
                   "header": "Which of these best describes person 2’s working situation?",
                   "hint_text": "",
                   "type": "radio",