diff --git a/Gemfile b/Gemfile
index 768e046..2d9b5b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@
 
 # ------------------------------------------------
 #    SUPER ADMIN SECTION
-gem "administrate", :github => 'thoughtbot/administrate', :branch =>'master' #:branch =>'v0.4.0'
+gem "administrate", :github => 'thoughtbot/administrate', :branch =>'v0.7.0'
 
 # ------------------------------------------------
 #    USERS
diff --git a/Gemfile.lock b/Gemfile.lock
index 31af02b..53bf3cf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,18 @@
 GIT
   remote: git://github.com/thoughtbot/administrate.git
-  revision: 47a2f99e22be87119ef0e3a7af3956984df5842c
-  branch: master
+  revision: 6bc227907e8567ca9d8c51658abc92fc2b19ca2d
+  branch: v0.7.0
   specs:
-    administrate (0.4.0)
+    administrate (0.7.0)
+      actionpack (>= 4.2, < 5.1)
+      actionview (>= 4.2, < 5.1)
+      activerecord (>= 4.2, < 5.1)
       autoprefixer-rails (~> 6.0)
-      bourbon (>= 5.0.0.beta.6)
       datetime_picker_rails (~> 0.0.7)
-      jquery-rails (~> 4.0)
+      jquery-rails (>= 4.0)
       kaminari (>= 1.0)
       momentjs-rails (~> 2.8)
-      neat (~> 1.1)
       normalize-rails (>= 3.0)
-      rails (>= 4.2, < 5.1)
       sass-rails (~> 5.0)
       selectize-rails (~> 0.6)
 
@@ -65,7 +65,7 @@
     addressable (2.4.0)
     ansi (1.5.0)
     arel (6.0.3)
-    autoprefixer-rails (6.7.7.1)
+    autoprefixer-rails (6.7.7.2)
       execjs
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -74,9 +74,6 @@
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bourbon (5.0.0.beta.7)
-      sass (~> 3.4.22)
-      thor (~> 0.19.1)
     builder (3.2.2)
     byebug (9.0.5)
     capybara (2.9.1)
