diff --git a/app/views/devise/registrations/_external_identifier_shibboleth.html.erb b/app/views/devise/registrations/_external_identifier_shibboleth.html.erb
index 39078c1..0fa1626 100644
--- a/app/views/devise/registrations/_external_identifier_shibboleth.html.erb
+++ b/app/views/devise/registrations/_external_identifier_shibboleth.html.erb
@@ -16,6 +16,7 @@
     <%= link_to '<i class="fa fa-fw fa-times-circle" aria-hidden="false"></i>'.html_safe, 
                 destroy_user_identifier_path(id), method: :delete,
                 title: _("Unlink your account from #{scheme.description}. You can link again at any time."),
+								'data-toggle': "modal", 'dialog-width': "450px",
                 data: {confirm: _("Are you sure you want to unlink #{scheme.description} ID?")} %>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index 02e38c4..6fd93fc 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -7,7 +7,7 @@
     <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="" />
+             class="left-indent required input-medium" value="" />
       <span role="" id="current_password_error"
             class="error-tooltip-right left-indent"></span>
     </div>
@@ -15,7 +15,7 @@
     <div class="form-input">
       <label for="user_password"><%= _('New Password') %></label>
       <input type="password" id="user_password" name="user[password]"
-             class="left-indent required medium-input" value="" />
+             class="left-indent required input-medium" value="" />
       <span role="" id="password_error"
             class="error-tooltip-right left-indent"></span>
     </div>
@@ -24,29 +24,25 @@
       <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="" />
+             class="left-indent required input-medium" 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>
+      <label for="password_show"><%= _('Show passwords') %></label>
+      <input type="checkbox" id="password_show" class="left-indent" />
+    </div>
+    
+    <br />
+    <div class='form-input'>
+      <label></label>
+      <%= render partial: 'shared/accessible_submit_button',
+                 locals: {id: 'update',
+                          val: 'Save',
+                          disabled_initially: false,
+                          classes: 'small-input-button left-indent',
+                          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: false,
-                        classes: 'small-input-button',
-                        tooltip: _('Enter all of the required information above')} %>
-    <%= link_to 'Cancel', '#', style: 'text-decoration:none;'  %>
-  </div>
 <% end %>
\ 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 7899829..be39742 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -1,137 +1,131 @@
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, class: "roadmap-form white_background"}) do |f| %>
 
-<div class="profile_text">
-  <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>
-
-<div>
-  <!-- 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 :skip_personal_details, "false" %>
-
-    <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_password"><%= _('Password') %></label>
-      <input type="password" id="user_password" name="user[password]"
-             class="left-indent required input-medium" value="" />
-      <span role="" id="password_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| %>
-        <div class="form-input">
-          <% if scheme.name == 'shibboleth' %>
-              <label>           
-                <i class="fa fa-user" title="<%= scheme.name %>" aria-hidden="true" style="font-size:16px; width:16px; text-align:center;"></i>
-              </label>
-          <% else %>
-              <label for="scheme_name"><%= scheme.name.capitalize %></label>
-          <% end %>
-          <div class="identifier-scheme left-indent">
-            <%= render partial: "external_identifier_#{scheme.name}",
-                       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 %>
-
-  </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')} %>
-    <%= link_to 'Cancel', '#', style: 'text-decoration:none;'  %>
+  <div class="profile_text">
+    <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>
-</div>
+
+  <div>
+    <!-- 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 :skip_personal_details, "false" %>
+
+      <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_password"><%= _('Password') %></label>
+        <input type="password" id="user_password" name="user[password]"
+               class="left-indent required input-medium" value="" />
+        <span role="" id="password_error"
+              class="error-tooltip-right left-indent"></span>
+      </div>
+
+      <div class="form-input accessible-combobox-smaller">
+        <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: '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-small 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| %>
+          <div class="form-input">
+            <% if scheme.name == 'shibboleth' %>
+                <label>           
+                  <i class="fa fa-user" title="<%= scheme.name %>" aria-hidden="true" style="font-size:16px; width:16px; text-align:center;"></i>
+                </label>
+            <% else %>
+                <label for="scheme_name"><%= scheme.name.capitalize %></label>
+            <% end %>
+            <div class="identifier-scheme left-indent">
+              <%= render partial: "external_identifier_#{scheme.name}",
+                         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 />
+      <div class='form-input'>
+        <label></label>
+        <%= render partial: 'shared/accessible_submit_button',
+                   locals: {id: 'update',
+                            val: 'Save',
+                            disabled_initially: true,
+                            classes: 'small-input-button left-indent',
+                            tooltip: _('Enter all of the required information above')} %>
+      </div>
+
+    </fieldset>
+  </div>
 <% end %>
 
 <!-- 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>
