diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index ff58a25..78ecb7c 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -15,9 +15,9 @@
     IdentifierScheme.all.each do |scheme|
       oauth = session["devise.#{scheme.name.downcase}_data"] unless session["devise.#{scheme.name.downcase}_data"].nil?
     end
-    
+
     @user = User.new
-    
+
     unless oauth.nil?
       # The OAuth provider could not be determined or there was no unique UID!
       if oauth[:provider].nil? || oauth[:uid].nil?
@@ -26,7 +26,7 @@
       else
         # Connect the new user with the identifier sent back by the OAuth provider
         flash[:notice] = t('identifier_schemes.new_login_success')
-        UserIdentifier.create(identifier_scheme: oauth[:provider].upcase, 
+        UserIdentifier.create(identifier_scheme: oauth[:provider].upcase,
                               identifier: oauth[:uid],
                               user: @user)
       end
@@ -78,6 +78,7 @@
       @identifier_schemes = IdentifierScheme.where(active: true).order(:name)
       @languages = Language.sorted_by_abbreviation
       do_update(require_password=needs_password?(current_user, params))
+      update_preferences(current_user, params)
     else
       render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false)
     end
@@ -165,22 +166,43 @@
     end
   end
 
+  def update_preferences(current_user, params)
+    prefs = params[:prefs]
+    # Set all preferences to false
+    current_user.prefs.each do |key, value|
+      value.each_key do |k|
+        current_user.prefs[key][k] = false
+      end
+    end
+
+    # Sets the preferences the user wants to true
+    if prefs
+      prefs.each_key do |key|
+        prefs[key].each_key do |k|
+          current_user.prefs[key.to_sym][k.to_sym] = true
+        end
+      end
+    end
+
+    current_user.save
+  end
+
   def sign_up_params
-    params.require(:user).permit(:email, :password, :password_confirmation, 
+    params.require(:user).permit(:email, :password, :password_confirmation,
                                  :firstname, :surname, :recovery_email,
-                                 :accept_terms, :other_organisation)
+                                 :accept_terms, :other_organisation, :prefs)
   end
 
   def update_params
     params.require(:user).permit(:firstname, :org_id, :other_organisation,
-                                :language_id, :surname)
+                                :language_id, :surname, :prefs)
   end
 
   def password_update
     params.require(:user).permit(:email, :firstname, :current_password,
                                 :org_id, :language_id, :password,
                                 :password_confirmation, :surname,
-                                :other_organisation)
+                                :other_organisation, :prefs)
   end
 
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7e4304c..57b504f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -21,10 +21,6 @@
     @perms = user_perms & [Perm.grant_permissions, Perm.modify_templates, Perm.modify_guidance, Perm.use_api, Perm.change_org_details]
   end
 
-  def update_preferences
-
-  end
-
   ##
   # POST - updates the permissions for a user
   # redirects to the admin_index action
diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index e69de29..8ac19a3 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -0,0 +1,37 @@
+<fieldset class="side-by-side">
+  <legend><%= _('If you would like to change your password please complete the following fields.') %></legend>
+
+  <div class="form-input">
+    <label for="user_current_password"><%= _('Current Password') %></label>
+    <input type="password" id="user_current_password" name="user[current_password]"
+           class="left-indent required medium-input" value="" />
+    <span role="" id="current_password_error"
+          class="error-tooltip-right left-indent"></span>
+  </div>
+
+  <div class="form-input">
+    <label for="user_new_password"><%= _('New Password') %></label>
+    <input type="password" id="user_new_password" name="user[new_password]"
+           class="left-indent required medium-input" value="" />
+    <span role="" id="new_password_error"
+          class="error-tooltip-right left-indent"></span>
+  </div>
+
+  <div class="form-input">
+    <label for="user_password_confirmation"><%= _('Password Confirmation') %></label>
+    <input type="password" id="user_password_confirmation"
+           name="user[password_confirmation]"
+           class="left-indent required medium-input" value="" />
+    <span role="" id="password_confirmation_error"
+          class="error-tooltip-right left-indent"></span>
+  </div>
+
+  <div class="form-input">
+    <div class="form-input checkbox-right">
+      <label for="passwords_show" class="checkbox-label">
+        <%= _('Show passwords') %>
+      </label>
+      <input type="checkbox" id="passwords_show" />
+    </div>
+  </div>
+</fieldset>
\ No newline at end of file
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index b72279d..2c54efa 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -1,155 +1,115 @@
 <p>
   <%= _("Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.") %>
 </p>