@@ -218,9 +215,6 @@
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.3.21)
-    neat (1.8.0)
-      sass (>= 3.3)
-      thor (~> 0.19)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
diff --git a/app/controllers/admin/answers_controller.rb b/app/controllers/admin/answers_controller.rb
index c220635..8960f9f 100644
--- a/app/controllers/admin/answers_controller.rb
+++ b/app/controllers/admin/answers_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class AnswersController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/exported_plans_controller.rb b/app/controllers/admin/exported_plans_controller.rb
index aecd7f0..e4bde90 100644
--- a/app/controllers/admin/exported_plans_controller.rb
+++ b/app/controllers/admin/exported_plans_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class ExportedPlansController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/guidance_groups_controller.rb b/app/controllers/admin/guidance_groups_controller.rb
index 6b9ad4b..95d3e7c 100644
--- a/app/controllers/admin/guidance_groups_controller.rb
+++ b/app/controllers/admin/guidance_groups_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class GuidanceGroupsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/guidances_controller.rb b/app/controllers/admin/guidances_controller.rb
index 6690ff3..1f2495f 100644
--- a/app/controllers/admin/guidances_controller.rb
+++ b/app/controllers/admin/guidances_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class GuidancesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/identifier_schemes_controller.rb b/app/controllers/admin/identifier_schemes_controller.rb
index 43911d1..eb50d8a 100644
--- a/app/controllers/admin/identifier_schemes_controller.rb
+++ b/app/controllers/admin/identifier_schemes_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class IdentifierSchemesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/languages_controller.rb b/app/controllers/admin/languages_controller.rb
index e70e606..e58baa9 100644
--- a/app/controllers/admin/languages_controller.rb
+++ b/app/controllers/admin/languages_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class LanguagesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/notes_controller.rb b/app/controllers/admin/notes_controller.rb
index c740124..db832f4 100644
--- a/app/controllers/admin/notes_controller.rb
+++ b/app/controllers/admin/notes_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class NotesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/orgs_controller.rb b/app/controllers/admin/orgs_controller.rb
index 91092db..d68f358 100644
--- a/app/controllers/admin/orgs_controller.rb
+++ b/app/controllers/admin/orgs_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class OrgsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/perms_controller.rb b/app/controllers/admin/perms_controller.rb
index 4e153cc..99e9b95 100644
--- a/app/controllers/admin/perms_controller.rb
+++ b/app/controllers/admin/perms_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class PermsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/phases_controller.rb b/app/controllers/admin/phases_controller.rb
index 5877a50..de6e3c3 100644
--- a/app/controllers/admin/phases_controller.rb
+++ b/app/controllers/admin/phases_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class PhasesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/plans_controller.rb b/app/controllers/admin/plans_controller.rb
index aaa9189..424389f 100644
--- a/app/controllers/admin/plans_controller.rb
+++ b/app/controllers/admin/plans_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class PlansController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/question_formats_controller.rb b/app/controllers/admin/question_formats_controller.rb
index 7644265..1338b69 100644
--- a/app/controllers/admin/question_formats_controller.rb
+++ b/app/controllers/admin/question_formats_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class QuestionFormatsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/question_options_controller.rb b/app/controllers/admin/question_options_controller.rb
index 237df25..103e543 100644
--- a/app/controllers/admin/question_options_controller.rb
+++ b/app/controllers/admin/question_options_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class QuestionOptionsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/questions_controller.rb b/app/controllers/admin/questions_controller.rb
index 1be38bf..be5d2a7 100644
--- a/app/controllers/admin/questions_controller.rb
+++ b/app/controllers/admin/questions_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class QuestionsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/regions_controller.rb b/app/controllers/admin/regions_controller.rb
index 44d2065..6e5627b 100644
--- a/app/controllers/admin/regions_controller.rb
+++ b/app/controllers/admin/regions_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class RegionsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 6633242..748c165 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class RolesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/sections_controller.rb b/app/controllers/admin/sections_controller.rb
index b06bb8c..3b94a0a 100644
--- a/app/controllers/admin/sections_controller.rb
+++ b/app/controllers/admin/sections_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class SectionsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/splash_logs_controller.rb b/app/controllers/admin/splash_logs_controller.rb
index 4cb0f85..aa3fa22 100644
--- a/app/controllers/admin/splash_logs_controller.rb
+++ b/app/controllers/admin/splash_logs_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class SplashLogsController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/suggested_answers_controller.rb b/app/controllers/admin/suggested_answers_controller.rb
index 5ee314e..35d5243 100644
--- a/app/controllers/admin/suggested_answers_controller.rb
+++ b/app/controllers/admin/suggested_answers_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class SuggestedAnswersController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/templates_controller.rb b/app/controllers/admin/templates_controller.rb
index 090a84b..8ac79e1 100644
--- a/app/controllers/admin/templates_controller.rb
+++ b/app/controllers/admin/templates_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class TemplatesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index f15a730..9617c6c 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class ThemesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/token_permission_types_controller.rb b/app/controllers/admin/token_permission_types_controller.rb
index 7e90c37..37b3487 100644
--- a/app/controllers/admin/token_permission_types_controller.rb
+++ b/app/controllers/admin/token_permission_types_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class TokenPermissionTypesController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/user_identifiers_controller.rb b/app/controllers/admin/user_identifiers_controller.rb
index 6699719..bdf5faa 100644
--- a/app/controllers/admin/user_identifiers_controller.rb
+++ b/app/controllers/admin/user_identifiers_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class UserIdentifiersController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b456891..70251c0 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class UsersController < Admin::ApplicationController
     # To customize the behavior of this controller,
-    # simply overwrite any of the RESTful actions. For example:
+    # you can overwrite any of the RESTful actions. For example:
     #
     # def index
     #   super
