diff --git a/app/models/user.rb b/app/models/user.rb
index 03c68ba..ca5d552 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,8 +58,7 @@
 
 
   validates :prefs, presence: true
-  before_validation :create_default_preferences, if: Proc.new { |x| x.prefs.empty? }
-  ## user.prefs = create_default_preferences
+  before_create :create_default_preferences
 
   ##
   # Scopes
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index 2c54efa..7a0bd0a 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -1,115 +1,122 @@
-<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>
+<div style="width: 80%; float:left">
+  <!-- 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>
+      <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>
-  <% 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_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">
-        <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>
+        <% 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 %>
-  <% end %>
 
-  <% unless @user.api_token.blank? %>
-    <div class="form-input">
-      <%= f.label :api_token, _('API token') %>
-      <div class="input-medium"><%= @user.api_token %></div>
+    <% @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 %>
 
-      <label><%= _('API Information') %></label>
-      <div><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></div>
+    <% 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 %>
+  </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>
-  <% 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 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>
+
+<div style="width: 20%; float:right">
+  <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>
+</div>
+
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index db16237..7bd4782 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -17,12 +17,12 @@
       </ul>
 
       <div class="tab-panels" role="tabpanel">
-        <div id="personal-details-panel" class="tab-panel active centered" aria-hidden="false"
+        <div id="personal-details-panel" class="tab-panel active" aria-hidden="false"
              aria-labelledby="personal-details-tab">
           <%= render partial: 'devise/registrations/personal_details', f: f %>
         </div>
 
-        <div id="password-panel" aria-hidden="true" class="tab-panel" role="tabpanel"
+        <div id="password-details-panel" aria-hidden="true" class="tab-panel" role="tabpanel"
              aria-labelledby="password-tab">
           <%= render partial: 'devise/registrations/password_details', f: f %>
         </div>
@@ -36,7 +36,7 @@
 
     <br/>
 
-    <div class="form-input">
+    <div class='form-input'>
       <label></label>
       <%= render partial: 'shared/accessible_submit_button',
                  locals: {id: 'update',
@@ -44,6 +44,30 @@
                           disabled_initially: true,
                           classes: 'small-input-button',
                           tooltip: _('Enter all of the required information above')} %>
+      <%= link_to 'Cancel', '#', style: 'text-decoration:none;'  %>
     </div>
   <% end %>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+  $(".tab-panels div.tab-panel:not(.active)").hide();
+
+  $(".tabs li a").click(function(e){
+    e.preventDefault();
+
+    // Make the clicked tab the active tab
+    $(this).parent().addClass('active');
+    $(this).attr('aria-selected', 'true');
+    $.each($(this).parent().siblings(), function(i, sib){
+      $(sib).removeClass('active');
+      $(sib).find('> a').attr('aria-selected', 'false');
+    });
+
+    // Make the corresponding panel visible and the others hidden
+    let panel = $($(this).attr("href"));
+    panel.show().attr("aria-hidden", 'false');
+    $.each($(panel).siblings(), function(i, p){
+      $(p).hide().attr("aria-hidden", 'true');
+    });
+  });
+</script>
\ 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 603b6df..7dae888 100644
--- a/app/views/users/_notification_preferences.html.erb
+++ b/app/views/users/_notification_preferences.html.erb
@@ -4,50 +4,34 @@
 <fieldset class="preferences">
   <p><strong>All Users</strong></p>
 	<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' %>
+		<%=  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>
-		<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' %>
+		<%=  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>
 	<br/>
 
 	<p><strong>DMP owners and co-owners</strong></p>
   <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' %>
+    <%=  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>
-		<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' %>
+    <%=  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>
 
 	<br/>
 	<p><strong>DMP administrators</strong></p>
   <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' %>
+		<%=  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>
-		<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' %>
+		<%=  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>
 </fieldset>
 
diff --git a/lib/assets/stylesheets/roadmap-tabs.scss b/lib/assets/stylesheets/roadmap-tabs.scss
index bd781df..a2e6842 100644
--- a/lib/assets/stylesheets/roadmap-tabs.scss
+++ b/lib/assets/stylesheets/roadmap-tabs.scss
@@ -2,7 +2,7 @@
 
 /* Roadmap Tab Styling */
 /* ------------------------------------------------ */
-.tabs #user_profile.tabs {
+.tabs {
   list-style: none;
   margin: 0;
 
@@ -29,7 +29,7 @@
     background-color: $white;
   }
 }
-.tabs:after #user_profile.tabs:after {
+.tabs:after {
   visibility: hidden;
   display: block;
   font-size: 0;
@@ -37,11 +37,11 @@
   clear: both;
   height: 0;
 }
-.tab-panels #user_profile.tab-panels {
+.tab-panels {
   position: relative;
-  min-height: 400px;
+  min-height: 350px;
 }
-.tabbed-area div.tab-panel #user_profile.tabbed-area #user-profile.tab-panel {
+.tabbed-area div.tab-panel {
   padding: 10px 10px;
   min-height: 300px;
   position: absolute;
@@ -49,6 +49,6 @@
   left: 0;
   width: 100%;
 }
-.tab-panel div.active #user_profile.tab-panel {
+.tab-panel div.active {
   z-index: 1;
 }
\ No newline at end of file
diff --git a/lib/assets/stylesheets/roadmap.scss b/lib/assets/stylesheets/roadmap.scss
index 55d8802..2a645da 100644
--- a/lib/assets/stylesheets/roadmap.scss
+++ b/lib/assets/stylesheets/roadmap.scss
@@ -97,4 +97,4 @@
   height: 17px;
   margin: 0 4px 0 0;
   padding: 0;
-}
+}
\ No newline at end of file