diff --git a/app/views/case_workers/court_data/_defendant.html.haml b/app/views/case_workers/court_data/_defendant.html.haml
index 8d9790b211..80f7e016c8 100644
--- a/app/views/case_workers/court_data/_defendant.html.haml
+++ b/app/views/case_workers/court_data/_defendant.html.haml
@@ -15,31 +15,31 @@
         %li.govuk-summary-card__action
           = govuk_link_to t('.court_data_link'), "#{ENV.fetch('VIEW_COURT_DATA_URL', nil)}/laa_references/new?id=#{defendant.hmcts.id}&urn=#{case_number}", target: :_blank
     .govuk-summary-card__content
-      %dl.govuk-summary-list
-        .govuk-summary-list__row
+      .govuk-summary-list
+        %dl.govuk-summary-list__row
           %dt.govuk-summary-list__key
             = t('.name')
           %dd.govuk-summary-list__value
             = defendant.hmcts.name
-        .govuk-summary-list__row
+        %dl.govuk-summary-list__row
           %dt.govuk-summary-list__key
             = t('.maat_reference')
           %dd.govuk-summary-list__value
             = defendant.maat_reference
         - if defendant.hmcts.start.present?
-          .govuk-summary-list__row
+          %dl.govuk-summary-list__row
             %dt.govuk-summary-list__key
               = t('.start_date')
             %dd.govuk-summary-list__value
               = defendant.hmcts.start.strftime(Settings.date_format)
         - if defendant.hmcts.end.present?
-          .govuk-summary-list__row
+          %dl.govuk-summary-list__row
             %dt.govuk-summary-list__key
               = t('.end_date')
             %dd.govuk-summary-list__value
               = defendant.hmcts.end.strftime(Settings.date_format)
         - if defendant.hmcts.contract_number.present?
-          .govuk-summary-list__row
+          %dl.govuk-summary-list__row
             %dt.govuk-summary-list__key
               = t('.contract_number')
             %dd.govuk-summary-list__value
diff --git a/app/views/shared/_new_claim.html.haml b/app/views/shared/_new_claim.html.haml
index 15a7b1bec9..fdb85a2aed 100644
--- a/app/views/shared/_new_claim.html.haml
+++ b/app/views/shared/_new_claim.html.haml
@@ -7,7 +7,8 @@
       = t('shared.claim.claim_type')
 
   .govuk-summary-card__content
-    %dl.govuk-summary-list
+    .govuk-summary-list
+
     = render partial: 'shared/new_claim_and_case_type_details', locals: { claim: claim }
 
     - if claim.agfs? && claim.case_type.present? && claim.requires_cracked_dates?
diff --git a/app/views/shared/_new_claim_and_case_type_details.html.haml b/app/views/shared/_new_claim_and_case_type_details.html.haml
index 06f261222b..a0a1d5b0b3 100644
--- a/app/views/shared/_new_claim_and_case_type_details.html.haml
+++ b/app/views/shared/_new_claim_and_case_type_details.html.haml
@@ -1,21 +1,21 @@
 - unless claim.providers_ref.blank?
   %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
-      = t('shared.claim.provider_reference')
+      = t('.provider_reference')
     %dd.govuk-summary-list__value
       = claim.providers_ref
 
 - unless claim.draft?
   %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
-      = t('shared.claim.claim_submitted')
+      = t('.claim_submitted')
     %dd.govuk-summary-list__value
       = claim.submitted_at
 
 - if claim.case_workers.any? && current_user_is_caseworker? && current_user.persona.admin?
   %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
-      = t('shared.claim.assignee')
+      = t('.assignee')
     %dd.govuk-summary-list__value
       = claim.case_worker_names
 
@@ -53,7 +53,7 @@
 
 %dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
-    = t('shared.claim.case_num')
+    = t('.case_num')
   %dd.govuk-summary-list__value
     = claim.case_number
     %span.unique-id-small
@@ -74,14 +74,14 @@
 - if claim.case_stage
   %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
-      = t('shared.claim.case_stage')
+      = t('.case_stage')
     %dd.govuk-summary-list__value
       = claim.case_stage&.description
 
 - if claim.display_case_type?
   %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
-      = t('shared.claim.case_type')
+      = t('.case_type')
     %dd.govuk-summary-list__value
       = claim.case_type&.name
 
diff --git a/app/views/shared/_new_claim_case_concluded_at_details.html.haml b/app/views/shared/_new_claim_case_concluded_at_details.html.haml
index 548e1a6149..66bece0c9a 100644
--- a/app/views/shared/_new_claim_case_concluded_at_details.html.haml
+++ b/app/views/shared/_new_claim_case_concluded_at_details.html.haml
@@ -1,4 +1,4 @@
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t('external_users.claims.case_details.case_concluded_date.case_concluded_at')
   %dd.govuk-summary-list__value
diff --git a/app/views/shared/_new_claim_cracked_trial_details.html.haml b/app/views/shared/_new_claim_cracked_trial_details.html.haml
index 36bfa6fd15..836e8d6c6d 100644
--- a/app/views/shared/_new_claim_cracked_trial_details.html.haml
+++ b/app/views/shared/_new_claim_cracked_trial_details.html.haml
@@ -6,25 +6,25 @@
 - else
   - trial_cracked_at_third_key = t("#{cracked_trial_detail_translations}.trial_cracked_at_third.default")
 
