diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb
index ad40063d8a..f46fdb99fd 100644
--- a/app/controllers/spree/user_sessions_controller.rb
+++ b/app/controllers/spree/user_sessions_controller.rb
@@ -38,10 +38,6 @@ module Spree
       end
     end
 
-    def nav_bar
-      render partial: 'spree/shared/nav_bar'
-    end
-
     private
 
     def accurate_title
diff --git a/app/overrides/admin_tab.rb b/app/overrides/admin_tab.rb
deleted file mode 100644
index 186a7a06f7..0000000000
--- a/app/overrides/admin_tab.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/admin",
-                     name: "user_admin_tabs",
-                     insert_bottom: "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                     partial: "spree/admin/users_tab",
-                     disabled: false,
-                     original: '031652cf5a054796022506622082ab6d2693699f')
diff --git a/app/overrides/auth_admin_login_navigation_bar.rb b/app/overrides/auth_admin_login_navigation_bar.rb
deleted file mode 100644
index 8a171041af..0000000000
--- a/app/overrides/auth_admin_login_navigation_bar.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/admin",
-                     name: "auth_admin_login_navigation_bar",
-                     insert_top: "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]",
-                     partial: "spree/layouts/admin/login_nav",
-                     original: '841227d0aedf7909d62237d8778df99100087715')
diff --git a/app/overrides/auth_shared_login_bar.rb b/app/overrides/auth_shared_login_bar.rb
deleted file mode 100644
index 734c9f8112..0000000000
--- a/app/overrides/auth_shared_login_bar.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Deface::Override.new(virtual_path: "spree/shared/_nav_bar",
-                     name: "auth_shared_login_bar",
-                     insert_before: "li#search-bar",
-                     partial: "spree/shared/login_bar",
-                     disabled: false,
-                     original: 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac')
diff --git a/app/overrides/remove_search_bar.rb b/app/overrides/remove_search_bar.rb
deleted file mode 100644
index 84d84cdf04..0000000000
--- a/app/overrides/remove_search_bar.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Deface::Override.new(virtual_path: "spree/shared/_nav_bar",
-                     remove: "#search-bar",
-                     name: "search_removal")
diff --git a/app/overrides/remove_side_bar.rb b/app/overrides/remove_side_bar.rb
deleted file mode 100644
index 36f5a31f75..0000000000
--- a/app/overrides/remove_side_bar.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Deface::Override.new(virtual_path: "spree/shared/_sidebar",
-                     remove: "#sidebar",
-                     name: "sidebar_removal")
diff --git a/app/overrides/set_auth_token_in_backend.rb b/app/overrides/set_auth_token_in_backend.rb
deleted file mode 100644
index 8dcbc5744c..0000000000
--- a/app/overrides/set_auth_token_in_backend.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/admin",
-                     insert_bottom: "[data-hook='admin_inside_head']",
-                     partial: "layouts/auth_token_script",
-                     name: "set_auth_token_in_backend",
-                     original: '6bc2c5de1c8f7542d033548557437c9fe4b3ba02')
diff --git a/app/overrides/set_auth_token_in_frontend.rb b/app/overrides/set_auth_token_in_frontend.rb
deleted file mode 100644
index aeb51d4194..0000000000
--- a/app/overrides/set_auth_token_in_frontend.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/spree_application",
-                     insert_bottom: "[data-hook='inside_head']",
-                     partial: "layouts/auth_token_script",
-                     name: "set_auth_token_in_frontend",
-                     original: '5659ac7dbf6ac6469907b005b85285b894677815')
diff --git a/app/overrides/spree/shared/_footer/footer.html.haml.deface b/app/overrides/spree/shared/_footer/footer.html.haml.deface
deleted file mode 100644
index c7c969f74c..0000000000
--- a/app/overrides/spree/shared/_footer/footer.html.haml.deface
+++ /dev/null
@@ -1,19 +0,0 @@
-/ replace "footer"
-
--#= render partial: "shared/footer"
-%footer
-  %hr/
-
-  -#.row
-    -#.seven.columns.offset-by-three
-      -#%center
-        -#%h1 What is open food network?
-        -#%p
-          -#%i
-            -#Open food network is an online space in which people can connect with, trade and sell food directly with
-            -#Australian farmers.  We aim to reconnect people with their food.
-  -#%hr/
-
-  -#.row
-    -#.five.columns.secondary.offset-by-seven.secondary
-      -#All rights reserved. © 2013 Open Food Foundation
diff --git a/app/overrides/spree/shared/_header/replace_logo_with_link_text.html.haml.deface b/app/overrides/spree/shared/_header/replace_logo_with_link_text.html.haml.deface
deleted file mode 100644
index a8571d30bb..0000000000
--- a/app/overrides/spree/shared/_header/replace_logo_with_link_text.html.haml.deface
+++ /dev/null
@@ -1,8 +0,0 @@
-/ replace "#logo"
-
-%figure#logo.columns.eight
-  - if current_distributor
-    %h1= link_to current_distributor.name, main_app.enterprise_shop_path(current_distributor)
-    .change-location= link_to 'Change Location', root_path
-  - else
-    %h1= link_to "OPEN FOOD NETWORK", root_path
diff --git a/app/overrides/spree/shared/_nav_bar/adjust_top_nav_columns.html.haml.deface b/app/overrides/spree/shared/_nav_bar/adjust_top_nav_columns.html.haml.deface
deleted file mode 100644
index f22a49cc40..0000000000
--- a/app/overrides/spree/shared/_nav_bar/adjust_top_nav_columns.html.haml.deface
+++ /dev/null
@@ -1,2 +0,0 @@
-/ set_attributes '#top-nav-bar'
-/ attributes({:class => "columns eight"})
diff --git a/app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface b/app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface
deleted file mode 100644
index c904c13d77..0000000000
--- a/app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface
+++ /dev/null
@@ -1,5 +0,0 @@
-/ insert_before "#password-credentials"
-
-- if @unconfirmed_email
-  %p.alert-box
-    = t('spree.users.show.unconfirmed_email', unconfirmed_email: @unconfirmed_email)
\ No newline at end of file
diff --git a/app/views/spree/admin/_users_tab.html.haml b/app/views/spree/admin/_users_tab.html.haml
deleted file mode 100644
index 8be1861f50..0000000000
--- a/app/views/spree/admin/_users_tab.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-- if can? :admin, Spree::User
-  = tab(:users, url: spree.admin_users_path, icon: 'icon-user')
diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml
index 7d741c0804..7c47905b0d 100644
--- a/app/views/spree/admin/shared/_head.html.haml
+++ b/app/views/spree/admin/shared/_head.html.haml
@@ -24,4 +24,6 @@
 = render "layouts/bugherd_script"
 %link{'data-require' => "font-awesome@*", 'data-semver'=>"4.2.0", 'rel' => "stylesheet", 'href' => "//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.css"}
 