+<!-- Edit Profile -->
+<fieldset class="side-by-side">
+  <legend><%= _('You can edit any of the details below.') %></legend>
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, class: "roadmap-form white_background"}) do |f| %>
-    <!-- Edit Profile -->
-    <fieldset class="side-by-side">
-      <legend><%= _('You can edit any of the details below.') %></legend>
+  <%#= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %>
 
-      <%= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %>
+  <div class="form-input">
+    <label for="user_email"><%= _('Email') %>*</label>
+    <input type="email" id="user_email" name="user[email]"
+           class="left-indent required input-medium"
+           title="<%= _('Please enter your current password below when changing your email address.') %>"
+           value="<%= @user.email %>" />
+    <span role="" id="email_error" class="error-tooltip-right left-indent"></span>
+  </div>
 
+  <div class="form-input">
+    <label for="user_firstname"><%= _('First Name') %>*</label>
+    <input type="text" id="user_firstname" name="user[firstname]"
+           class="input-small required left-indent"
+           value="<%= @user.firstname %>" />
+  </div>
+  <div class="form-input">
+    <label for="user_surname"><%= _('Last Name') %>*</label>
+    <input type="text" id="user_surname" name="user[surname]"
+           class="input-small required left-indent"
+           value="<%= @user.surname %>" />
+  </div>
+
+  <div class="form-input">
+    <label for="user_recovery_email"><%= _('Recovery Email') %>*</label>
+    <input type="email" id="user_recovery_email" name="user[recovery_email]"
+           class="left-indent required input-medium"
+           title="<%= _('This email will be used to recover your account if you change institutions') %>"
+           value="<%= @user.recovery_email %>" />
+    <span role="" id="recovery_email_error"
+          class="error-tooltip-right left-indent"></span>
+  </div>
+
+  <div class="form-input">
+    <label for="user_surname"><%= _('Organisation') %></label>
+    <%= render partial: "shared/accessible_combobox",
+               locals: {name: "#{resource_name}[org_name]",
+                        id: "#{resource_name}_org_name",
+                        default_selection: @default_org,
+                        models: @orgs,
+                        attribute: 'name',
+                        classes: 'fixed-width-large left-indent'} %>
+  </div>
+
+  <% if MANY_LANGUAGES %>
+    <div class="form-input">
+      <% lang = current_user.language.nil? ? FastGettext.default_locale : current_user.language.abbreviation %>
+      <label for="user_surname"><%= _('Language') %></label>
+      <select id="user_language_id" name="user[language_id]"
+              class="input-medium left-indent">
+        <%= @languages.each do |l| %>
+          <option value="<%= l.id %>"<%= lang == l.abbreviation ? ' selected="selected"' : '' %>>
+            <%= l.name %>
+          </option>
+        <% end %>
+      </select>
+    </div>
+  <% end %>
+
+  <% @identifier_schemes.each do |scheme| %>
+    <%
+    if scheme.name != 'shibboleth' ||
+       (scheme.name == 'shibboleth' && Rails.application.config.shibboleth_enabled)
+    %>
       <div class="form-input">