\ No newline at end of file
+<div id="unlink-institutional-credentials-dialog" class="modal" style="display: none;">
+  <p><%= _('You are about to unlink %{application_name} of your institutional credentials, would you like to continue?') % { :application_name => user_shibboleth_omniauth_authorize_path } %></p>
+  <a href="#" id="unlink-shibboleth-cancelled" class="btn"><%= _('Cancel') %></a>
+  <a href="#" id="unlink-shibboleth-confirmed" class="btn btn-primary"><%= _('Unlink account') %></a>
+</div>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index ca84c15..5fa5a66 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,6 +1,8 @@
 <% javascript "views/devise/registrations/edit.js" %>
 
 <h1><%= _('Edit profile') %></h1>
+
+<div class="content">
   <div class="tabbed-area">
     <ul class="tabs" role="tablist">
       <li id="personal-details-tab" class="active" role="tab" aria-controls="personal-details-panel">
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index a8db978..45adef7 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -1,80 +1,80 @@
 <% javascript('views/plans/edit.js') %>
 
 <%= form_for plan, html: {method: :put, class: "roadmap-form"} do |f| %>
-	<div class="edit-plan-left">
-		<fieldset class="side-by-side">
-		  <div class="form-input">
-		    <%= f.label "#{_('Project Title')} #{_('(required)')}", for: :title %>
+  <div class="edit-plan-left">
+    <fieldset class="side-by-side">
+      <div class="form-input">
+        <%= f.label "#{_('Project Title')} #{_('(required)')}", for: :title %>
         <%= f.text_field :title, class: "input-large has-tooltip", 'data-toggle': "tooltip", 
                 'title': _('If applying for funding, state the name exactly as in the grant proposal.') %>
-		  </div>
+      </div>
   
-		  <div class="form-input">
-		    <%= f.label :grant_number %>
+      <div class="form-input">
+        <%= f.label :grant_number %>
         <%= f.text_field :grant_number, class: 'input-small has-tooltip', 'data-toggle': "tooltip", 
                 'title': _('Grant reference number if applicable [POST-AWARD DMPs ONLY]') %>
-		  </div>
+      </div>
   
-		  <div class="form-input">
-		    <%= f.label :principal_investigator %>
+      <div class="form-input">
+        <%= f.label :principal_investigator %>
         <%= f.text_field :principal_investigator, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", 
                 'title': _('Name of Principal Investigator(s) or main researcher(s) on the project.') %>
-		  </div>
+      </div>
   
-		  <div class="form-input">
-		    <%= f.label _('Project Abstract'), for: :description %>
+      <div class="form-input">
+        <%= f.label _('Project Abstract'), for: :description %>
         <%= f.text_area :description, { rows: 7, class: 'input-large has-tooltip', 
                 'data-toggle': "tooltip", 'data-html': "true", 
                 'title': _("<div class='tooltip_box'><h4>Questions to consider:</h4><ul><li>- What is the nature of your research project?</li><li>- What research questions are you addressing? </li><li>- For what purpose are the data being collected or created? </li></ul><h4>Guidance:</h4><p>Briefly summarise the type of study (or studies) to help others understand the purposes for which the data are being collected or created.</p></div>")} %>
