diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 1cd51ea..ec91ba8 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -6,6 +6,7 @@
     @orgs = Org.where(parent_id: nil).order("name")
     @other_organisations = Org.where(parent_id: nil, is_other: true).pluck(:id)
     @identifier_schemes = IdentifierScheme.where(active: true).order(:name)
+    @default_org = current_user.org
   end
 
   # GET /resource
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index a13492c..5be78f9 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,136 +1,108 @@
-<h1><%= _('Edit profile') %></h1>
-<%= raw _('<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 class="main">
+  <h1><%= _('Edit profile') %></h1>
 
-<div class="white_background">
+  <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}) do |f| %>
-      <%= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %>
-      <!-- body -->
-      <div class="dmp_details">
+    <div id="create_plan">
 
-      <p><%= raw _('You can edit any of the details below.') %></p>
+      <!-- Edit Profile -->
+      <fieldset class="white-fieldset no-heading">
+        <h3><%= _('You can edit any of the details below.') %></h3>
+        
+        <%= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %>
 
-    <table class="dmp_details_table">
-      <tr>
-        <td class="first"><%= (_('Email') + " *") %></td>
-        <td><%= f.email_field :email, as: :email %></td>
-      </tr>
-      <tr>
-        <td class="first"><%= _('First name') %></td>
-        <td><%= f.text_field :firstname, as: :string,
-              id: "first_time_login_firstname",
-              autofocus: true,
-              class: "text_field has-tooltip",
-              "data-toggle" => "tooltip",
-              "data-trigger" => "focus" ,
-              "title" => _('Please enter your first name.') %></td>
-      </tr>
-      <tr>
-        <td class="first"><%= _('Last name') %></td>
-        <td><%= f.text_field :surname,
-          as: :string, id: "first_time_login_surname",
-          class: "text_field has-tooltip",
-          "data-toggle" => "tooltip",
-          "data-trigger" => "focus" ,
-          "title" => _('Please enter your surname or family name.') %></td>
-      </tr>
-      <tr>
-        <td class="first"><%= _('Organisation') %></td>
-        <td><%= collection_select(:user,
-            :org_id, @orgs,
-            :id, :name, {include_blank: _('Select Organisation')},
-            { class: "typeahead org_sign_up" }) %></td>
-      </tr>
-      <tr id="other-organisation-name" style="display:none" data-orgs="<%= @other_organisations.join(",") %>">
-        <td class="first"><%= _('Organisation name')%></td>
-        <td><%= f.text_field :other_organisation,
-            as: :string,
-            class: "text_field has-tooltip reg-input", "data-toggle" => "tooltip", "data-container" => "body", "title" => _('Please enter the name of your organisation.') %></td>
-      </tr>
-      <% if MANY_LANGUAGES %>
-        <tr>
-          <td class="first"><%= _('Language') %></td>
-          <td class="force-left">
-            <!-- For some reason the rails collection_select and f.select would not 'select' the current language, so reverting to HTML -->
-            <% locale = current_user.get_locale(); %>
-            <select id="user_language_id" name="user[language_id]" class="typeahead org_sign_up">
-              <%= @languages.each do |l| %>
-                <option value="<%= l.id %>"<%= locale == l.abbreviation ? ' selected="selected"' : '' %>>
-                  <%= l.name %>
-                </option>
-              <% end %>
-            </select>
-          </td>
-        </tr>
-      <% end %>
+        <%= f.label :email, _('Email') + " *" %>
+        <%= f.email_field :email, as: :email, class: "combobox-like" %>
+        <div class="combobox-like"><%= _('Please enter your current password below when changing your email address.') %></div>
+        
+        <div class="heading-spacer"></div>
+        
+        <%= f.label :firstname, _('First name')+ " *" %>
+        <%= f.text_field :firstname, as: :string,
+                          id: "first_time_login_firstname",
+                          autofocus: true,
+                          class: "combobox-like has-tooltip",
+                          "data-toggle" => "tooltip",
+                          "data-trigger" => "focus" ,
+                          "title" => _('Please enter your first name.') %>
 