-        <label for="user_email"><%= _('Email') %>*</label>
-        <input type="email" id="user_email" name="user[email]"
-               class="left-indent required input-medium"
-               title="<%= _('Please enter your current password below when changing your email address.') %>"
-               value="<%= @user.email %>" />
-        <span role="" id="email_error" class="error-tooltip-right left-indent"></span>
-      </div>
-
-      <div class="form-input">
-        <label for="user_firstname"><%= _('First Name') %>*</label>
-        <input type="text" id="user_firstname" name="user[firstname]"
-               class="input-small required left-indent"
-               value="<%= @user.firstname %>" />
-      </div>
-      <div class="form-input">
-        <label for="user_surname"><%= _('Last Name') %>*</label>
-        <input type="text" id="user_surname" name="user[surname]"
-               class="input-small required left-indent"
-               value="<%= @user.surname %>" />
-      </div>
-
-      <div class="form-input">
-        <label for="user_recovery_email"><%= _('Recovery Email') %>*</label>
-        <input type="email" id="user_recovery_email" name="user[recovery_email]"
-               class="left-indent required input-medium"
-               title="<%= _('This email will be used to recover your account if you change institutions') %>"
-               value="<%= @user.recovery_email %>" />
-        <span role="" id="recovery_email_error"
-              class="error-tooltip-right left-indent"></span>
-      </div>
-
-      <div class="form-input">
-        <label for="user_surname"><%= _('Organisation') %></label>
-        <%= render partial: "shared/accessible_combobox",
-                   locals: {name: "#{resource_name}[org_name]",
-                            id: "#{resource_name}_org_name",
-                            default_selection: @default_org,
-                            models: @orgs,
-                            attribute: 'name',
-                            classes: 'fixed-width-large left-indent'} %>
-      </div>
-
-      <% if MANY_LANGUAGES %>
-        <div class="form-input">
-          <% lang = current_user.language.nil? ? FastGettext.default_locale : current_user.language.abbreviation %>
-          <label for="user_surname"><%= _('Language') %></label>
-          <select id="user_language_id" name="user[language_id]"
-                  class="input-medium left-indent">
-            <%= @languages.each do |l| %>
-              <option value="<%= l.id %>"<%= lang == l.abbreviation ? ' selected="selected"' : '' %>>
-                <%= l.name %>
-              </option>
+        <label>
+            <% if scheme.logo_url.nil? %>
+                <i class="fa fa-user" title="<%= scheme.name %>" aria-hidden="true" style="font-size:16px; width:16px; text-align:center;"></i>
+            <% else %>
+                <img title="<%= scheme.name %>" src=<%= "#{scheme.logo_url}" %> size="16px" />
             <% end %>
-          </select>
-        </div>
-      <% end %>
-
-      <% @identifier_schemes.each do |scheme| %>
-        <div>
-          <label><%= scheme.name %></label>
-          <div class="identifier-scheme identifier-scheme-indent">
-            <%= render partial: 'external_identifier',
-                       locals: {scheme: scheme,
-                                id: current_user.identifier_for(scheme)} %>
-          </div>
-        </div>
-      <% end %>
-
-      <% unless @user.api_token.blank? %>
-        <div class="form-input">
-          <%= f.label :api_token, _('API token') %>
-          <div class="input-medium"><%= @user.api_token %></div>
-
-          <label><%= _('API Information') %></label>
-          <div><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></div>
-        </div>
-      <% end %>
-
-      <br />
-
-      <legend><%= _('If you would like to change your password please complete the following fields.') %></legend>
-
-      <div class="form-input">
-        <label for="user_current_password"><%= _('Current Password') %></label>
-        <input type="password" id="user_current_password" name="user[current_password]"
-               class="left-indent required medium-input" value="" />
-        <span role="" id="current_password_error"
-              class="error-tooltip-right left-indent"></span>
-      </div>
-
-      <div class="form-input">
-        <label for="user_new_password"><%= _('New Password') %></label>
-        <input type="password" id="user_new_password" name="user[new_password]"
-               class="left-indent required medium-input" value="" />
-        <span role="" id="new_password_error"
-              class="error-tooltip-right left-indent"></span>
-      </div>
-
-      <div class="form-input">
-        <label for="user_password_confirmation"><%= _('Password Confirmation') %></label>
-        <input type="password" id="user_password_confirmation"
-               name="user[password_confirmation]"
-               class="left-indent required medium-input" value="" />
-        <span role="" id="password_confirmation_error"
-              class="error-tooltip-right left-indent"></span>
-      </div>
-
-      <div class="form-input">
-        <div class="form-input checkbox-right">
-          <label for="passwords_show" class="checkbox-label">
-            <%= _('Show passwords') %>
-          </label>
-          <input type="checkbox" id="passwords_show" />
+       </label>
+        <div class="identifier-scheme left-indent">
+          <%= render partial: 'external_identifier',
+                     locals: {scheme: scheme,
+                              id: current_user.identifier_for(scheme)} %>
         </div>
       </div>
+    <% end %>
+  <% end %>
 
-      <div class="form-input">
-        <label></label>
-        <%= render partial: 'shared/accessible_submit_button',
-                   locals: {id: 'update',
-                            val: 'Save',
-                            disabled_initially: true,
-                            classes: 'small-input-button',
-                            tooltip: _('Enter all of the required information above')} %>
-      </div>
-    </fieldset>
+  <% unless @user.api_token.blank? %>
+    <div class="form-input">
+      <%= f.label :api_token, _('API token') %>
+      <div class="input-medium"><%= @user.api_token %></div>
 