-		  </div>
+      </div>
   
-		  <hr />
+      <hr />
   
-		  <div class="form-input">
-		    <%= f.label _('Plan ID'), for: :identifier %>
+      <div class="form-input">
+        <%= f.label _('Plan ID'), for: :identifier %>
         <%= f.text_field :identifier, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", 
                 'title': _('A pertinent ID as determined by the funder and/or institution.') %>
-		  </div>
+      </div>
   
-		  <br />
-			<div>
-		  	<label><strong><%= _('Data Contact Person') %></strong></label>
-			</div>
-		  <div class="form-input">
-		    <%= f.label _('Name'), for: :data_contact %>
+      <br />
+      <div>
+        <label><strong><%= _('Data Contact Person') %></strong></label>
+      </div>
+      <div class="form-input">
+        <%= f.label _('Name'), for: :data_contact %>
         <%= f.text_field :data_contact, class: 'input-medium has-tooltip', 'data-toggle': "tooltip", 
                 'title': _('Name (if different to above), telephone and email contact details') %>
-		  </div>
-			
-			<br />
-			<br />
-	    <div class="form-input">
-	      <label></label>
-	      <input type="submit" class="form-submit" value="<%= _('Save') %>" />
-	    </div>
-		</fieldset>
-	</div>
+      </div>
+      
+      <br />
+      <br />
+      <div class="form-input">
+        <label></label>
+        <input type="submit" class="form-submit" value="<%= _('Save') %>" />
+      </div>
+    </fieldset>
+  </div>
 
-	<div class="edit-plan-right">
-		<fieldset class="standard">
-			<span class="fa fa-question-circle"></span>
-			<div class="left-indent inline">
-				<label for="plan_visibility"> <%= _('Plan Visibility') %></label>
-				<div class="left-indent">(<%= _('Limited to finished plans') %>)</div>
-				<br />
-				<div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= !['publicly_visible', 'organisationally_visible'].include?(plan.visibility) ? ' checked=true' : '' %> /><%= raw display_visibility('privately_visible') %></div>
-				<div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= 'organisationally_visible' == plan.visibility ? ' checked=true' : '' %> /><%= raw display_visibility('organisationally_visible') %></div>
-				<div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= 'publicly_visible' == plan.visibility ? ' checked=true' : '' %> /><%= raw display_visibility('publicly_visible') %></div>
-			</div>
-		</fieldset>
-		
-		<div class="bordered left-indent">
-			<div class="bordered"><strong><%= _('Plan Guidance Configuration') %></strong></div>
-			<p><%= _('To help you write your plan, %{application_name} can show you guidance from a variety of organisations.') % {application_name: Rails.configuration.branding[:application][:name]} %></p>
-			<br />
-			<p><% _('Select up to 3 organisations to see their guidance.') %></p>
-			
+  <div class="edit-plan-right">
+    <fieldset class="standard">
+      <span class="fa fa-question-circle"></span>
+      <div class="left-indent inline">
+        <label for="plan_visibility"> <%= _('Plan Visibility') %></label>
+        <div class="left-indent">(<%= _('Limited to finished plans') %>)</div>
+        <br />
+        <div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= !['publicly_visible', 'organisationally_visible'].include?(plan.visibility) ? ' checked=true' : '' %> /><%= raw display_visibility('privately_visible') %></div>
+        <div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= 'organisationally_visible' == plan.visibility ? ' checked=true' : '' %> /><%= raw display_visibility('organisationally_visible') %></div>
+        <div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= 'publicly_visible' == plan.visibility ? ' checked=true' : '' %> /><%= raw display_visibility('publicly_visible') %></div>
+      </div>
+    </fieldset>
+    
+    <div class="bordered left-indent">
+      <div class="bordered"><strong><%= _('Plan Guidance Configuration') %></strong></div>
+      <p><%= _('To help you write your plan, %{application_name} can show you guidance from a variety of organisations.') % {application_name: Rails.configuration.branding[:application][:name]} %></p>
+      <br />
+      <p><% _('Select up to 3 organisations to see their guidance.') %></p>
+      
 <%= @important_ggs.inspect %>