diff --git a/app/dashboards/user_dashboard.rb b/app/dashboards/user_dashboard.rb
index 687d2b9..4ba23ad 100644
--- a/app/dashboards/user_dashboard.rb
+++ b/app/dashboards/user_dashboard.rb
@@ -82,7 +82,6 @@
     :plans,
     :user_identifiers,
     :identifier_schemes,
-    :setting_objects,
     :orcid_id,
     :shibboleth_id,
     :created_at,
@@ -122,7 +121,6 @@
 #    :plans,
     :user_identifiers,
     :identifier_schemes,
-#    :setting_objects,
     :firstname,
     :surname,
     :email,
@@ -159,5 +157,4 @@
   def display_resource(user)
     "#{user.firstname} #{user.surname} (##{user.id})"
   end
-
 end
diff --git a/app/views/admin/application/_admin_header.html.erb b/app/views/admin/application/_admin_header.html.erb
deleted file mode 100644
index 6f7bcb5..0000000
--- a/app/views/admin/application/_admin_header.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<div style="margin:0;padding:0">
-  <div class="main_header">
-    <div class="header_left">
-      <div class="home_logo">
-        <p><h1>Super Admin area</h1></p>
-        <%= link_to(image_tag("logo.jpg"), root_path)%>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/app/views/admin/application/_sidebar.html.erb b/app/views/admin/application/_sidebar.html.erb
deleted file mode 100644
index 98adca4..0000000
--- a/app/views/admin/application/_sidebar.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<%# Hack for customisation %>
-<%= render 'admin_header' %>
-
-<%#
-# Sidebar
-
-This partial is used to display the sidebar in Administrate.
-By default, the sidebar contains navigation links
-for all resources in the admin dashboard,
-as defined by the routes in the `admin/` namespace
-%>
-
-<ul class="sidebar__list">
-  <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
-    <%# Hack to hide unnecessary models from sidebar %>
-    <% if [:users,:orgs,:perms,:identifier_schemes,:languages,].include? resource %> 
-      <li>
-        <%= link_to(
-          display_resource_name(resource),
-          [namespace, resource],
-          class: "sidebar__link sidebar__link--#{nav_link_state(resource)}"
-        ) %>
-      </li>
-    <% end %>
-  <% end %>
-</ul>
diff --git a/app/views/administrate/application/_admin_header.html.erb b/app/views/administrate/application/_admin_header.html.erb
new file mode 100644
index 0000000..115db95
--- /dev/null
+++ b/app/views/administrate/application/_admin_header.html.erb
@@ -0,0 +1,4 @@
+<div style="margin:0;padding:0">
+        <p><h1>Super Admin area</h1></p>
+        <%= link_to(image_tag("logo.jpg"), root_path)%>
+</div>
diff --git a/app/views/administrate/application/_navigation.html.erb b/app/views/administrate/application/_navigation.html.erb
new file mode 100644
index 0000000..a5cfa7a
--- /dev/null
+++ b/app/views/administrate/application/_navigation.html.erb
@@ -0,0 +1,26 @@
+<%# Hack for customisation %>
+
+<%#
+# Navigation
+
+This partial is used to display the navigation in Administrate.
+By default, the navigation contains navigation links
+for all resources in the admin dashboard,
+as defined by the routes in the `admin/` namespace
+%>
+
+<nav class="navigation" role="navigation">
+
+  <%= render 'admin_header' %>
+
+  <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
+    <%# Hack to hide unnecessary models from sidebar %>
+    <% if ["users","orgs","perms","identifier_schemes","languages",].include? resource.to_s %> 
+        <%= link_to(
+          display_resource_name(resource),
+          [namespace, resource.path],
+          class: "navigation__link navigation__link--#{nav_link_state(resource)}"
+        ) %>
+    <% end %>
+  <% end %>
+</nav>
diff --git a/config/routes.rb b/config/routes.rb
index 1f4d9a1..c09d22f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,7 +19,7 @@
     resources :themes
     resources :notes
     resources :plans
-    resources :plans_guidance_groups
+    # resources :plans_guidance_groups
     resources :identifier_schemes
     resources :exported_plans
     resources :regions