-<% end %>
+      <label><%= _('API Information') %></label>
+      <div><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></div>
+    </div>
+  <% end %>
+</fieldset>
+
 
 
 <!-- alert for the default template-->
 <div id="unlink-institutional-credentials-dialog" data-container="body" data-backdrop="static" class="modal hide fade">
-<div class="modal-header">
-  <h3><%= _('Unlink institutional credentials alert') %></h3>
-</div>
-<div class="modal-body">
-  <%= raw _('<p>You are about to unlink %{application_name} of your institutional credentials, would you like to continue?</p>') % { :application_name => user_shibboleth_omniauth_authorize_path } %>
-</div>
-<div class="modal-footer">
-  <a href="#" id="unlink-shibboleth-cancelled" class="btn"><%= _('Cancel') %></a>
-  <a href="#" id="unlink-shibboleth-confirmed" class="btn btn-primary"><%= _('Unlink account') %></a>
-</div>
+  <div class="modal-header">
+    <h3><%= _('Unlink institutional credentials alert') %></h3>
+  </div>
+  <div class="modal-body">
+    <%= raw _('<p>You are about to unlink %{application_name} of your institutional credentials, would you like to continue?</p>') % { :application_name => user_shibboleth_omniauth_authorize_path } %>
+  </div>
+  <div class="modal-footer">
+    <a href="#" id="unlink-shibboleth-cancelled" class="btn"><%= _('Cancel') %></a>
+    <a href="#" id="unlink-shibboleth-confirmed" class="btn btn-primary"><%= _('Unlink account') %></a>
+  </div>
 </div>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 44733a9..f79598a 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,172 +1,49 @@
 <% javascript "devise/registrations/edit.js" %>
-
-<div class="main">
+<div class="user_profile">
   <h1><%= _('Edit profile') %></h1>
 
-  <p>
-    <%= _("Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.") %>
-  </p>
-
   <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, class: "roadmap-form white_background"}) do |f| %>
-      <!-- Edit Profile -->
-      <fieldset class="side-by-side">
-        <legend><%= _('You can edit any of the details below.') %></legend>
+    <div class="tabbed-area">
+      <ul class="tabs" role="tablist">
+        <li id="personal-details-tab" class="active" role="tab" aria-controls="personal-details-panel">
+          <a href="#personal-details-panel" aria-selected="true">Personal Details</a>
+        </li>
+        <li id="password-details-tab" role="tab" aria-controls="password-details-panel">
+          <a href="#password-details-panel" aria-selected="false">Password</a>
+        </li>
+        <li id="notification-preferences-tab" role="tab" aria-controls="notification-preferences-panel">
+          <a href="#notification-preferences-panel" aria-selected="false">Notification Preferences</a>
+        </li>
+      </ul>
 
-        <%= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %>
-
-        <div class="form-input">
-          <label for="user_email"><%= _('Email') %>*</label>
-          <input type="email" id="user_email" name="user[email]"
-                 class="left-indent required input-medium"
-                 title="<%= _('Please enter your current password below when changing your email address.') %>"
-                 value="<%= @user.email %>" />
-          <span role="" id="email_error" class="error-tooltip-right left-indent"></span>
+      <div class="tab-panels" role="tabpanel">
+        <div id="personal-details-panel" class="tab-panel active centered" aria-hidden="false"
+             aria-labelledby="personal-details-tab">
+          <%= render partial: 'devise/registrations/personal_details', f: f %>
         </div>
 
-        <div class="form-input">
-          <label for="user_firstname"><%= _('First Name') %>*</label>
-          <input type="text" id="user_firstname" name="user[firstname]"
-                 class="input-small required left-indent"
-                 value="<%= @user.firstname %>" />
-        </div>
-        <div class="form-input">
-          <label for="user_surname"><%= _('Last Name') %>*</label>
-          <input type="text" id="user_surname" name="user[surname]"
-                 class="input-small required left-indent"
-                 value="<%= @user.surname %>" />
+        <div id="password-panel" aria-hidden="true" class="tab-panel" role="tabpanel"
+             aria-labelledby="password-tab">
+          <%= render partial: 'devise/registrations/password_details', f: f %>
         </div>
 