-		</div>
-	</div>
+    </div>
+  </div>
 <% end %>
\ 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 9b79290..cdcb003 100644
--- a/app/views/users/_notification_preferences.html.erb
+++ b/app/views/users/_notification_preferences.html.erb
@@ -1,67 +1,66 @@
 <p>
-	<%= link_to 'Select all', '#', id: 'select_all' %> |
-	<%= link_to 'Deselect all', '#', id: 'deselect_all' %>
+  <%= link_to 'Select all', '#', id: 'select_all' %> |
+  <%= link_to 'Deselect all', '#', id: 'deselect_all' %>
 </p>
 
 
 <fieldset class="preferences">
-	<%= form_tag(user_update_preferences_path, html: {method: :put, class: "roadmap-form"}) do |f| %>
+  <%= form_tag(user_update_preferences_path, html: {method: :put, class: "roadmap-form"}) do |f| %>
 
-		<%= hidden_field_tag :user_id, @user.id %>
+    <%= hidden_field_tag :user_id, @user.id %>
 
-	  <p><strong>All Users</strong></p>
-	  <div class="form-input">
-			<%=  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 class="form-input">
-	    <%=  check_box_tag 'prefs[users][added_as_coowner]', true, @user.prefs[:users][:added_as_coowner] %>
-	    <%= label_tag 'prefs[users][added_as_coowner]', 'A plan has been shared with me', :class => 'checkbox-label' %>
-		</div>
-		<div class="form-input">
-			<%=  check_box_tag 'prefs[users][admin_privileges]', true, @user.prefs[:users][:admin_privileges] %>
-			<%= label_tag 'prefs[users][admin_privileges]', 'Admin privileges granted to me', :class => 'checkbox-label' %>
-		</div>
+    <p><strong>All Users</strong></p>
+    <div class="form-input">
+      <%=  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 class="form-input">
+      <%=  check_box_tag 'prefs[users][added_as_coowner]', true, @user.prefs[:users][:added_as_coowner] %>
+      <%= label_tag 'prefs[users][added_as_coowner]', 'A plan has been shared with me', :class => 'checkbox-label' %>
+    </div>
+    <div class="form-input">
+      <%=  check_box_tag 'prefs[users][admin_privileges]', true, @user.prefs[:users][:admin_privileges] %>
+      <%= label_tag 'prefs[users][admin_privileges]', 'Admin privileges granted to me', :class => 'checkbox-label' %>
+    </div>
 
-		<br/>
-		<p><strong>DMP owners and co-owners</strong></p>
-	  <div class="form-input">
-	    <%=  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>
+    <br/>
+    <p><strong>DMP owners and co-owners</strong></p>
+    <div class="form-input">
+      <%=  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>
 
-		<br/>
-		<p><strong>DMP administrators</strong></p>
-	  <div class="form-input">
-			<%=  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="form-input">
-			<%=  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 class="form-input">
-			<%=  check_box_tag 'prefs[admins][feedback_requested]', true, @user.prefs[:admins][:feedback_requested] %>
-			<%= label_tag 'prefs[admins][feedback_requested]', 'A user has requested feedback on a DMP', :class => 'checkbox-label' %>
-		</div>
+    <br/>
+    <p><strong>DMP administrators</strong></p>
+    <div class="form-input">
+      <%=  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="form-input">
+      <%=  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 class="form-input">
+      <%=  check_box_tag 'prefs[admins][feedback_requested]', true, @user.prefs[:admins][:feedback_requested] %>
+      <%= label_tag 'prefs[admins][feedback_requested]', 'A user has requested feedback on a DMP', :class => 'checkbox-label' %>
+    </div>
 