-  .govuk-summary-list__row.summary-page-table-two-row
+  %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
       = t("#{cracked_trial_detail_translations}.trial_fixed_notice_at")
     %dd.govuk-summary-list__value
       = claim.trial_fixed_notice_at.strftime(Settings.date_format) rescue ''
 
-  .govuk-summary-list__row.summary-page-table-two-row
+  %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
       = t("#{cracked_trial_detail_translations}.trial_fixed_at")
     %dd.govuk-summary-list__value
       = claim.trial_fixed_at.strftime(Settings.date_format) rescue ''
 
-  .govuk-summary-list__row.summary-page-table-two-row
+  %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
       = t("#{cracked_trial_detail_translations}.trial_cracked_at")
     %dd.govuk-summary-list__value
       = claim.trial_cracked_at.strftime(Settings.date_format) rescue ''
 
-  .govuk-summary-list__row.summary-page-table-two-row
+  %dl.govuk-summary-list__row.summary-page-table-two-row
     %dt.govuk-summary-list__key
       = trial_cracked_at_third_key
     %dd.govuk-summary-list__value
diff --git a/app/views/shared/_new_claim_interim_details.html.haml b/app/views/shared/_new_claim_interim_details.html.haml
index dabbd8a17c..96262d8913 100644
--- a/app/views/shared/_new_claim_interim_details.html.haml
+++ b/app/views/shared/_new_claim_interim_details.html.haml
@@ -1,74 +1,74 @@
 - fee = present(claim.interim_fee)
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t('shared.summary.fee_type')
   %dd.govuk-summary-list__value
     = fee.fee_type.description
 
 - if fee.is_interim_warrant?
-  %dl.govuk-summary-list
-    .govuk-summary-list__row.summary-page-table-two-row
+  .govuk-summary-list
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.warrant_fee.date_issued')
       %dd.govuk-summary-list__value
         = fee.warrant_issued_date
 
 - if fee.warrant_executed_date.present?
-  %dl.govuk-summary-list
-    .govuk-summary-list__row.summary-page-table-two-row
+  .govuk-summary-list
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.warrant_fee.date_executed')
       %dd.govuk-summary-list__value
         = fee.warrant_executed_date
 - else
   - unless fee.is_disbursement?
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.ppe_total')
       %dd.govuk-summary-list__value
         = fee.quantity
   - if fee.is_effective_pcmh?
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.effective_pcmh_date')
       %dd.govuk-summary-list__value
         = fee.effective_pcmh_date
 
   - if fee.is_trial_start?
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.trial_start')
       %dd.govuk-summary-list__value
         = fee.first_day_of_trial
 
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.estimated_trial_length')
       %dd.govuk-summary-list__value
         = fee.estimated_trial_length
 
   - if fee.is_retrial_start?
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.retrial_start')
       %dd.govuk-summary-list__value
         = fee.retrial_started_at
 
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.estimated_retrial_length')
       %dd.govuk-summary-list__value
         = fee.retrial_estimated_length
 
   - if fee.is_retrial_new_solicitor?
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.legal_aid_transfer_date')
       %dd.govuk-summary-list__value
         = fee.legal_aid_transfer_date
 
-    .govuk-summary-list__row.summary-page-table-two-row
+    %dl.govuk-summary-list__row.summary-page-table-two-row
       %dt.govuk-summary-list__key
         = t('shared.summary.trial_concluded_at')
       %dd.govuk-summary-list__value
diff --git a/app/views/shared/_new_claim_transfer_details.html.haml b/app/views/shared/_new_claim_transfer_details.html.haml
index 9a37551207..75b5c381dc 100644
--- a/app/views/shared/_new_claim_transfer_details.html.haml
+++ b/app/views/shared/_new_claim_transfer_details.html.haml
@@ -1,24 +1,24 @@
 - trial_detail_translations = 'external_users.claims.case_details.trial_detail_fields'
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.first_day_of_trial")
   %dd.govuk-summary-list__value
     = claim.first_day_of_trial.strftime(Settings.date_format) rescue ''
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.estimated_trial_length")
   %dd.govuk-summary-list__value
     = claim.estimated_trial_length rescue ''
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.actual_trial_length")
   %dd.govuk-summary-list__value
     = claim.estimated_trial_length rescue ''
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.trial_concluded_at")
   %dd.govuk-summary-list__value
diff --git a/app/views/shared/_new_claim_trial_details.html.haml b/app/views/shared/_new_claim_trial_details.html.haml
index 9a37551207..75b5c381dc 100644
--- a/app/views/shared/_new_claim_trial_details.html.haml
+++ b/app/views/shared/_new_claim_trial_details.html.haml
@@ -1,24 +1,24 @@
 - trial_detail_translations = 'external_users.claims.case_details.trial_detail_fields'
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.first_day_of_trial")
   %dd.govuk-summary-list__value
     = claim.first_day_of_trial.strftime(Settings.date_format) rescue ''
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.estimated_trial_length")
   %dd.govuk-summary-list__value
     = claim.estimated_trial_length rescue ''
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.actual_trial_length")
   %dd.govuk-summary-list__value
     = claim.estimated_trial_length rescue ''
 
-.govuk-summary-list__row.summary-page-table-two-row
+%dl.govuk-summary-list__row.summary-page-table-two-row
   %dt.govuk-summary-list__key
     = t("#{trial_detail_translations}.trial_concluded_at")
   %dd.govuk-summary-list__value