-        <div class="form-input">
-          <label for="user_recovery_email"><%= _('Recovery Email') %>*</label>
-          <input type="email" id="user_recovery_email" name="user[recovery_email]"
-                 class="left-indent required input-medium"
-                 title="<%= _('This email will be used to recover your account if you change institutions') %>"
-                 value="<%= @user.recovery_email %>" />
-          <span role="" id="recovery_email_error"
-                class="error-tooltip-right left-indent"></span>
+        <div id="notification-preferences-panel" aria-hidden="true" class="tab-panel"
+             role="tabpanel" aria-labelledby="notification-preferences-tab">
+          <%= render partial: 'users/notification_preferences' %>
         </div>
+      </div>
+    </div>
 
-        <div class="form-input">
-          <label for="user_surname"><%= _('Organisation') %></label>
-          <%= render partial: "shared/accessible_combobox",
-                     locals: {name: "#{resource_name}[org_name]",
-                              id: "#{resource_name}_org_name",
-                              default_selection: @default_org,
-                              models: @orgs,
-                              attribute: 'name',
-                              classes: 'fixed-width-large left-indent'} %>
-        </div>
+    <br/>
 
-        <% if MANY_LANGUAGES %>
-          <div class="form-input">
-            <% lang = current_user.language.nil? ? FastGettext.default_locale : current_user.language.abbreviation %>
-            <label for="user_surname"><%= _('Language') %></label>
-            <select id="user_language_id" name="user[language_id]"
-                    class="input-medium left-indent">
-              <%= @languages.each do |l| %>
-                <option value="<%= l.id %>"<%= lang == l.abbreviation ? ' selected="selected"' : '' %>>
-                  <%= l.name %>
-                </option>
-              <% end %>
-            </select>
-          </div>
-        <% end %>
-
-        <% @identifier_schemes.each do |scheme| %>
-          <% 
-          if scheme.name != 'shibboleth' || 
-             (scheme.name == 'shibboleth' && Rails.application.config.shibboleth_enabled) 
-          %>
-            <div class="form-input">
-              <label>
-                  <% if scheme.logo_url.nil? %>
-                      <i class="fa fa-user" title="<%= scheme.name %>" aria-hidden="true" style="font-size:16px; width:16px; text-align:center;"></i>
-                  <% else %>
-                      <img title="<%= scheme.name %>" src=<%= "#{scheme.logo_url}" %> size="16px" />
-                  <% end %>
-             </label>
-              <div class="identifier-scheme left-indent">
-                <%= render partial: 'external_identifier', 
-                           locals: {scheme: scheme, 
-                                    id: current_user.identifier_for(scheme)} %>
-              </div>
-            </div>
-          <% end %>
-        <% end %>
-
-        <% unless @user.api_token.blank? %>
-          <div class="form-input">
-            <%= f.label :api_token, _('API token') %>
-            <div class="input-medium"><%= @user.api_token %></div>
-
-            <label><%= _('API Information') %></label>
-            <div><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></div>
-          </div>
-        <% end %>
-
-        <br />
-
-        <legend><%= _('If you would like to change your password please complete the following fields.') %></legend>
-
-        <div class="form-input">
-          <label for="user_current_password"><%= _('Current Password') %></label>
-          <input type="password" id="user_current_password" name="user[current_password]"
-                 class="left-indent required medium-input" value="" />
-          <span role="" id="current_password_error"
-                class="error-tooltip-right left-indent"></span>
-        </div>
-
-        <div class="form-input">
-          <label for="user_new_password"><%= _('New Password') %></label>
-          <input type="password" id="user_new_password" name="user[new_password]"
-                 class="left-indent required medium-input" value="" />
-          <span role="" id="new_password_error"
-                class="error-tooltip-right left-indent"></span>
-        </div>
-
-        <div class="form-input">
-          <label for="user_password_confirmation"><%= _('Password Confirmation') %></label>
-          <input type="password" id="user_password_confirmation"
-                 name="user[password_confirmation]"
-                 class="left-indent required medium-input" value="" />
-          <span role="" id="password_confirmation_error"
-                class="error-tooltip-right left-indent"></span>
-        </div>
-
-        <div class="form-input">
-          <div class="form-input checkbox-right">
-            <label for="passwords_show" class="checkbox-label">
-              <%= _('Show passwords') %>
-            </label>
-            <input type="checkbox" id="passwords_show" />
-          </div>
-        </div>
-
-        <div class="form-input">
-          <label></label>
-          <%= render partial: 'shared/accessible_submit_button',
-                     locals: {id: 'update',
-                              val: 'Save',
-                              disabled_initially: true,
-                              classes: 'small-input-button',
-                              tooltip: _('Enter all of the required information above')} %>
-        </div>
-      </fieldset>
-
+    <div class="form-input">
+      <label></label>
+      <%= render partial: 'shared/accessible_submit_button',
+                 locals: {id: 'update',
+                          val: 'Save',
+                          disabled_initially: true,
+                          classes: 'small-input-button',
+                          tooltip: _('Enter all of the required information above')} %>
+    </div>
   <% end %>
