diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee
index 82b435852b..99c621ecbc 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee
@@ -1,3 +1,6 @@
 Darkswarm.controller "ShippingCtrl", ($scope) ->
   angular.extend(this, new FieldsetMixin($scope))
   $scope.name = "shipping"
+  $scope.nextPanel = "payment"
+  
+  window.tmp = $scope
diff --git a/app/views/shop/checkout/_payment.html.haml b/app/views/shop/checkout/_payment.html.haml
index 78b0e9792f..c7ffd0c5dd 100644
--- a/app/views/shop/checkout/_payment.html.haml
+++ b/app/views/shop/checkout/_payment.html.haml
@@ -1,6 +1,7 @@
 %fieldset#payment
   %ng-form{"ng-controller" => "PaymentCtrl", name: "payment"}
-    %accordion-group
+    %accordion-group{"is-open" => "accordion.payment",
+      "ng-class" => "{valid: payment.$valid}"}
       %accordion-heading
         .row
           .large-6.columns
diff --git a/app/views/shop/checkout/_shipping.html.haml b/app/views/shop/checkout/_shipping.html.haml
index 7893f23ea3..f5636c81d1 100644
--- a/app/views/shop/checkout/_shipping.html.haml
+++ b/app/views/shop/checkout/_shipping.html.haml
@@ -1,5 +1,4 @@
 %fieldset#shipping
-  %pre
   %ng-form{"ng-controller" => "ShippingCtrl", name: "shipping"}
     %accordion-group{"is-open" => "accordion.shipping",
       "ng-class" => "{valid: shipping.$valid}"}
@@ -36,7 +35,7 @@
                 = validated_input "Address", "order.ship_address.address1"
             .row
               .large-12.columns
-                = validated_input "Address (contd.)", "order.ship_address.address2"
+                = validated_input "Address (contd.)", "order.ship_address.address2", required: false
             .row
               .large-6.columns
                 = validated_input "City", "order.ship_address.city"
@@ -56,3 +55,6 @@
             .row
               .large-6.columns
                 = validated_input "Phone", "order.ship_address.phone"
+      .row
+        .large-12.columns.text-right
+          %button{"ng-disabled" => "details.$invalid", "ng-click" => "next($event)"} Next