diff --git a/app/assets/stylesheets/darkswarm/checkout.css.sass b/app/assets/stylesheets/darkswarm/checkout.css.sass
index e9a7f09597..a592c5dc25 100644
--- a/app/assets/stylesheets/darkswarm/checkout.css.sass
+++ b/app/assets/stylesheets/darkswarm/checkout.css.sass
@@ -3,10 +3,19 @@
 
 checkout
   display: block
+
+  @media all and (max-width: 640px) 
+    &.row .row 
+      margin-left: 0
+      margin-right: 0
   
   orderdetails
     .button, table
       width: 100%
+    @media all and (max-width: 640px) 
+      form.edit_order
+        border: 1px solid $disabled-bright
+        margin-bottom: 2rem
   
   #details, #billing, #shipping, #payment
     border: 0
diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml
index 1c4932c481..7fffdbeb22 100644
--- a/app/views/checkout/edit.html.haml
+++ b/app/views/checkout/edit.html.haml
@@ -13,12 +13,12 @@
    
   %accordion{"close-others" => "true"}
     %checkout.row{"ng-controller" => "CheckoutCtrl"}
-      .small-9.columns
+      .small-12.medium-8.large-9.columns
         - unless spree_current_user
           = render partial: "checkout/authentication"
         .row{"ng-show" => "enabled", "ng-controller" => "AccordionCtrl"}
           = render partial: "checkout/form"
-      .small-3.columns
+      .small-12.medium-4.large-3.columns
         = render partial: "checkout/summary"