-		<br/>
-		<div class='form-input'>
-			<label></label>
-			<%= submit_tag 'Save', class: 'btn btn-primary' %>
-			<%= link_to 'Cancel', '#', style: 'text-decoration:none;' %>
-		</div>
-	<% end %>
+    <br/>
+    <div class='form-input'>
+      <label></label>
+      <%= submit_tag 'Save', class: 'btn btn-primary' %>
+    </div>
+  <% end %>
 </fieldset>
 
 <script type="text/javascript">
 $(document).ready(function() {
-	$("#select_all").click(function() {
-		$('.preferences').find('input[type="checkbox"]').prop('checked', true);
-	});
+  $("#select_all").click(function() {
+    $('.preferences').find('input[type="checkbox"]').prop('checked', true);
+  });
 
-	$("#deselect_all").click(function() {
-		$('.preferences').find('input[type="checkbox"]').prop('checked', false);
-	});
+  $("#deselect_all").click(function() {
+    $('.preferences').find('input[type="checkbox"]').prop('checked', false);
+  });
 });
 </script>
\ No newline at end of file
diff --git a/lib/assets/javascripts/dmproadmap/utils.js b/lib/assets/javascripts/dmproadmap/utils.js
index 33ab2df..240510d 100644
--- a/lib/assets/javascripts/dmproadmap/utils.js
+++ b/lib/assets/javascripts/dmproadmap/utils.js
@@ -21,9 +21,10 @@
   
   // Display tooltips when the item has focus or hover
   $("[data-toggle='tooltip']").on('focus', function(e){
-    var y = $(this).width() + 35;
-    $(this).parent().append('<div class="tooltip-message" style="left: ' + y + 'px;">' + $(this).attr('data-content') + '</div');
-
+    if($(this).attr('data-content') != undefined){
+      var y = $(this).width() + 35;
+      $(this).parent().append('<div class="tooltip-message" style="left: ' + y + 'px;">' + $(this).attr('data-content') + '</div');
+    }
   }).on('blur', function(e){
     $(this).parent().find('div.tooltip-message').remove();
   });
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss
index 287cf2a..63995e0 100644
--- a/lib/assets/stylesheets/dmproadmap/forms.scss
+++ b/lib/assets/stylesheets/dmproadmap/forms.scss
@@ -31,6 +31,7 @@
 select {
   margin-top: 10px;
   vertical-align: top;
+  height: 25px;
 }
 
 .checkbox-label {
@@ -353,6 +354,21 @@
 .js-combobox[type=text]::-ms-clear { display: none; width: 0; height: 0; }
 .js-combobox[type=text]::-ms-reveal { display: none; width: 0; height: 0; }
 
+/* Allows for an auto-complete box in a side-by-side form */
+div.accessible-combobox-smaller {
+  position: relative;
+  
+  .combobox-container {
+    width: 65%;
+  }
+  .js-combobox {
+    width: 95%;
+  }
+  .combobox-suggestions {
+    margin-left: 15px;
+    width: 98%
+  }
+}
 
 
 /* ------------------------------------------------ */
@@ -368,7 +384,7 @@
 }
 
 
-/* Sign in/Create account forms */
+/* Sign in/Create account and edit profile forms */
 /* ------------------------------------------------ */
 .omniauth-options {
   display: block;
@@ -411,14 +427,25 @@
   }
 }
 #edit_user fieldset {
-  .checkbox-right {
-    width: 55%;
+  div.identifier-scheme {
+    margin-bottom: 15px;
+  }
+
+  .checkbox-right,
+  .checkbox-right-side-by-side {
     position: relative;
 
     #user_remember_me, input[type='checkbox'], .checkbox-label {
       float: right;
     }
   }
+  
+  .checkbox-right-side-by-side {
+    width: 65%;
+  }
+  .checkbox-right {
+    width: 55%;
+  }
 }
 
 #new_user.register-form {
@@ -635,4 +662,4 @@
       margin-left: 0;
     }
   }
-}
\ No newline at end of file
+}