-      <% @identifier_schemes.each do |scheme| %>
-        <tr>
-          <td class="first"><%= scheme.name %></td>
-          <td>
+        <%= f.label :surname, _('Last name') + " *" %>
+        <%= f.text_field :surname, as: :string, id: "first_time_login_surname",
+                  class: "combobox-like has-tooltip", "data-toggle" => "tooltip",
+                  "data-trigger" => "focus" ,
+                  "title" => _('Please enter your surname or family name.') %>
+          
+        <%= f.label :org, _('Organisation') + " *" %>
+        <%= render partial: "shared/accessible_combobox", 
+                   locals: {name: "#{resource_name}[org_name]",
+                            id: "#{resource_name}_org_name",
+                            default_selection: @default_org,
+                            models: @orgs,
+                            attribute: 'name'} %>
+
+        <% if MANY_LANGUAGES %>
+          <% lang = current_user.language.nil? ? FastGettext.default_locale : current_user.language.abbreviation %>
+          <%= f.label :language, _('Language') %>
+          <select id="user_language_id" name="user[language_id]" 
+                  class="combobox-like">
+            <%= @languages.each do |l| %>
+              <option value="<%= l.id %>"<%= lang == l.abbreviation ? ' selected="selected"' : '' %>>
+                <%= l.name %>
+              </option>
+            <% end %>
+          </select>
+        <% end %>
+
+        <% @identifier_schemes.each do |scheme| %>
+          <label><%= scheme.name %></label>
+          <div class="combobox-like">
             <%= render partial: 'external_identifier', 
                        locals: {scheme: scheme, 
                                 id: current_user.identifier_for(scheme)} %>
-          </td>
-        </tr>
-      <% end %>
-      
-      
-      <% unless @user.api_token.blank? %>
-      <tr>
-        <td class="first"><%= _('API token') %></td>
-        <td><%= @user.api_token %></td>
-      </tr>
-      <tr>
-        <td class="first"><%= _('API Information') %></td>
-        <td><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></td>
-      </tr>
-      <% end %>
-    </table>
-    <br />
-    <p>
-    <% if Rails.application.config.shibboleth_enabled %>
-        <% if resource.shibboleth_id.nil? || resource.shibboleth_id.length == 0 then %>
-            <%= link_to _('Link your %{application_name} account to your institutional credentials (UK users only)') % { :application_name => user_omniauth_shibboleth_path }, class: "a-orange" %>
-        <% else %>
-            <%= _('Your account is linked to your institutional credentials.') %>
-            <a id="unlink-shibboleth-button" data-toggle="modal" href="#unlink-institutional-credentials-dialog">
-                <%= _('Unlink your institutional credentials')%>
-            </a>
+          </div>
         <% end %>
-    <% end %>
-    </p>
-    <br />
-    <div class="div_clear">
+        
+        <% if Rails.application.config.shibboleth_enabled %>
+          <label><%= _('Link to your institution') %></label>
+          <% if resource.shibboleth_id.nil? || resource.shibboleth_id.length == 0 then %>
+            <%= link_to _('Link your %{application_name} account to your institutional credentials (UK users only)') % { :application_name => user_omniauth_shibboleth_path }, class: "a-orange" %>
+          <% else %>
+              <%= _('Your account is linked to your institutional credentials.') %>
+              <a id="unlink-shibboleth-button" data-toggle="modal" href="#unlink-institutional-credentials-dialog">
+                  <%= _('Unlink your institutional credentials')%>
+              </a>
+          <% end %>
+        <% end %>
+      
+        <% unless @user.api_token.blank? %>
+          <%= f.label :api_token, _('API token') %>
+          <div class="combobox-like"><%= @user.api_token %></div>
+          
+          <label><%= _('API Information') %></label>
+          <div class="combobox-like"><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></div>
+        <% end %>
+
+        <div class="heading-spacer"></div>
+        
+        <h3><%= _('If you would like to change your password please complete the following fields.') %></h3>
+
+        <%= f.label :current_password,  _('Current password') %>
+        <%= f.password_field :current_password, as: :password, class: 'combobox-like' %>
+        
+        <%= f.label :password, _('New password') %>
+        <%= f.password_field :password, as: :password, autocomplete: "off", class: 'combobox-like' %>
+        
+        <%= f.label :password_confirmation, _('Password confirmation') %>
+        <%= f.password_field :password_confirmation, as: :password, autocomplete: "off", class: 'combobox-like' %>
+        
+      </fieldset>
     </div>
