diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index a9c972c8..78e2121d 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -8,4 +8,4 @@
 //
 //= link qr_sheet/application.css
 //
-//= link user/foundation/application.css
+// link user/foundation/application.css
diff --git a/app/assets/stylesheets/user/foundation/application.sass b/app/assets/stylesheets/user/foundation/application.sass
index 3c8b03a5..26a42a25 100644
--- a/app/assets/stylesheets/user/foundation/application.sass
+++ b/app/assets/stylesheets/user/foundation/application.sass
@@ -1,10 +1 @@
-@import bourbon
-@import ./qconstants
-@import ./foundation_and_overrides
-@import font-awesome
-@import ./structure
-@import ./components/*
-@import ./pages/*
-@import ./display_fields
-@import ./qproduct_orders
-@import ./qlists
+// No style for now
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d008ddfb..a99b9821 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -153,7 +153,7 @@ module ApplicationHelper
   end
 
   def find_page(name)
-    Page.find_by_name_and_locale(name, I18n.locale)
+    Page.find_by_name_and_locale(name, I18n.locale.to_s)
   end
 
   def locale_root_path
diff --git a/app/assets/stylesheets/user/foundation/_display_fields.sass b/old_assets/user_stylesheets/foundation/_display_fields.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/_display_fields.sass
rename to old_assets/user_stylesheets/foundation/_display_fields.sass
diff --git a/app/assets/stylesheets/user/foundation/_qconstants.sass b/old_assets/user_stylesheets/foundation/_qconstants.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/_qconstants.sass
rename to old_assets/user_stylesheets/foundation/_qconstants.sass
diff --git a/app/assets/stylesheets/user/foundation/_qlists.sass b/old_assets/user_stylesheets/foundation/_qlists.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/_qlists.sass
rename to old_assets/user_stylesheets/foundation/_qlists.sass
diff --git a/app/assets/stylesheets/user/foundation/_qproduct_orders.sass b/old_assets/user_stylesheets/foundation/_qproduct_orders.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/_qproduct_orders.sass
rename to old_assets/user_stylesheets/foundation/_qproduct_orders.sass
diff --git a/app/assets/stylesheets/user/foundation/_structure.sass b/old_assets/user_stylesheets/foundation/_structure.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/_structure.sass
rename to old_assets/user_stylesheets/foundation/_structure.sass
diff --git a/old_assets/user_stylesheets/foundation/application.sass b/old_assets/user_stylesheets/foundation/application.sass
new file mode 100644
index 00000000..3c8b03a5
--- /dev/null
+++ b/old_assets/user_stylesheets/foundation/application.sass
@@ -0,0 +1,10 @@
+@import bourbon
+@import ./qconstants
+@import ./foundation_and_overrides
+@import font-awesome
+@import ./structure
+@import ./components/*
+@import ./pages/*
+@import ./display_fields
+@import ./qproduct_orders
+@import ./qlists
diff --git a/app/assets/stylesheets/user/foundation/components/_form_additions.sass b/old_assets/user_stylesheets/foundation/components/_form_additions.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_form_additions.sass
rename to old_assets/user_stylesheets/foundation/components/_form_additions.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_icons.sass b/old_assets/user_stylesheets/foundation/components/_icons.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_icons.sass
rename to old_assets/user_stylesheets/foundation/components/_icons.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_ios.sass b/old_assets/user_stylesheets/foundation/components/_ios.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_ios.sass
rename to old_assets/user_stylesheets/foundation/components/_ios.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_join_requests.sass b/old_assets/user_stylesheets/foundation/components/_join_requests.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_join_requests.sass
rename to old_assets/user_stylesheets/foundation/components/_join_requests.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_modal.sass b/old_assets/user_stylesheets/foundation/components/_modal.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_modal.sass
rename to old_assets/user_stylesheets/foundation/components/_modal.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_nav_main.sass b/old_assets/user_stylesheets/foundation/components/_nav_main.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_nav_main.sass
rename to old_assets/user_stylesheets/foundation/components/_nav_main.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_nav_side.sass b/old_assets/user_stylesheets/foundation/components/_nav_side.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_nav_side.sass
rename to old_assets/user_stylesheets/foundation/components/_nav_side.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_product_categories.sass b/old_assets/user_stylesheets/foundation/components/_product_categories.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_product_categories.sass
rename to old_assets/user_stylesheets/foundation/components/_product_categories.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_product_variants.sass b/old_assets/user_stylesheets/foundation/components/_product_variants.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_product_variants.sass
rename to old_assets/user_stylesheets/foundation/components/_product_variants.sass
diff --git a/app/assets/stylesheets/user/foundation/components/_settings.sass b/old_assets/user_stylesheets/foundation/components/_settings.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/components/_settings.sass
rename to old_assets/user_stylesheets/foundation/components/_settings.sass
diff --git a/app/assets/stylesheets/user/foundation/foundation_and_overrides.sass b/old_assets/user_stylesheets/foundation/foundation_and_overrides.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/foundation_and_overrides.sass
rename to old_assets/user_stylesheets/foundation/foundation_and_overrides.sass
diff --git a/app/assets/stylesheets/user/foundation/pages/_about.sass b/old_assets/user_stylesheets/foundation/pages/_about.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/pages/_about.sass
rename to old_assets/user_stylesheets/foundation/pages/_about.sass
diff --git a/app/assets/stylesheets/user/foundation/pages/_index.sass b/old_assets/user_stylesheets/foundation/pages/_index.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/pages/_index.sass
rename to old_assets/user_stylesheets/foundation/pages/_index.sass
diff --git a/app/assets/stylesheets/user/foundation/pages/_scanning.sass b/old_assets/user_stylesheets/foundation/pages/_scanning.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/pages/_scanning.sass
rename to old_assets/user_stylesheets/foundation/pages/_scanning.sass
diff --git a/app/assets/stylesheets/user/foundation/pages/_sign_in.sass b/old_assets/user_stylesheets/foundation/pages/_sign_in.sass
similarity index 100%
rename from app/assets/stylesheets/user/foundation/pages/_sign_in.sass
rename to old_assets/user_stylesheets/foundation/pages/_sign_in.sass