diff --git a/app/views/spree/admin/shipping_methods/_form.html.haml b/app/views/spree/admin/shipping_methods/_form.html.haml
index 450febb31b..923e7b205c 100644
--- a/app/views/spree/admin/shipping_methods/_form.html.haml
+++ b/app/views/spree/admin/shipping_methods/_form.html.haml
@@ -1,4 +1,4 @@
-=admin_inject_shipping_method
+= admin_inject_shipping_method
 .alpha.eleven.columns{ "ng-app" => "admin.shippingMethods",
   "ng-controller" => "shippingMethodCtrl" }
   .row
@@ -46,26 +46,26 @@
     .alpha.eleven.columns
       = render partial: 'spree/admin/shared/calculator_fields', locals: { f: f }
 
-.alpha.six.columns
-  .alpha.six.columns
-    %fieldset.categories.no-border-bottom
-      %legend{align: "center"}= t('.categories')
-      = f.field_container :categories do
-        - Spree::ShippingCategory.all.each do |category|
-          = label_tag do
-            = check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category))
-            = category.name
-            %br/
-        = error_message_on :shipping_method, :shipping_category_id
+  .row
+    .alpha.eleven.columns
+      %fieldset.categories.no-border-bottom
+        %legend{align: "center"}= t('.categories')
+        = f.field_container :categories do
+          - Spree::ShippingCategory.all.each do |category|
+            = label_tag do
+              = check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category))
+              = category.name
+              %br/
+          = error_message_on :shipping_method, :shipping_category_id
 
-  .alpha.six.columns
-    %fieldset.no-border-bottom
-      %legend{align: "center"}= t('.zones')
-      = f.field_container :zones do
-        - shipping_method_zones = @shipping_method.zones.to_a
-        - Spree::Zone.all.each do |zone|
-          = label_tag do
-            = check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone))
-            = zone.name
-          %br/
-        = error_message_on :shipping_method, :zone_id
+    .alpha.eleven.columns
+      %fieldset.no-border-bottom
+        %legend{align: "center"}= t('.zones')
+        = f.field_container :zones do
+          - shipping_method_zones = @shipping_method.zones.to_a
+          - Spree::Zone.all.each do |zone|
+            = label_tag do
+              = check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone))
+              = zone.name
+            %br/
+          = error_message_on :shipping_method, :zone_id
diff --git a/app/views/spree/admin/shipping_methods/edit.html.haml b/app/views/spree/admin/shipping_methods/edit.html.haml
index dc6d879e45..c64fee62ca 100644
--- a/app/views/spree/admin/shipping_methods/edit.html.haml
+++ b/app/views/spree/admin/shipping_methods/edit.html.haml
@@ -12,7 +12,8 @@
     %fieldset.no-border-top
       = render partial: 'form', locals: { f: f }
       .one.column  
-      = render partial: 'spree/admin/shared/hubs_sidebar', locals: { f: f, klass: :shipping_method }
+      .alpha.four.columns
+        = render partial: 'spree/admin/shared/hubs_sidebar', locals: { f: f, klass: :shipping_method }
       .clear
-      %div
+      .row
         = render partial: 'spree/admin/shared/edit_resource_links'