diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
new file mode 100644
index 0000000000..aca7aac1dc
Binary files /dev/null and b/app/assets/images/logo.png differ
diff --git a/app/assets/stylesheets/darkswarm/footer.sass b/app/assets/stylesheets/darkswarm/footer.sass
new file mode 100644
index 0000000000..fea9689201
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/footer.sass
@@ -0,0 +1,12 @@
+@import variables
+
+#footer
+  padding: 74px 0px
+  background: $fawn
+  margin-top: 85px
+
+  #copyright 
+    clear: both
+    img
+      display: block
+      margin: 0px auto 8px
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 79bc00306b..0d6137fb3a 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -1,4 +1,5 @@
 @import mixins
+@import variables
 
 product
   display: block 
@@ -11,7 +12,7 @@ shop
   display: block
   navigation
     display: block
-    background: #f6efe5
+    background: $fawn 
     distributor.details
       box-sizing: border-box
       display: block
@@ -101,45 +102,3 @@ shop
           float: right
           padding-top: 14px
 
-  tabs
-    background: url("/assets/matte.png") top left repeat
-    display: block
-    .section-container.auto
-      margin-bottom: 0
-      & > section 
-        & > .content
-          background: none
-          border: none
-        & > .title, &.active > .title
-          text-transform: uppercase
-          line-height: 50px
-          border: none
-          &, &:hover
-            background: none
-          a
-            padding: 0px 2.2em
-
-  products
-    display: block
-    padding-top: 36px
-    table
-      width: 100%
-      border-collapse: collapse
-      border: none
-      th
-        line-height: 50px
-      .notes
-        max-width: 300px
-      td, th
-        background: #fff
-        border: 1px solid #cccccc
-        border-left: 0px
-        border-right: 0px
-      td
-        padding: 20px 0px
-      input[type=number]
-        width: 60px
-        margin: 0px
-      
-
-
diff --git a/app/assets/stylesheets/darkswarm/variables.css.sass b/app/assets/stylesheets/darkswarm/variables.css.sass
new file mode 100644
index 0000000000..a13eb9d014
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/variables.css.sass
@@ -0,0 +1 @@
+$fawn: #f6efe5 
diff --git a/app/views/enterprises/_about_us.html.haml b/app/views/enterprises/_about_us.html.haml
deleted file mode 100644
index 24cffec25e..0000000000
--- a/app/views/enterprises/_about_us.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-About Us
diff --git a/app/views/enterprises/_contact_us.html.haml b/app/views/enterprises/_contact_us.html.haml
deleted file mode 100644
index bb7297252b..0000000000
--- a/app/views/enterprises/_contact_us.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-Contact Us
diff --git a/app/views/shared/_copyright.html.haml b/app/views/shared/_copyright.html.haml
new file mode 100644
index 0000000000..271ba90c41
--- /dev/null
+++ b/app/views/shared/_copyright.html.haml
@@ -0,0 +1,3 @@
+#copyright.text-center
+  %img.copyright{src: "/assets/logo.png", alt: "Open Food Network"}
+  © Copyright 2013 Open Food Foundation
diff --git a/app/views/shop/_about_us.html.haml b/app/views/shop/_about_us.html.haml
new file mode 100644
index 0000000000..74ef2eaa47
--- /dev/null
+++ b/app/views/shop/_about_us.html.haml
@@ -0,0 +1,3 @@
+.about.right.text-right.small-2.large-3.columns
+  %h3 About Us
+  %p= @distributor.long_description.andand.html_safe
diff --git a/app/views/shop/_contact_us.html.haml b/app/views/shop/_contact_us.html.haml
new file mode 100644
index 0000000000..2cb4d65984
--- /dev/null
+++ b/app/views/shop/_contact_us.html.haml
@@ -0,0 +1,8 @@
+.contact.small-2.large-3.columns
+  %h3 Contact
+  %ul
+    %li= @distributor.email
+    %li= @distributor.website
+  = @distributor.address.address1
+  = @distributor.address.address2
+  = @distributor.address.city
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 2e874ed521..a4d54423b6 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -43,6 +43,8 @@
     
   %products.row
     = render partial: "shop/products"
-
-  -#= render partial: "enterprises/contact_us"
-  -#= render partial: "enterprises/about_us"
+  #footer
+    %section.row
+      = render partial: "shop/contact_us"
+      = render partial: "shop/about_us"
+      = render partial: "shared/copyright"
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 53fd4823b1..9992fd6d83 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -390,7 +390,7 @@ feature %q{
         page.should have_selector "a.clone-product", :count => 3
 
         first("a.clone-product").click
-
+        sleep 5
         page.should have_selector "a.clone-product", :count => 4
         page.should have_field "product_name", with: "COPY OF #{p1.name}"
         page.should have_select "supplier", selected: "#{p1.supplier.name}"
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 850157e2a0..3bcdabfcf2 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -1,13 +1,12 @@
 module AuthenticationWorkflow
   def login_to_admin_section
     admin_role = Spree::Role.find_or_create_by_name!('admin')
-    admin_user = Spree::User.create!({
-      :email => 'admin@ofn.org',
+    admin_user = create(:user, 
       :password => 'passw0rd',
       :password_confirmation => 'passw0rd',
       :remember_me => false,
       :persistence_token => 'pass',
-      :login => 'admin@ofn.org'})
+      :login => 'admin@ofn.org')
 
     admin_user.spree_roles << admin_role