diff --git a/app/overrides/remove_search_bar.rb b/app/overrides/remove_search_bar.rb
new file mode 100644
index 0000000000..debfa94346
--- /dev/null
+++ b/app/overrides/remove_search_bar.rb
@@ -0,0 +1,3 @@
+Deface::Override.new(:virtual_path  => "spree/shared/_nav_bar",
+                     :remove  => "#search-bar",
+                     :name => "search_removal")
\ No newline at end of file
diff --git a/app/overrides/remove_side_bar.rb b/app/overrides/remove_side_bar.rb
new file mode 100644
index 0000000000..ce69795eaa
--- /dev/null
+++ b/app/overrides/remove_side_bar.rb
@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path  => "spree/shared/_sidebar",
+                     :remove  => "#sidebar",
+                     :name => "sidebar_removal")
+
diff --git a/lib/open_food_web/feature_toggle.rb b/lib/open_food_web/feature_toggle.rb
index 00834da4e0..1a761cfc63 100644
--- a/lib/open_food_web/feature_toggle.rb
+++ b/lib/open_food_web/feature_toggle.rb
@@ -9,7 +9,7 @@ module OpenFoodWeb
     def self.features
       {eaterprises: true,
        local_organics: false,
-       order_cycles: false,
+       order_cycles: true,
        multi_cart: false,
        enterprises_distributor_info_rich_text: true}
     end
diff --git a/spec/features/consumer/distributors_spec.rb b/spec/features/consumer/distributors_spec.rb
index e330953200..30231489a5 100644
--- a/spec/features/consumer/distributors_spec.rb
+++ b/spec/features/consumer/distributors_spec.rb
@@ -8,7 +8,7 @@ feature %q{
   include AuthenticationWorkflow
   include WebHelper
 
-  scenario "viewing a list of distributors in the sidebar" do
+  scenario "viewing a list of distributors in the sidebar", :future => true do
     # Given some distributors
     d1 = create(:distributor_enterprise, :name => "Edible garden")
     d2 = create(:distributor_enterprise)
@@ -29,7 +29,7 @@ feature %q{
     page.should_not have_selector 'a', :text => d3.name
   end
 
-  scenario "viewing a list of distributors (with active products) in the sidebar when there's some inactive distributors" do
+  scenario "viewing a list of distributors (with active products) in the sidebar when there's some inactive distributors", :future => true do
     # Given some distributors
     d1 = create(:distributor_enterprise, :name => "Edible garden")
     d2 = create(:distributor_enterprise)
@@ -64,7 +64,7 @@ feature %q{
     page.should have_selector "#distributor_filter input[value='Browse All Distributors']"
   end
 
-  scenario "viewing a list of all distributors" do
+  scenario "viewing a list of all distributors", :future => true do
     # Given some distributors
     d1 = create(:distributor_enterprise, :name => "Edible garden")
     d2 = create(:distributor_enterprise)
diff --git a/spec/features/consumer/order_cycles_spec.rb b/spec/features/consumer/order_cycles_spec.rb
index c19e5f7bca..539c5a75a6 100644
--- a/spec/features/consumer/order_cycles_spec.rb
+++ b/spec/features/consumer/order_cycles_spec.rb
@@ -31,7 +31,7 @@ feature %q{
       end
     end
 
-    scenario "viewing order cycle and distributor choices" do
+    scenario "viewing order cycle and distributor choices", :future => true do
       # When I go to the product listing page
       visit spree.products_path
 
@@ -51,7 +51,7 @@ feature %q{
       page.should have_selector "#distribution-choice", text: 'You have not yet picked where you will get your order from.'
     end
 
-    context "without javascript" do
+    context "without javascript", :future => true do
       scenario "selecting a distributor highlights valid order cycle choices" do
         # When I go to the product listing page
         visit spree.products_path
@@ -81,7 +81,7 @@ feature %q{
         end
       end
 
-      scenario "selecting an order cycle highlights valid distributor choices" do
+      scenario "selecting an order cycle highlights valid distributor choices", :future => true do
         # When I go to the product listing page
         visit spree.products_path
 
@@ -142,7 +142,7 @@ feature %q{
         page.should_not have_selector "input[value='#{@oc1.id}'][checked='checked']"
       end
 
-      scenario "selecting both an order cycle and distributor" do
+      scenario "selecting both an order cycle and distributor", :future => true do
         # When I go to the products listing page
         visit spree.products_path
 
diff --git a/spec/features/consumer/suppliers_spec.rb b/spec/features/consumer/suppliers_spec.rb
index e14c49a2f3..e2b058fdfb 100644
--- a/spec/features/consumer/suppliers_spec.rb
+++ b/spec/features/consumer/suppliers_spec.rb
@@ -12,7 +12,7 @@ feature %q{
     create(:distributor_enterprise, :name => "Edible garden")
   end
 
-  scenario "viewing a list of suppliers (with active products) in the sidebar when there's 5 or fewer" do
+  scenario "viewing a list of suppliers (with active products) in the sidebar when there's 5 or fewer", :future => true do
     # Given some suppliers
     s1 = create(:supplier_enterprise)
     s2 = create(:supplier_enterprise)
@@ -47,7 +47,7 @@ feature %q{
     page.should have_selector "#supplier_filter input[value='Browse All Suppliers']"
   end
 
-  scenario "viewing a list of all suppliers" do
+  scenario "viewing a list of all suppliers", :future => true do
     # Given some suppliers
     s1 = create(:supplier_enterprise)
     s2 = create(:supplier_enterprise)
@@ -68,7 +68,7 @@ feature %q{
     page.should have_selector '#content a', :text => s3.name
   end
 
-  scenario "viewing products provided by a supplier" do
+  scenario "viewing products provided by a supplier", :future => true do
     # Given a supplier with a product
     s1 = create(:supplier_enterprise, :name => 'Murrnong', :long_description => "<p>Hello, world!</p>")
     p1 = create(:product, :supplier => s1)