-</div>
-
-
-<!-- alert for the default template-->
-<div id="unlink-institutional-credentials-dialog" data-container="body" data-backdrop="static" class="modal hide fade">
-  <div class="modal-header">
-    <h3><%= _('Unlink institutional credentials alert') %></h3>
-  </div>
-  <div class="modal-body">
-    <%= raw _('<p>You are about to unlink %{application_name} of your institutional credentials, would you like to continue?</p>') % { :application_name => user_shibboleth_omniauth_authorize_path } %>
-  </div>
-  <div class="modal-footer">
-    <a href="#" id="unlink-shibboleth-cancelled" class="btn"><%= _('Cancel') %></a>
-    <a href="#" id="unlink-shibboleth-confirmed" class="btn btn-primary"><%= _('Unlink account') %></a>
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_notification_preferences.html.erb b/app/views/users/_notification_preferences.html.erb
index 5a79ec9..603b6df 100644
--- a/app/views/users/_notification_preferences.html.erb
+++ b/app/views/users/_notification_preferences.html.erb
@@ -1,59 +1,65 @@
-<p><%= link_to 'Select all', '#' %> |
-	<%= link_to 'Deselect all', '#' %></p>
-<% byebug %>
-<div>
+<p><%= link_to 'Select all', '#', id: 'select_all' %> |
+<%= link_to 'Deselect all', '#', id: 'deselect_all' %></p>
+
+<fieldset class="preferences">
   <p><strong>All Users</strong></p>
-	<div class="preferences">
+	<div>
 		<input checked="checked" id="prefs_users_permission_granted" class="checkbox-input"
 					 name="prefs[users][permission_granted]" type="checkbox" value="true">
 		<label class="checkbox-label" for="prefs_users_permission_granted">New permissions granted to me</label>
 		<%#=  check_box_tag 'prefs[users][permission_granted]', true, @user.prefs[:users][:permission_granted] %>
 		<%#= label_tag 'prefs[users][permission_granted]', 'New permissions granted to me', :class => 'checkbox-label' %>
 	</div>
-  <div class="preferences">
+  <div>
 		<input checked="checked" id="prefs_users_new_comment" class="checkbox-input"
 					 name="prefs[users][new_comment]" type="checkbox" value="true">
 		<label class="checkbox-label" for="prefs_users_new_comment">A new comment has been added to my DMP</label>
 		<%#=  check_box_tag 'prefs[users][new_comment]', true, @user.prefs[:users][:new_comment] %>
 		<%#= label_tag 'prefs[users][new_comment]', 'A new comment has been added to my DMP', :class => 'checkbox-label' %>
 	</div>
-</div>
-<br/>
-<div>
+	<br/>
+
 	<p><strong>DMP owners and co-owners</strong></p>
-  <div class="preferences">
+  <div>
 		<input checked="checked" id="prefs_owners_and_coowners_visibility_changed"
 		class="checkbox-input" name="prefs[owners_and_coowners][visibility_changed]" type="checkbox" value="true">
 		<label class="checkbox-label" for="prefs_owners_and_coowners_visibility_changed">My DMP's visibility has changed</label>
     <%#=  check_box_tag 'prefs[owners_and_coowners][visibility_changed]', true, @user.prefs[:owners_and_coowners][:visibility_changed] %>
     <%#= label_tag 'prefs[owners_and_coowners][visibility_changed]', "My DMP's visibility has changed", :class => 'checkbox-label' %>
   </div>
-  <div class="preferences">
+  <div>
 		<input checked="checked" id="prefs_owners_and_coowners_user_added" class="checkbox-input" name="prefs[owners_and_coowners][user_added]" type="checkbox" value="true">
 		<label class="checkbox-label" for="prefs_owners_and_coowners_user_added">I have been made a co-owner of a DMP</label>
     <%#=  check_box_tag 'prefs[owners_and_coowners][user_added]', true, @user.prefs[:owners_and_coowners][:user_added] %>
     <%#= label_tag 'prefs[owners_and_coowners][user_added]', 'I have been made a co-owner of a DMP', :class => 'checkbox-label' %>
 	</div>
