diff --git a/app/assets/stylesheets/check-your-answers.scss b/app/assets/stylesheets/check-your-answers.scss
index 6a9045b9c0..0148609621 100644
--- a/app/assets/stylesheets/check-your-answers.scss
+++ b/app/assets/stylesheets/check-your-answers.scss
@@ -45,6 +45,7 @@
   border-top: 3px solid #000000;
   border-bottom: 1px solid #000000;
   font-weight: bold;
+
   @include govuk-media-query($from: tablet) {
     display: table-row;
   }
@@ -70,6 +71,10 @@
   }
 }
 
-.print-no-break > .govuk-body {
+.print-no-break>.govuk-body {
   word-wrap: break-word;
 }
+
+.govuk-summary-card {
+  break-inside: avoid;
+}
diff --git a/app/views/shared/_application_ref.html.erb b/app/views/shared/_application_ref.html.erb
index 1a5170112c..7632c3c73b 100644
--- a/app/views/shared/_application_ref.html.erb
+++ b/app/views/shared/_application_ref.html.erb
@@ -1,18 +1,10 @@
-<dl class="govuk-summary-list govuk-summary-list--no-border">
-  <div class="govuk-summary-list__row">
-    <dt class="govuk-summary-list__key">
-      <%= t(".apply_ref") %>
-    </dt>
-    <dd class="govuk-summary-list__value">
-      <%= legal_aid_application.application_ref %>
-    </dd>
-  </div>
-  <div class="govuk-summary-list__row">
-    <dt class="govuk-summary-list__key">
-      <%= t(".ccms_ref_html") %>
-    </dt>
-    <dd class="govuk-summary-list__value">
-      <%= legal_aid_application.case_ccms_reference %>
-    </dd>
-  </div>
-</dl>
+<%= govuk_summary_list(classes: "govuk-summary-list--no-border") do |summary_list| %>
+  <%= summary_list.with_row do |row| %>
+    <%= row.with_key(text: t(".apply_ref")) %>
+    <%= row.with_value(text: legal_aid_application.application_ref) %>
+  <% end %>
+  <%= summary_list.with_row do |row| %>
+    <%= row.with_key(text: t(".ccms_ref_html")) %>
+    <%= row.with_value(text: legal_aid_application.case_ccms_reference) %>
+  <% end %>
+<% end %>
diff --git a/app/views/shared/check_answers/_vehicles.html.erb b/app/views/shared/check_answers/_vehicles.html.erb
index f99f2084ae..4434c4a485 100644
--- a/app/views/shared/check_answers/_vehicles.html.erb
+++ b/app/views/shared/check_answers/_vehicles.html.erb
@@ -27,22 +27,16 @@
 
 <% if @legal_aid_application.vehicles.any? %>
   <% @legal_aid_application.vehicles.each_with_index do |vehicle, index| %>
+    <% action_link = govuk_link_to(t("generic.change"),
+                                   providers_legal_aid_application_means_vehicle_detail_path(@legal_aid_application, vehicle),
+                                   visually_hidden_suffix: t(".providers.vehicle_index", sequence: index + 1),
+                                   id: "app-check-your-answers__vehicle__#{index}_change_link") %>
     <%= govuk_summary_list(
-          card: { title: t(".providers.vehicle_index", sequence: index + 1) },
-          actions: !read_only,
+          card: { title: t(".providers.vehicle_index", sequence: index + 1),
+                  actions: read_only ? [] : [action_link] },
           html_attributes: { id: "vehicle-questions__#{index}" },
         ) do |summary_list| %>
 
-      <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__vehicle__#{index}_change_link" }) do |row| %>
-        <%= row.with_key(text: t(".providers.vehicle_index", sequence: index + 1), classes: "govuk-!-width-one-half govuk-heading-m") %>
-        <%= row.with_value(text: nil) %>
-        <%= row.with_action(
-              text: t("generic.change"),
-              href: providers_legal_aid_application_means_vehicle_detail_path(@legal_aid_application, vehicle),
-              visually_hidden_text: t(".providers.vehicle_index", sequence: index + 1),
-            ) %>
-      <% end %>
-
       <% if @legal_aid_application.applicant.has_partner_with_no_contrary_interest? %>
         <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__vehicles_owner" }) do |row| %>
           <%= row.with_key(text: t(".#{journey_type}.owner"), classes: "govuk-!-width-one-half") %>