-    <p>
-      <%= _('If you would like to change your password please complete the following fields.') %>
-    </p>
-    <table class="dmp_details_table">
-      <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-        <div><%= t('custom_devise.waiting_for_confirmation') %><%= resource.unconfirmed_email %></div>
-      <% end %>
-      <tr>
-        <td class="first"><%= _('Current password') %></td>
-        <td>
-           <%= f.password_field :current_password, as: :password %>
-        </td>
-      </tr>
-      <tr>
-        <td class="first"><%= _('New password') %></td>
-        <td><%= f.password_field :password, as: :password, autocomplete: "off" %>
-        </td>
-      </tr>
-      <tr>
-        <td class="first"><%= _('Password confirmation') %></td>
-        <td><%= f.password_field :password_confirmation, as: :password, autocomplete: "off" %></td>
-      </tr>
-    </table>
-    <div class="move_2_right">
-      <%= f.submit _('Save'), class: "btn btn-primary" %>
-      <%= link_to _('Cancel'), :back, class: "btn btn-primary" %>
-    </div>
+    
+    <input type="submit" class="form-submit" value="<%= _('Save') %>" />
   <% end %>
-  </div>
 </div>
 
 
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index a046efa..f0d51cd 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -20,9 +20,9 @@
         
         <% default_name = (current_user.firstname.blank? ? _('My Plan') : current_user.firstname + "'s" + _(" Plan")) %>
         <input type="text" id="plan_title" name="plan[title]" placeholder="<%= default_name %>" class="combobox-like" />
-				<div class="combobox-like">
-					<%= _('If applying for funding, state the title exactly as in the proposal.') %>
-				</div>
+        <div class="combobox-like">
+          <%= _('If applying for funding, state the title exactly as in the proposal.') %>
+        </div>
       </fieldset>
 
       <!-- Organisation selection -->
@@ -34,7 +34,7 @@
         </label>
       
         <%= render partial: "shared/accessible_combobox", 
-									 locals: {name: 'plan[org_name]',
+                   locals: {name: 'plan[org_name]',
                             id: 'plan_org_name',
                             default_selection: @default_org,
                             models: @orgs,
@@ -43,8 +43,8 @@
         <input type="checkbox" id="plan_no_org">
         <span class="checkbox-label">
           <%= _('My research organization is not on the list') %>
-					<em><%= _(' or ') %></em>
-					<%= _('no research organization is associated with this plan')%>
+          <em><%= _(' or ') %></em>
+          <%= _('no research organization is associated with this plan')%>
         </span>
       </fieldset>
     
@@ -57,7 +57,7 @@
         </label>
       
         <%= render partial: "shared/accessible_combobox", 
-									 locals: {name: 'plan[funder_name]',
+                   locals: {name: 'plan[funder_name]',
                             id: 'plan_funder_name',
                             default_selection: nil,
                             models: @funders,
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
index c9b2b36..2901858 100644
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ b/lib/assets/stylesheets/dmproadmap.scss
@@ -31,6 +31,10 @@
       -moz-border-radius: 10px;
       border-radius: 10px;
       
+      .heading-spacer {
+        height: 35px;
+      }
+      
       label, 
       input[type="checkbox"], 
       .combobox-container,