diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 9b7485547d..56ff0c1f57 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -3,42 +3,52 @@ product
 
 
 shop
-  color: #999
+  color: #666
   display: block
   navigation
     display: block
-    background: #F4EBDE
+    background: #f6efe5
     distributor.details
+      box-sizing: border-box
       display: block
       height: 150px
+      padding: 40px 0px 0px
       select
         width: 200px
       position: relative
-      img, h3
-        display: inline
-      location
+      img
         display: block
-        padding-left: 28px
-
+        height: 100px
+        width: 100px
+        margin-right: 12px
+      location
+        font-family: "AvenirBla_IE", "AvenirBla"
+        padding-right: 16px
       ordercycle
         display: block
         position: absolute
-        right: 20px
-        top: 12px
-
+        right: 0px
+        top: 40px
         form.custom 
           width: 400px
-          strong
-            line-height: 37px
-            padding-right: 8px
-          closing
-            font-size: 80%
-            display: block
+          text-align: right
+          & > strong
+            line-height: 2.5
+            font-size: 1.29em
+            padding-right: 14px
           .custom.dropdown
-            width: 200px
+            width: 250px
             display: inline-block
             background: transparent
-            border-color: #888
+            border-width: 2px
+            border-color: #666666
+            font-size: 1.28em 
+            margin-bottom: 0
+        closing
+          font-size: 0.875em
+          display: block
+          float: right
+          padding-top: 14px
 
   products
     display: block
diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass
index 93e3813d93..0bf0b39e44 100644
--- a/app/assets/stylesheets/darkswarm/typography.css.sass
+++ b/app/assets/stylesheets/darkswarm/typography.css.sass
@@ -17,11 +17,14 @@
 //body 
   //font-family: "AvenirBla_IE", "AvenirBla"
 
-h1, h2, h3, h4, h5, h6
+h1, h2, h3, h4, h5, h6, .avenir
   color: #333333
   font-family: "AvenirBla_IE", "AvenirBla"
   padding: 0px
 
+strong.avenir
+  font-weight: normal // Avenir is basically bold anyway
+
 td
   font-family: "helvetica"
   
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index 993b57477e..e312f2a891 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -10,8 +10,8 @@
 
   - else
     %form.custom
-      %strong Ready for:
-      %select#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
+      %strong.avenir Ready for
+      %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
               "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id || nil}",
               "ng-change" => "changeOrderCycle()",
               "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}"}
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 9d73e4772c..c8fe15ed3f 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -21,7 +21,7 @@
           %td {{ product.description }}
           %td {{ product.master.options_text }}
           %td 
-            %input{type: :number, value: 0, id: "quantity_variant_{{product.master.id}}"}
+            %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{product.master.id}}"}
           %td.group_buy
             %span{"ng-show" => "product.group_buy"} 
               Available
@@ -34,7 +34,7 @@
           %td{colspan: 3}
           %td {{variant.options_text}}
           %td 
-            %input{type: :number, value: 0, id: "quantity_variant_{{variant.id}}"}
+            %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{variant.id}}"}
           %td.group_buy
             %span{"ng-show" => "product.group_buy"} 
               Available
@@ -44,4 +44,4 @@
             %small from
             ${{ variant.price }}
     %input.button.right{type: :submit, value: "Check Out"}
-  %pre {{ data.products | json }}
+  -#%pre {{ data.products | json }}
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 7454bd9fdd..268b5f75ef 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,19 +1,20 @@
 %shop{"ng-app" => "Shop"}
   %navigation
     %distributor.details.row
-      -#%img{src: "/route/to/distributor/icon"}
-      %h3
+      %img.left{src: ""}
+      %h4
         = @distributor.name
       %location= @distributor.address.city
+      %small Change location
       = render partial: "shop/order_cycles"
 
-      %description
-        = @distributor.long_description.andand.html_safe
+      -#%description
+        -#= @distributor.long_description.andand.html_safe
     
   %products.row
     = render partial: "shop/products"
 
-  = render partial: "enterprises/contact_us"
-  = render partial: "enterprises/about_us"
+  -#= render partial: "enterprises/contact_us"
+  -#= render partial: "enterprises/about_us"