diff --git a/app/views/claims/sign_in_or_continue.html.erb b/app/views/claims/sign_in_or_continue.html.erb
index 51fe66e75f..21febc3e60 100644
--- a/app/views/claims/sign_in_or_continue.html.erb
+++ b/app/views/claims/sign_in_or_continue.html.erb
@@ -1,23 +1,22 @@
-<%= link_to "Back", landing_page_path, class: "govuk-back-link" %>
-<main class="govuk-main-wrapper govuk-main-wrapper--auto-spacing" id="main-content">
+<% @backlink_path = landing_page_path %>
+
+<% if @form.errors.any? %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <% if @form.errors.any? %>
-        <%= render(
-          "shared/error_summary",
-          instance: @form,
-          errored_field_id_overrides: { details_check: "claim_details_check_true" }
-        ) %>
-      <% end %>
+      <%= render(
+        "shared/error_summary",
+        instance: @form,
+        errored_field_id_overrides: { details_check: "claim_details_check_true" }) %>
     </div>
   </div>
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds govuk-body">
-      <% if @form.signed_in_with_dfe_identity? %>
-        <%= render partial: "confirm_detail", locals: { form: @form } %>
-      <% else %>
-        <%= render partial: "sign_in_or_continue" %>
-      <% end %>
-    </div>
+<% end %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds govuk-body">
+    <% if @form.signed_in_with_dfe_identity? %>
+      <%= render partial: "confirm_detail", locals: { form: @form } %>
+    <% else %>
+      <%= render partial: "sign_in_or_continue" %>
+    <% end %>
   </div>
-</main>
+</div>
diff --git a/app/views/shared/_backlink.html.erb b/app/views/shared/_backlink.html.erb
index 3c56980c76..3a8f04327d 100644
--- a/app/views/shared/_backlink.html.erb
+++ b/app/views/shared/_backlink.html.erb
@@ -1,3 +1,3 @@
 <% if @backlink_path.present? %>
-  <%= link_to 'Back', @backlink_path, class: "govuk-back-link", id: "backlink" %>
+  <%= govuk_back_link href: @backlink_path %>
 <% end %>