-</div>
-<br/>
-<div>
+
+	<br/>
 	<p><strong>DMP administrators</strong></p>
-  <div class="preferences">
+  <div>
 		<input checked="checked" id="prefs_admins_template_published" class="checkbox-input" name="prefs[admins][template_published]" type="checkbox" value="true">
 		<label class="checkbox-label" for="prefs_admins_template_published">An organisational template is published</label>
 		<%#=  check_box_tag 'prefs[admins][template_published]', true, @user.prefs[:admins][:template_published] %>
 		<%#= label_tag 'prefs[admins][template_published]', 'An organisational template is published', :class => 'checkbox-label' %>
 	</div>
-  <div class="preferences">
+  <div>
 		<input checked="checked" id="prefs_admins_template_unpublished" class="checkbox-input"
 		name="prefs[admins][template_unpublished]" type="checkbox" value="true">
 		<label class="checkbox-label" for="prefs_admins_template_unpublished">An organisational template is unpublished</label>
 		<%#=  check_box_tag 'prefs[admins][template_unpublished]', true, @user.prefs[:admins][:template_unpublished] %>
 		<%#= label_tag 'prefs[admins][template_unpublished]', 'An organisational template is unpublished', :class => 'checkbox-label' %>
 	</div>
-</div>
-<br/>
-<div>
-	<%= button_to 'Save', user_update_preferences_path(@user), class: 'form-submit btn btn-primary' %>
- 	<%= link_to 'Cancel', '#', class: 'btn btn-primary' %>
-</div>
+</fieldset>
+
+
+<script type="text/javascript">
+$(document).ready(function() {
+	$("#select_all").click(function() {
+		$('.preferences').find('input[type="checkbox"]').prop('checked', true);;
+	});
+
+	$("#deselect_all").click(function() {
+		$('.preferences').find('input[type="checkbox"]').prop('checked', false);;
+	});
+});
+</script>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index e1a22f9..cfb0a8c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,8 +51,6 @@
 
   delete '/users/identifiers/:id', to: 'user_identifiers#destroy', as: 'destroy_user_identifier'
 
-  post 'users/update_preferences/:id', to: 'user#update_preferences', as: 'user_update_preferences'
-
   get '/orgs/shibboleth', to: 'orgs#shibboleth_ds', as: 'shibboleth_ds'
   get '/orgs/shibboleth/:org_name', to: 'orgs#shibboleth_ds_passthru'  # if an org id is present passthru to shib
   post '/orgs/shibboleth', to: 'orgs#shibboleth_ds_passthru'
diff --git a/lib/assets/stylesheets/roadmap-tabs.scss b/lib/assets/stylesheets/roadmap-tabs.scss
index 9913fd5..bd781df 100644
--- a/lib/assets/stylesheets/roadmap-tabs.scss
+++ b/lib/assets/stylesheets/roadmap-tabs.scss
@@ -2,20 +2,20 @@
 
 /* Roadmap Tab Styling */
 /* ------------------------------------------------ */
-.tabs {
+.tabs #user_profile.tabs {
   list-style: none;
   margin: 0;
 
   li {
     display: inline;
-    
+
     a {
       position: relative;
       float: left;
       display: block;
       padding: 10px 35px;
       margin-left: -1px;
-      left: 1px; 
+      left: 1px;
       color: $white;
       background-color: $primary-color;
       text-decoration: none;
@@ -29,7 +29,7 @@
     background-color: $white;
   }
 }
-.tabs:after {
+.tabs:after #user_profile.tabs:after {
   visibility: hidden;
   display: block;
   font-size: 0;
@@ -37,19 +37,18 @@
   clear: both;
   height: 0;
 }
-.tab-panels {
+.tab-panels #user_profile.tab-panels {
   position: relative;
-  min-height: 250px;
+  min-height: 400px;
 }
-.tabbed-area div.tab-panel {
-  background: white;
-  padding: 10px 20px;
-  min-height: 230px;
+.tabbed-area div.tab-panel #user_profile.tabbed-area #user-profile.tab-panel {
+  padding: 10px 10px;
+  min-height: 300px;
   position: absolute;
   top: -1px;
   left: 0;
   width: 100%;
 }
-.tab-panel div.active {
+.tab-panel div.active #user_profile.tab-panel {
   z-index: 1;
 }
\ No newline at end of file