diff --git a/app/assets/stylesheets/darkswarm/split-checkout.scss b/app/assets/stylesheets/darkswarm/split-checkout.scss
index 8831099d6c..f9d0ee3899 100644
--- a/app/assets/stylesheets/darkswarm/split-checkout.scss
+++ b/app/assets/stylesheets/darkswarm/split-checkout.scss
@@ -48,10 +48,13 @@
 }
 
 .checkout-step {
-  margin-right: auto;
-  margin-left: auto;
   margin-top: 3rem;
 
+  .medium-6, .medium-10 {
+    margin-right: auto;
+    margin-left: auto;
+  }
+
   .checkout-substep {
     margin-bottom: 1rem;
     margin-top: 5rem;
diff --git a/app/views/split_checkout/_details.html.haml b/app/views/split_checkout/_details.html.haml
index d4eb29cee6..0642870cbe 100644
--- a/app/views/split_checkout/_details.html.haml
+++ b/app/views/split_checkout/_details.html.haml
@@ -1,151 +1,152 @@
-= f.fields :bill_address, model: @order.bill_address do |bill_address|
-  %div.checkout-substep
-    -# YOUR DETAILS
+.medium-6
+  = f.fields :bill_address, model: @order.bill_address do |bill_address|
+    %div.checkout-substep
+      -# YOUR DETAILS
+      %div.checkout-title
+        = t("split_checkout.step1.your_details.title")
+
+      %div.checkout-input
+        = bill_address.label :firstname, t("split_checkout.step1.your_details.first_name.label")
+        = bill_address.text_field :firstname, { placeholder: t("split_checkout.step1.your_details.first_name.placeholder") }
+        = f.error_message_on "bill_address.firstname"
+
+      %div.checkout-input
+        = bill_address.label :lastname, t("split_checkout.step1.your_details.last_name.label")
+        = bill_address.text_field :lastname, { placeholder: t("split_checkout.step1.your_details.last_name.placeholder") }
+        = f.error_message_on "bill_address.lastname"
+
+      %div.checkout-input
+        = f.label :email, t("split_checkout.step1.your_details.email.label")
+        = f.text_field :email, { placeholder: t("split_checkout.step1.your_details.email.placeholder") }
+        = f.error_message_on :email
+
+      %div.checkout-input
+        = bill_address.label :phone, t("split_checkout.step1.your_details.phone.label")
+        = bill_address.text_field :phone, { placeholder: t("split_checkout.step1.your_details.phone.placeholder") }
+        = f.error_message_on "bill_address.phone"
+
+    %div.checkout-substep{ "data-controller": "dependant-select", "data-dependant-select-options-value": @countries_with_states }
+      -# BILLING ADDRESS
+      %div.checkout-title
+        = t("split_checkout.step1.billing_address.title")
+
+      %div.checkout-input
+        = bill_address.label :address1, t("split_checkout.step1.address.address1.label")
+        = bill_address.text_field :address1, { placeholder: t("split_checkout.step1.address.address1.placeholder") }
+        = f.error_message_on "bill_address.address1"
+
+      %div.checkout-input
+        = bill_address.label :address2, t("split_checkout.step1.address.address2.label")
+        = bill_address.text_field :address2, { placeholder: t("split_checkout.step1.address.address2.placeholder") }
+        = f.error_message_on "bill_address.address2"
+
+      %div.checkout-input
+        = bill_address.label :city, t("split_checkout.step1.address.city.label")
+        = bill_address.text_field :city, { placeholder: t("split_checkout.step1.address.city.placeholder") }
+        = f.error_message_on "bill_address.city"
+
+      %div.checkout-input
+        = bill_address.label :state_id, t("split_checkout.step1.address.state_id.label")
+        = bill_address.select :state_id, @countries_with_states, { }, { "data-dependant-select-target": "select" }
+
+      %div.checkout-input
+        = bill_address.label :zipcode, t("split_checkout.step1.address.zipcode.label")
+        = bill_address.text_field :zipcode, { placeholder: t("split_checkout.step1.address.zipcode.placeholder") }
+        = f.error_message_on "bill_address.zipcode"
+
+      %div.checkout-input
+        = bill_address.label :country_id, t("split_checkout.step1.address.country_id.label")
+        = bill_address.select :country_id, @countries, { selected: @order.bill_address.country_id || DefaultCountry.id }, {"data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange"}
+
+      - if spree_current_user||true
+        %div.checkout-input
+          = f.check_box :checkout_default_bill_address
+          = f.label :checkout_default_bill_address, t(:checkout_default_bill_address)
+
+  %div.checkout-substep{ "data-controller": "toggle shippingmethod" }
+    - selected_shipping_method = @order.shipping_method&.id || @shipping_method_id
+    -# DELIVERY ADDRESS
     %div.checkout-title
-      = t("split_checkout.step1.your_details.title")
+      = t("split_checkout.step1.delivery_address.title")
 
-    %div.checkout-input
-      = bill_address.label :firstname, t("split_checkout.step1.your_details.first_name.label")
-      = bill_address.text_field :firstname, { placeholder: t("split_checkout.step1.your_details.first_name.placeholder") }
-      = f.error_message_on "bill_address.firstname"
-
-    %div.checkout-input
-      = bill_address.label :lastname, t("split_checkout.step1.your_details.last_name.label")
-      = bill_address.text_field :lastname, { placeholder: t("split_checkout.step1.your_details.last_name.placeholder") }
-      = f.error_message_on "bill_address.lastname"
-
-    %div.checkout-input
-      = f.label :email, t("split_checkout.step1.your_details.email.label")
-      = f.text_field :email, { placeholder: t("split_checkout.step1.your_details.email.placeholder") }
-      = f.error_message_on :email
-
-    %div.checkout-input
-      = bill_address.label :phone, t("split_checkout.step1.your_details.phone.label")
-      = bill_address.text_field :phone, { placeholder: t("split_checkout.step1.your_details.phone.placeholder") }
-      = f.error_message_on "bill_address.phone"
-
-  %div.checkout-substep{ "data-controller": "dependant-select", "data-dependant-select-options-value": @countries_with_states }
-    -# BILLING ADDRESS
-    %div.checkout-title
-      = t("split_checkout.step1.billing_address.title")
-
-    %div.checkout-input
-      = bill_address.label :address1, t("split_checkout.step1.address.address1.label")
-      = bill_address.text_field :address1, { placeholder: t("split_checkout.step1.address.address1.placeholder") }
-      = f.error_message_on "bill_address.address1"
-
-    %div.checkout-input
-      = bill_address.label :address2, t("split_checkout.step1.address.address2.label")
-      = bill_address.text_field :address2, { placeholder: t("split_checkout.step1.address.address2.placeholder") }
-      = f.error_message_on "bill_address.address2"
-
-    %div.checkout-input
-      = bill_address.label :city, t("split_checkout.step1.address.city.label")
-      = bill_address.text_field :city, { placeholder: t("split_checkout.step1.address.city.placeholder") }
-      = f.error_message_on "bill_address.city"
-
-    %div.checkout-input
-      = bill_address.label :state_id, t("split_checkout.step1.address.state_id.label")
-      = bill_address.select :state_id, @countries_with_states, { }, { "data-dependant-select-target": "select" }
-
-    %div.checkout-input
-      = bill_address.label :zipcode, t("split_checkout.step1.address.zipcode.label")
-      = bill_address.text_field :zipcode, { placeholder: t("split_checkout.step1.address.zipcode.placeholder") }
-      = f.error_message_on "bill_address.zipcode"
-
-    %div.checkout-input
-      = bill_address.label :country_id, t("split_checkout.step1.address.country_id.label")
-      = bill_address.select :country_id, @countries, { selected: @order.bill_address.country_id || DefaultCountry.id }, {"data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange"}
-
-    - if spree_current_user||true
+    - display_ship_address = false
+    - ship_method_description = nil
+    - if selected_shipping_method == nil && @order.errors.messages_for(:base).include?("no_shipping_method_selected")
       %div.checkout-input
-        = f.check_box :checkout_default_bill_address
-        = f.label :checkout_default_bill_address, t(:checkout_default_bill_address)
-
-%div.checkout-substep{ "data-controller": "toggle shippingmethod" }
-  - selected_shipping_method = @order.shipping_method&.id || @shipping_method_id
-  -# DELIVERY ADDRESS
-  %div.checkout-title
-    = t("split_checkout.step1.delivery_address.title")
-
-  - display_ship_address = false
-  - ship_method_description = nil
-  - if selected_shipping_method == nil && @order.errors.messages_for(:base).include?("no_shipping_method_selected")
-    %div.checkout-input
-      %span.formError.standalone
-        = t("split_checkout.step1.delivery_address.errors.no_shipping_method_selected")
-  - @shipping_methods.each do |shipping_method|
-    %div.checkout-input
-      = fields_for shipping_method do |shipping_method_form|
-        = shipping_method_form.radio_button :name, shipping_method.id,
-          id: "shipping_method_#{shipping_method.id}",
-          checked: (shipping_method.id == selected_shipping_method.to_i),
-          name: "shipping_method_id",
-          "data-description": shipping_method.description,
-          "data-requireAddress": shipping_method.require_ship_address,
-          "data-action": "toggle#toggle shippingmethod#selectShippingMethod",
-          "data-toggle-show": shipping_method.require_ship_address
-        = shipping_method_form.label shipping_method.id, shipping_method.name, {for: "shipping_method_" + shipping_method.id.to_s }
-        %em.light
-          = payment_or_shipping_price(shipping_method, @order)
-        - display_ship_address = display_ship_address || (shipping_method.id == selected_shipping_method.to_i && shipping_method.require_ship_address)
-        - if shipping_method.id == selected_shipping_method.to_i
-          - ship_method_description = shipping_method.description
-
-  %div.checkout-input{"data-shippingmethod-target": "shippingMethodDescription", style: "display: #{ship_method_description == nil ? 'none' : 'block'}" }
-    #distributor_address.panel
-      %span{"data-shippingmethod-target": "shippingMethodDescriptionContent"} #{ship_method_description}
-      %br/
-      %br/
-      - if @order.order_cycle.pickup_time_for(@order.distributor)
-        = t :checkout_ready_for
-      = @order.order_cycle.pickup_time_for(@order.distributor)
-  
-  %div.checkout-input{ "data-toggle-target": "content", style: "display: #{display_ship_address ? 'block' : 'none'}" }
-    = f.check_box "Checkout.ship_address_same_as_billing", { id: "Checkout.ship_address_same_as_billing", "data-action": "shippingmethod#showHideShippingAddress", "data-shippingmethod-target": "shippingAddressCheckbox", checked: @ship_address_same_as_billing == "1" }
-    = f.label "Checkout.ship_address_same_as_billing", t(:checkout_address_same), { for: "Checkout.ship_address_same_as_billing" }
-
-  %div{"data-shippingmethod-target": "shippingMethodAddress", style: "display: #{display_ship_address == false || @ship_address_same_as_billing == "1" ? 'none' : 'block'}" }
-    = f.fields :ship_address, model: @order.ship_address do |ship_address|
+        %span.formError.standalone
+          = t("split_checkout.step1.delivery_address.errors.no_shipping_method_selected")
+    - @shipping_methods.each do |shipping_method|
       %div.checkout-input
-        = ship_address.label :address1, t("split_checkout.step1.address.address1.label")
-        = ship_address.text_field :address1, { placeholder: t("split_checkout.step1.address.address1.placeholder") }
-        = f.error_message_on "ship_address.address1"
+        = fields_for shipping_method do |shipping_method_form|
+          = shipping_method_form.radio_button :name, shipping_method.id,
+            id: "shipping_method_#{shipping_method.id}",
+            checked: (shipping_method.id == selected_shipping_method.to_i),
+            name: "shipping_method_id",
+            "data-description": shipping_method.description,
+            "data-requireAddress": shipping_method.require_ship_address,
+            "data-action": "toggle#toggle shippingmethod#selectShippingMethod",
+            "data-toggle-show": shipping_method.require_ship_address
+          = shipping_method_form.label shipping_method.id, shipping_method.name, {for: "shipping_method_" + shipping_method.id.to_s }
+          %em.light
+            = payment_or_shipping_price(shipping_method, @order)
+          - display_ship_address = display_ship_address || (shipping_method.id == selected_shipping_method.to_i && shipping_method.require_ship_address)
+          - if shipping_method.id == selected_shipping_method.to_i
+            - ship_method_description = shipping_method.description
 
-      %div.checkout-input
-        = ship_address.label :address2, t("split_checkout.step1.address.address2.label")
-        = ship_address.text_field :address2, { placeholder: t("split_checkout.step1.address.address2.placeholder") }
-        = f.error_message_on "ship_address.address2"
+    %div.checkout-input{"data-shippingmethod-target": "shippingMethodDescription", style: "display: #{ship_method_description == nil ? 'none' : 'block'}" }
+      #distributor_address.panel
+        %span{"data-shippingmethod-target": "shippingMethodDescriptionContent"} #{ship_method_description}
+        %br/
+        %br/
+        - if @order.order_cycle.pickup_time_for(@order.distributor)
+          = t :checkout_ready_for
+        = @order.order_cycle.pickup_time_for(@order.distributor)
+    
+    %div.checkout-input{ "data-toggle-target": "content", style: "display: #{display_ship_address ? 'block' : 'none'}" }
+      = f.check_box "Checkout.ship_address_same_as_billing", { id: "Checkout.ship_address_same_as_billing", "data-action": "shippingmethod#showHideShippingAddress", "data-shippingmethod-target": "shippingAddressCheckbox", checked: @ship_address_same_as_billing == "1" }
+      = f.label "Checkout.ship_address_same_as_billing", t(:checkout_address_same), { for: "Checkout.ship_address_same_as_billing" }
 
-      %div.checkout-input
-        = ship_address.label :city, t("split_checkout.step1.address.city.label")
-        = ship_address.text_field :city, { placeholder: t("split_checkout.step1.address.city.placeholder") }
-        = f.error_message_on "ship_address.city"
+    %div{"data-shippingmethod-target": "shippingMethodAddress", style: "display: #{display_ship_address == false || @ship_address_same_as_billing == "1" ? 'none' : 'block'}" }
+      = f.fields :ship_address, model: @order.ship_address do |ship_address|
+        %div.checkout-input
+          = ship_address.label :address1, t("split_checkout.step1.address.address1.label")
+          = ship_address.text_field :address1, { placeholder: t("split_checkout.step1.address.address1.placeholder") }
+          = f.error_message_on "ship_address.address1"
 
-      %div.checkout-input
-        = ship_address.label :state_id, t("split_checkout.step1.address.state_id.label")
-        = ship_address.select :state_id, @countries_with_states, { }, { "data-dependant-select-target": "select" }
+        %div.checkout-input
+          = ship_address.label :address2, t("split_checkout.step1.address.address2.label")
+          = ship_address.text_field :address2, { placeholder: t("split_checkout.step1.address.address2.placeholder") }
+          = f.error_message_on "ship_address.address2"
 
-      %div.checkout-input
-        = ship_address.label :zipcode, t("split_checkout.step1.address.zipcode.label")
-        = ship_address.text_field :zipcode, { placeholder: t("split_checkout.step1.address.zipcode.placeholder") }
-        = f.error_message_on "ship_address.zipcode"
+        %div.checkout-input
+          = ship_address.label :city, t("split_checkout.step1.address.city.label")
+          = ship_address.text_field :city, { placeholder: t("split_checkout.step1.address.city.placeholder") }
+          = f.error_message_on "ship_address.city"
 
-      %div.checkout-input
-        = ship_address.label :country_id, t("split_checkout.step1.address.country_id.label")
-        = ship_address.select :country_id, @countries, { selected: @order.ship_address.country_id || DefaultCountry.id }, {"data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange"}
+        %div.checkout-input
+          = ship_address.label :state_id, t("split_checkout.step1.address.state_id.label")
+          = ship_address.select :state_id, @countries_with_states, { }, { "data-dependant-select-target": "select" }
 
-  - if spree_current_user
-    %div.checkout-input{ "data-toggle-target": "content", style: "display: none" }
-      = f.check_box "Checkout.default_ship_address", { id: "Checkout.default_ship_address" }
-      = f.label "Checkout.default_ship_address", t(:checkout_default_ship_address), { for: "Checkout.default_ship_address" }
+        %div.checkout-input
+          = ship_address.label :zipcode, t("split_checkout.step1.address.zipcode.label")
+          = ship_address.text_field :zipcode, { placeholder: t("split_checkout.step1.address.zipcode.placeholder") }
+          = f.error_message_on "ship_address.zipcode"
+
+        %div.checkout-input
+          = ship_address.label :country_id, t("split_checkout.step1.address.country_id.label")
+          = ship_address.select :country_id, @countries, { selected: @order.ship_address.country_id || DefaultCountry.id }, {"data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange"}
+
+    - if spree_current_user
+      %div.checkout-input{ "data-toggle-target": "content", style: "display: none" }
+        = f.check_box "Checkout.default_ship_address", { id: "Checkout.default_ship_address" }
+        = f.label "Checkout.default_ship_address", t(:checkout_default_ship_address), { for: "Checkout.default_ship_address" }
 
 
-  .div.checkout-input
-    = f.label :special_instructions, t(:checkout_instructions)
-    = f.text_area :special_instructions, size: "60x4"
+    .div.checkout-input
+      = f.label :special_instructions, t(:checkout_instructions)
+      = f.text_area :special_instructions, size: "60x4"
 
-%div.checkout-submit
-  = f.submit t("split_checkout.step1.submit"), class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
-  %a.button.cancel{href: main_app.cart_path}
-    = t("split_checkout.step1.cancel")
+  %div.checkout-submit
+    = f.submit t("split_checkout.step1.submit"), class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
+    %a.button.cancel{href: main_app.cart_path}
+      = t("split_checkout.step1.cancel")
diff --git a/app/views/split_checkout/_form.html.haml b/app/views/split_checkout/_form.html.haml
index 610fabdcf6..ebe564b3b5 100644
--- a/app/views/split_checkout/_form.html.haml
+++ b/app/views/split_checkout/_form.html.haml
@@ -1,6 +1,6 @@
 - content_for :injection_data do
   = inject_saved_credit_cards
 
-%div.checkout-step.medium-6
+%div.checkout-step
   = form_with url: checkout_update_path(checkout_step), model: @order, method: :put do |f|
     = render "split_checkout/#{checkout_step}", f: f
diff --git a/app/views/split_checkout/_payment.html.haml b/app/views/split_checkout/_payment.html.haml
index b90d17aec5..4f4ded6433 100644
--- a/app/views/split_checkout/_payment.html.haml
+++ b/app/views/split_checkout/_payment.html.haml
@@ -1,26 +1,27 @@
-%div.checkout-substep{"data-controller": "paymentmethod"}
-  %div.checkout-title
-    = t("split_checkout.step2.payment_method.title")
-  - selected_payment_method = @order.payments&.with_state(:checkout)&.first&.payment_method_id
-  - available_payment_methods.each do |payment_method| 
-    %div.checkout-input
-      = f.radio_button :payment_method_id, payment_method.id,
-        name: "order[payments_attributes][][payment_method_id]",
-        id: "payment_method_#{payment_method.id}",
-        name: "order[payments_attributes][][payment_method_id]",
-        checked: (payment_method.id == selected_payment_method),
-        "data-action": "paymentmethod#selectPaymentMethod",
-        "data-paymentmethod-description": "#{payment_method.description}"
-      = f.label payment_method.id, "#{payment_method.name} (#{payment_or_shipping_price(payment_method, @order)})", {for: "payment_method_" + payment_method.id.to_s }
+.medium-6
+  %div.checkout-substep{"data-controller": "paymentmethod"}
+    %div.checkout-title
+      = t("split_checkout.step2.payment_method.title")
+    - selected_payment_method = @order.payments&.with_state(:checkout)&.first&.payment_method_id
+    - available_payment_methods.each do |payment_method| 
+      %div.checkout-input
+        = f.radio_button :payment_method_id, payment_method.id,
+          name: "order[payments_attributes][][payment_method_id]",
+          id: "payment_method_#{payment_method.id}",
+          name: "order[payments_attributes][][payment_method_id]",
+          checked: (payment_method.id == selected_payment_method),
+          "data-action": "paymentmethod#selectPaymentMethod",
+          "data-paymentmethod-description": "#{payment_method.description}"
+        = f.label payment_method.id, "#{payment_method.name} (#{payment_or_shipping_price(payment_method, @order)})", {for: "payment_method_" + payment_method.id.to_s }
 
-  %div
-    .panel{"data-paymentmethod-target": "panel", style: "display: none"} 
-      
+    %div
+      .panel{"data-paymentmethod-target": "panel", style: "display: none"} 
+        
 
-%div.checkout-substep
-  = t("split_checkout.step2.explaination")
+  %div.checkout-substep
+    = t("split_checkout.step2.explaination")
 
-%div.checkout-submit
-  = f.submit t("split_checkout.step2.submit"), class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
-  %a.button.cancel{href: main_app.checkout_step_path(:details)}
-    = t("split_checkout.step2.cancel")
+  %div.checkout-submit
+    = f.submit t("split_checkout.step2.submit"), class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
+    %a.button.cancel{href: main_app.checkout_step_path(:details)}
+      = t("split_checkout.step2.cancel")
diff --git a/app/views/split_checkout/_summary.html.haml b/app/views/split_checkout/_summary.html.haml
index db84184d30..9341a21713 100644
--- a/app/views/split_checkout/_summary.html.haml
+++ b/app/views/split_checkout/_summary.html.haml
@@ -1,107 +1,108 @@
-%div.checkout-substep
-  %div.checkout-title
-    = t("split_checkout.step3.your_details.title")
+.medium-10
+  %div.checkout-substep
+    %div.checkout-title
+      = t("split_checkout.step3.your_details.title")
 
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.your_details.first_name.label")
-    %span.summary-value
-      = @order.bill_address.firstname
-
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.your_details.last_name.label")
-    %span.summary-value
-      = @order.bill_address.lastname
-
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.your_details.email.label")
-    %span.summary-value
-      = @order.user ? @order.user.email : "Change me"
-  
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.your_details.phone.label")
-    %span.summary-value
-      = @order.bill_address.phone
-
-%div.checkout-substep
-  %div.checkout-title
-    = t("split_checkout.step3.billing_address.title")
-  
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.address.address1.label")
-    %span.summary-value
-      = @order.bill_address.address1
-  
-  - unless @order.bill_address.address2.blank?
     %div.summary
       %span.summary-label
-        = t("split_checkout.step1.address.address2.label")
+        = t("split_checkout.step1.your_details.first_name.label")
       %span.summary-value
-        = @order.bill_address.address2
+        = @order.bill_address.firstname
 
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.address.city.label")
-    %span.summary-value
-      = @order.bill_address.city
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.your_details.last_name.label")
+      %span.summary-value
+        = @order.bill_address.lastname
 
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.address.state_id.label")
-    %span.summary-value
-      = @order.bill_address.state
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.your_details.email.label")
+      %span.summary-value
+        = @order.user ? @order.user.email : "Change me"
+    
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.your_details.phone.label")
+      %span.summary-value
+        = @order.bill_address.phone
 
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.address.zipcode.label")
-    %span.summary-value
-      = @order.bill_address.zipcode
+  %div.checkout-substep
+    %div.checkout-title
+      = t("split_checkout.step3.billing_address.title")
+    
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.address.address1.label")
+      %span.summary-value
+        = @order.bill_address.address1
+    
+    - unless @order.bill_address.address2.blank?
+      %div.summary
+        %span.summary-label
+          = t("split_checkout.step1.address.address2.label")
+        %span.summary-value
+          = @order.bill_address.address2
 
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.billing_address.country.label")
-    %span.summary-value
-      = @order.bill_address.country
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.address.city.label")
+      %span.summary-value
+        = @order.bill_address.city
 
-%div.checkout-substep
-  %div.checkout-title
-    = t("split_checkout.step3.delivery_info.title")
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.address.state_id.label")
+      %span.summary-value
+        = @order.bill_address.state
 
-  %div.summary
-    %span.summary-label
-      = t("split_checkout.step1.delivery_address.title")
-    %span.summary-value
-      = @order.shipping_method.name
-    %div
-    = @order.shipping_method.description
-  
-    %a.summary-edit{href: main_app.checkout_step_path(:details)}
-      = t("split_checkout.step3.your_details.edit")
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.address.zipcode.label")
+      %span.summary-value
+        = @order.bill_address.zipcode
 
-%div.checkout-substep
-  %div.checkout-title
-    = t("split_checkout.step3.payment_method.title")
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.billing_address.country.label")
+      %span.summary-value
+        = @order.bill_address.country
 
-  %div.summary
-    %span.summary-value
-      = last_payment_method(@order)&.name
-      %p.text-small.text-skinny.pre-line
-        %em= last_payment_method(@order)&.description
-    %a.summary-edit{href: main_app.checkout_step_path(:payment)}
-      = t("split_checkout.step3.payment_method.edit")
+  %div.checkout-substep
+    %div.checkout-title
+      = t("split_checkout.step3.delivery_info.title")
+
+    %div.summary
+      %span.summary-label
+        = t("split_checkout.step1.delivery_address.title")
+      %span.summary-value
+        = @order.shipping_method.name
+      %div
+      = @order.shipping_method.description
+    
+      %a.summary-edit{href: main_app.checkout_step_path(:details)}
+        = t("split_checkout.step3.your_details.edit")
+
+  %div.checkout-substep
+    %div.checkout-title
+      = t("split_checkout.step3.payment_method.title")
+
+    %div.summary
+      %span.summary-value
+        = last_payment_method(@order)&.name
+        %p.text-small.text-skinny.pre-line
+          %em= last_payment_method(@order)&.description
+      %a.summary-edit{href: main_app.checkout_step_path(:payment)}
+        = t("split_checkout.step3.payment_method.edit")
 
 
-%div.checkout-substep
-  %div.checkout-title
-    = t("split_checkout.step3.order.title")
-  
-  = render 'spree/orders/summary', order: @order
+  %div.checkout-substep
+    %div.checkout-title
+      = t("split_checkout.step3.order.title")
+    
+    = render 'spree/orders/summary', order: @order
 
-%div.checkout-substep
+%div.checkout-substep.medium-6
   %div.checkout-input
     = f.check_box :accept_terms, {id: 'accept_terms', name: "accept_terms", "checked": "#{all_terms_and_conditions_already_accepted?}"}
     = f.label :accept_terms, t('split_checkout.step3.terms_and_conditions.message_html', terms_and_conditions_link: link_to( t("split_checkout.step3.terms_and_conditions.link_text"), @order.distributor.terms_and_conditions.url, target: '_blank'), tos_link: link_to_platform_terms), {for: "accept_terms"}
@@ -109,7 +110,7 @@
   %div.checkout-input
   = t("split_checkout.step3.agree")
 
-%div.checkout-submit
+%div.checkout-submit.medium-6
   = f.submit t("split_checkout.step3.submit"), name: "confirm_order", class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
   %a.button.cancel{href: main_app.cart_path}
     = t("split_checkout.step3.cancel")