diff --git a/app/views/import/cleans/show.html.erb b/app/views/import/cleans/show.html.erb
index 89cd0cd9..efce906c 100644
--- a/app/views/import/cleans/show.html.erb
+++ b/app/views/import/cleans/show.html.erb
@@ -11,13 +11,13 @@
   </div>
 
   <% if @import.cleaned? %>
-    <div class="bg-container border border-tertiary rounded-lg p-3 flex items-center justify-between">
+    <div class="bg-container border border-tertiary rounded-lg p-3 flex flex-col md:flex-row items-start md:items-center justify-between gap-2 md:gap-0">
       <div class="flex items-center gap-2">
         <%= lucide_icon "check-circle", class: "w-4 h-4 text-green-500" %>
-        <p class="text-green-500">Your data has been cleaned</p>
+        <p class="text-green-500 text-sm md:text-base">Your data has been cleaned</p>
       </div>
 
-      <%= link_to "Next step", import_confirm_path(@import), class: "btn btn--primary" %>
+      <%= link_to "Next step", import_confirm_path(@import), class: "btn btn--primary w-full md:w-auto" %>
     </div>
   <% else %>
     <div class="bg-container border border-tertiary rounded-lg p-3 flex flex-col md:flex-row items-start md:items-center justify-between gap-3 md:gap-0">
diff --git a/app/views/import/confirms/_mappings.html.erb b/app/views/import/confirms/_mappings.html.erb
index f5819160..659c2895 100644
--- a/app/views/import/confirms/_mappings.html.erb
+++ b/app/views/import/confirms/_mappings.html.erb
@@ -1,45 +1,58 @@
 <%# locals: (import:, mapping_class:, step_idx:) %>
 
+
 <% mappings = mapping_class.for_import(import) %>
 <% is_last_step = step_idx == import.mapping_steps.count - 1 %>
 
-<% if mapping_class == Import::AccountMapping && import.account.nil? %>
-  <% if import.requires_account? %>
-    <div class="flex items-center justify-between p-4 mb-4 gap-4 text-secondary bg-red-100 border border-red-200 rounded-lg w-[650px]">
-      <%= tag.p t(".no_accounts"), class: "text-sm" %>
-
-      <%= link_to t(".create_account"), new_account_path(return_to: import_confirm_path(import)), class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
-    </div>
-  <% elsif import.has_unassigned_account? %>
-    <div class="flex items-center justify-between p-4 mb-4 gap-4 text-secondary bg-yellow-100 border border-yellow-200 rounded-lg w-[650px]">
-      <%= tag.p t(".unassigned_account"), class: "text-sm" %>
-
-      <%= link_to t(".create_account"), new_account_path(return_to: import_confirm_path(import)), class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
-    </div>
-  <% end %>
-<% end %>
-
-<div class="space-y-4">
-  <div class="bg-container-inset rounded-xl p-1 space-y-1 w-[650px]">
-    <div class="grid grid-cols-3 gap-2 text-xs font-medium text-secondary uppercase px-5 py-3">
-      <p><%= t(".csv_mapping_label", mapping: mapping_label(mapping_class)) %></p>
-      <p><%= t(".maybe_mapping_label", mapping: mapping_label(mapping_class)) %></p>
-      <p class="justify-self-end"><%= t(".rows_label") %></p>
-    </div>
-
-    <div class="shadow-border-xs rounded-md divide-y divide-alpha-black-100 text-sm">
-      <% mappings.sort_by(&:key).each do |mapping| %>
-        <div class="px-5 py-3 bg-container first:rounded-tl-xl first:rounded-tr-xl last:rounded-bl-xl last:rounded-br-xl">
-          <%= render partial: "import/mappings/form", locals: { mapping: mapping } %>
+<div class="w-full max-w-full">
+  <% if mapping_class == Import::AccountMapping && import.account.nil? %>
+    <% if import.requires_account? %>
+      <div class="w-full max-w-full overflow-hidden mb-4">
+        <div class="overflow-x-auto">
+          <div class="flex items-center justify-between p-4 gap-4 text-secondary bg-red-100 border border-red-200 rounded-lg w-[650px] min-w-0">
+            <%= tag.p t(".no_accounts"), class: "text-sm" %>
+            <%= link_to t(".create_account"), new_account_path(return_to: import_confirm_path(import)), class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
+          </div>
         </div>
+      </div>
+    <% elsif import.has_unassigned_account? %>
+      <div class="w-full max-w-full overflow-hidden mb-4">
+        <div class="overflow-x-auto">
+          <div class="flex items-center justify-between p-4 gap-4 text-secondary bg-yellow-100 border border-yellow-200 rounded-lg w-[650px] min-w-0">
+            <%= tag.p t(".unassigned_account"), class: "text-sm" %>
+            <%= link_to t(".create_account"), new_account_path(return_to: import_confirm_path(import)), class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+
+  <div class="space-y-4 w-full max-w-full">
+    <div class="w-full max-w-full overflow-hidden">
+      <div class="overflow-x-auto">
+        <div class="bg-container-inset rounded-xl p-1 space-y-1 w-[650px] min-w-0">
+          <div class="grid grid-cols-3 gap-2 text-xs font-medium text-secondary uppercase px-5 py-3">
+            <p><%= t(".csv_mapping_label", mapping: mapping_label(mapping_class)) %></p>
+            <p><%= t(".maybe_mapping_label", mapping: mapping_label(mapping_class)) %></p>
+            <p class="justify-self-end"><%= t(".rows_label") %></p>
+          </div>
+
+          <div class="shadow-border-xs rounded-md divide-y divide-alpha-black-100 text-sm">
+            <% mappings.sort_by(&:key).each do |mapping| %>
+              <div class="px-5 py-3 bg-container first:rounded-tl-xl first:rounded-tr-xl last:rounded-bl-xl last:rounded-br-xl">
+                <%= render partial: "import/mappings/form", locals: { mapping: mapping } %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="flex justify-center w-full">
+      <%= link_to is_last_step ? import_path(import) : url_for(step: step_idx + 2), class: "btn btn--primary w-full md:w-36 flex items-center justify-between gap-2" do %>
+        <span>Next</span>
+        <%= lucide_icon "arrow-right", class: "w-5 h-5" %>
       <% end %>
     </div>
   </div>
-
-  <div class="flex justify-center">
-    <%= link_to is_last_step ? import_path(import) : url_for(step: step_idx + 2), class: "btn btn--primary w-36 flex items-center justify-between gap-2" do %>
-      <span>Next</span>
-      <%= lucide_icon "arrow-right", class: "w-5 h-5" %>
-    <% end %>
-  </div>
 </div>