+= render "layouts/auth_token_script"
+
 = yield :head
diff --git a/app/views/spree/admin/shared/_tabs.html.haml b/app/views/spree/admin/shared/_tabs.html.haml
index 1c8a7e462b..8292853af9 100644
--- a/app/views/spree/admin/shared/_tabs.html.haml
+++ b/app/views/spree/admin/shared/_tabs.html.haml
@@ -7,3 +7,5 @@
 = tab :enterprises, :url => main_app.admin_enterprises_path
 = tab :customers, :url => main_app.admin_customers_path
 = tab :enterprise_groups, :url => main_app.admin_enterprise_groups_path, label: 'groups'
+- if can? :admin, Spree::User
+  = tab(:users, url: spree.admin_users_path, icon: 'icon-user')
diff --git a/app/views/spree/layouts/admin.html.haml b/app/views/spree/layouts/admin.html.haml
index 40c95efdda..cdf4fbda02 100644
--- a/app/views/spree/layouts/admin.html.haml
+++ b/app/views/spree/layouts/admin.html.haml
@@ -29,6 +29,7 @@
           %figure.columns.five{"data-hook" => "logo-wrapper"}
             = link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_path
           %nav.columns.eleven{"data-hook" => "admin_login_navigation_bar"}
+            = render :partial => 'spree/layouts/admin/login_nav'
 
       %nav#admin-menu{"data-hook" => ""}
         .container
diff --git a/app/views/spree/shared/_user_form.html.haml b/app/views/spree/shared/_user_form.html.haml
index ddee06e421..1698d97ee3 100644
--- a/app/views/spree/shared/_user_form.html.haml
+++ b/app/views/spree/shared/_user_form.html.haml
@@ -3,6 +3,10 @@
   %br
   = f.email_field :email, class: 'title'
 
+- if @unconfirmed_email
+  %p.alert-box
+    = t('spree.users.show.unconfirmed_email', unconfirmed_email: @unconfirmed_email)
+
 %div{"id" => "password-credentials"}
   %p
     = f.label :password, Spree.t(:password)
diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index 8047fa0b0b..94da909f8b 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -24,12 +24,6 @@ Spree::Core::Engine.routes.draw do
     put '/password/change' => 'user_passwords#update', :as => :update_password
   end
 
-  resource :session do
-    member do
-      get :nav_bar
-    end
-  end
-
   resource :account, :controller => 'users'
 
   namespace :admin do