diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index fc3447b..5da69b3 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -77,6 +77,7 @@
       @other_organisations = Org.where(parent_id: nil, is_other: true).pluck(:id)
       @identifier_schemes = IdentifierScheme.where(active: true).order(:name)
       @languages = Language.sorted_by_abbreviation
+      @tab = params[:tab]
       if params[:skip_personal_details] == "true"
         do_update_password(current_user, params)
       else
@@ -150,7 +151,7 @@
       set_gettext_locale  #Method defined at controllers/application_controller.rb
       set_flash_message :notice, _('Details successfully updated.')
       sign_in current_user, bypass: true  # Sign in the user bypassing validation in case his password changed
-      redirect_to edit_user_registration_path, notice: _('Details successfully updated.')
+      redirect_to edit_user_registration_path(tab: @tab), notice: _('Details successfully updated.')
 
     else
       flash[:notice] = message.blank? ? failed_update_error(current_user, _('profile')) : message
@@ -174,7 +175,7 @@
       set_gettext_locale  #Method defined at controllers/application_controller.rb
       set_flash_message :notice, _('Details successfully updated.')
       sign_in current_user, bypass: true  # Sign in the user bypassing validation in case his password changed
-      redirect_to edit_user_registration_path, notice: _('Details successfully updated.')
+      redirect_to edit_user_registration_path(tab: @tab), notice: _('Details successfully updated.')
 
     else
       flash[:notice] = message.blank? ? failed_update_error(current_user, _('profile')) : message
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 05796af..9ad13ce 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -21,7 +21,8 @@
   # -------------------------------------------------------------
   def handle_omniauth(scheme)
     user = User.from_omniauth(request.env["omniauth.auth"].nil? ? request.env : request.env["omniauth.auth"])
-    
+    identifier = UserIdentifier.where(identifier: request.env["omniauth.auth"].uid).first
+
     # If the user isn't logged in
     if current_user.nil? 
       # If the uid didn't have a match in the system send them to register
@@ -55,7 +56,11 @@
           flash[:notice] = _('Unable to link your account to %{scheme}.') % { scheme: scheme.description }
         end
       end
-      
+
+      if identifier.user.id != current_user.id
+        flash[:notice] =  _("The current #{scheme.description} iD has been already linked to a user with email #{identifier.user.email}")
+      end
+
       # Redirect to the User Profile page
       redirect_to edit_user_registration_path
     end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d3b571d..a99407f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -76,9 +76,9 @@
         end
       end
     end
-
+    @tab = params[:tab]
     @user.save
-    redirect_to edit_user_registration_path(@user), notice: _('Preferences successfully updated.')
+    redirect_to edit_user_registration_path(tab: @tab), notice: _('Preferences successfully updated.')
   end
 
 end
diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb
index 645fa50..05ceef9 100644
--- a/app/views/contact_us/contacts/new.html.erb
+++ b/app/views/contact_us/contacts/new.html.erb
@@ -53,7 +53,7 @@
         <% end %>
         
         <div class="form-input">
-          <label></label>
+          <div class="button-spacer">&nbsp;</div>
           <%= render partial: 'shared/accessible_submit_button',
                      locals: {id: 'create_contact_submit', 
                               val: 'Submit', 
diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index 6fd93fc..9a93588 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, class: "roadmap-form white_background"}) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name,  tab: 'password-details-tab'), html: {method: :put, class: "roadmap-form white_background"}) do |f| %>
   <fieldset class="side-by-side">
     <legend><%= _('If you would like to change your password please complete the following fields.') %></legend>
 
@@ -14,7 +14,7 @@
 
     <div class="form-input">
       <label for="user_password"><%= _('New Password') %></label>
-      <input type="password" id="user_password" name="user[password]"
+      <input type="password" id="user_new_password" name="user[password]"
              class="left-indent required input-medium" value="" />
       <span role="" id="password_error"
             class="error-tooltip-right left-indent"></span>
@@ -36,7 +36,7 @@
     
     <br />
     <div class='form-input'>
-      <label></label>
+      <div class="button-spacer">&nbsp;</div>
       <%= render partial: 'shared/accessible_submit_button',
                  locals: {id: 'update',
                           val: 'Save',
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index be39742..c2daadf 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, class: "roadmap-form white_background"}) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name, tab: 'personal-details-tab'), html: {method: :put, class: "roadmap-form white_background"}) do |f| %>
 
   <div class="profile_text">
     <p>
@@ -110,7 +110,7 @@
 
       <br />
       <div class='form-input'>
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= render partial: 'shared/accessible_submit_button',
                    locals: {id: 'update',
                             val: 'Save',
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 5fa5a66..3c922a6 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -35,3 +35,6 @@
   </div>
 </div>
 
+<script type="text/javascript">
+  selectActiveTab();
+</script>
\ No newline at end of file
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 4235b74..40b75cc 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -11,7 +11,9 @@
         <%= f.label :name %>
         <%= f.text_field :name, as: :string, class: 'input-medium required' %>
         <div class="inline">
-          <%= link_to(image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.')) %>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.') %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
     
@@ -20,9 +22,6 @@
         <div class="form-input">
           <%= f.label :published %>
           <%= f.check_box :published %>
-          <div class="inline">
-            <!--%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => _('If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box.  Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.'))%-->
-          </div>
         </div>
       <% end %>
 
@@ -30,14 +29,16 @@
         <%= f.label :optional_subset %>
         <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
         <div class="inline">
-          <%= link_to(image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _("If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box.  Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.")) %>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _("If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box.  Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.") %>">
+            <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
        
       <!-- submit buttons -->
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= f.submit _('Save'), class: 'btn btn-primary' %>
         <% if @guidance_group.published == false then %>
           <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary" %>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index 3563060..bcef054 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -11,21 +11,25 @@
         <%= f.label :name %>
         <%= f.text_field :name, as: :string, class: "input-medium required" %>
         <div class="inline">
-          <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.'))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _('Add an appropriate name for your guidance group. This name will be used to tell the end user where the guidance has come from. It will be appended to text identifying the theme e.g. "[guidance group name]: guidance on data sharing" so we suggest you just use the institution or department name.') %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
       <div class="form-input">
         <%= f.label :optional_subset %>
         <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
         <div class="inline">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _("If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box.  Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard."))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _("If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box.  Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.") %>">
+            <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
       
       <!-- submit buttons -->
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= f.submit _('Save'), name: "draft", class: "btn btn-primary" %>
       </div>
     </fieldset>
diff --git a/app/views/guidances/_add_guidance.html.erb b/app/views/guidances/_add_guidance.html.erb
index ca49a90..54f475f 100644
--- a/app/views/guidances/_add_guidance.html.erb
+++ b/app/views/guidances/_add_guidance.html.erb
@@ -9,7 +9,9 @@
             <%= text_area_tag("guidance-text", "", class: "tinymce") %>
           </div>
           <div class="div_right_icon_g">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Enter your guidance here. You can include links where needed.'))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _('Enter your guidance here. You can include links where needed.') %>">
+              <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
         </td>
@@ -23,8 +25,10 @@
                     Theme.all.order("title"),
                     :id, :title, {prompt: false, include_blank: _('None')}, {multiple: true})%>
             </div>
-            <div class="div_right_icon_g">
-              <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Select which theme(s) this guidance relates to.'))%>
+            <div class="inline">
+              <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                 data-content="<%= _('Select which theme(s) this guidance relates to.') %>">
+              <span class="fa fa-question-circle"></span></a>
             </div>
             <div class="clearfix"></div>
           </div>
@@ -47,7 +51,9 @@
                             :id, :name, {prompt: false, include_blank: _('None')}, {multiple: false})%>
           </div>
           <div class="div_right_icon_g">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Select which group this guidance relates to.'))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _('Select which group this guidance relates to.') %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
         </td>
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb
index 2874554..31e1702 100644
--- a/app/views/guidances/admin_edit.html.erb
+++ b/app/views/guidances/admin_edit.html.erb
@@ -11,7 +11,9 @@
       <%= f.label _('Text'), for: @guidance.text %>
       <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %>
       <div class="inline">
-        <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Enter your guidance here. You can include links where needed.'))%>
+        <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+           data-content="<%= _('Enter your guidance here. You can include links where needed.') %>">
+        <span class="fa fa-question-circle"></span></a>
       </div>
     </div>
     <div class="form-input">
@@ -19,7 +21,9 @@
       <%= f.collection_select(:theme_ids, @themes, :id, :title,
                   {prompt: false, include_blank: 'None'}, {multiple: true})%>
       <div class="inline">
-        <%= link_to( image_tag('help_button.png'), '#', class: 'input-medium', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Select which theme(s) this guidance relates to.'))%>
+        <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+           data-content="<%= _('Select which theme(s) this guidance relates to.') %>">
+        <span class="fa fa-question-circle"></span></a>
       </div>
     </div>
     <div class="form-input">
@@ -31,13 +35,15 @@
       <%= f.collection_select(:guidance_group_id, @guidance_groups,
                 :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false})%>
       <div class="inline">
-        <%= link_to( image_tag('help_button.png'), '#', class: 'input-medium', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Select which group this guidance relates to.'))%>
+        <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+           data-content="<%= _('Select which group this guidance relates to.') %>">
+        <span class="fa fa-question-circle"></span></a>
       </div>
     </div>
     
     <br />
     <div class="form-input">
-      <label></label>
+      <div class="button-spacer">&nbsp;</div>
       <input type="submit" id="edit_guidance_submit" href="#edit_guidance_alert_dialog" class="btn btn-primary" value="<%= _('Save')%>" />
     </div>
   </fieldset>
diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb
index 7774ab7..277c775 100644
--- a/app/views/guidances/admin_new.html.erb
+++ b/app/views/guidances/admin_new.html.erb
@@ -12,7 +12,9 @@
         <%= f.label :text %>
         <%= text_area_tag("guidance-text", "", class: "tinymce") %>
         <div class="inline">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Enter your guidance here. You can include links where needed.'))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _('Enter your guidance here. You can include links where needed.') %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
       <div class="form-input">
@@ -20,14 +22,18 @@
         <%= f.collection_select(:theme_ids, @themes,
                   :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true}) %>
         <div class="inline">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Select which theme(s) this guidance relates to.'))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _('Select which theme(s) this guidance relates to.') %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
       <div class="form-input">
         <%= f.label :published %>
         <%= f.check_box :published , as: :check_boxes%>
         <div class="inline">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _("Check this box when you are ready for this guidance to appear on user's plans."))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _("Check this box when you are ready for this guidance to appear on user's plans.") %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
       <div class="form-input">
@@ -35,13 +41,15 @@
         <%= f.collection_select(:guidance_group_id, @guidance_groups,
                 :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false})%>
         <div class="inline">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Select which group this guidance relates to.'))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _('Select which group this guidance relates to.') %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
       </div>
     
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <input type="submit" id="edit_guidance_submit" href="#edit_guidance_alert_dialog" class="btn btn-primary" value="<%= _('Save')%>" />
       </div>
     </fieldset>
diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb
index 6bdb7fd..6dad332 100644
--- a/app/views/orgs/admin_edit.html.erb
+++ b/app/views/orgs/admin_edit.html.erb
@@ -33,10 +33,8 @@
       </div>
       
       <div class="form-input">
-        <label><%= _('Top banner text') %></label>
-        <div class="wysiwyg-textarea">
-          <%= text_area_tag("org_banner_text", @org.banner_text, class: "tinymce left-indent top-indent") %>
-        </div>
+        <%= f.label _('Top banner text'), for: @org.banner_text %>
+        <%= text_area_tag("org_banner_text", @org.banner_text, class: "tinymce left-indent top-indent") %>
       </div>
       
       <div class="form-input">
@@ -49,7 +47,7 @@
       </div>
       
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= render partial: 'shared/accessible_submit_button',
                    locals: {id: 'save_org_submit', 
                             val: 'Save', 
diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb
index 6aa8fbb..7e34808 100644
--- a/app/views/phases/_edit_phase.html.erb
+++ b/app/views/phases/_edit_phase.html.erb
@@ -25,8 +25,10 @@
         <div class="div_left_icon">
           <%= text_area_tag("phase-desc", phase.description, class: "tinymce") %>
         </div>
-        <div class="div_right_icon">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _("Enter a basic description. This will be presented to users on the 'Admin Plan' tab, above the summary of the sections and questions which they will be asked to answer."))%>
+        <div class="inline">
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _("Enter a basic description. This will be presented to users on the 'Admin Plan' tab, above the summary of the sections and questions which they will be asked to answer.") %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
         <div class="clearfix"></div>
       </td>
diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb
index 9735587..3b005e2 100644
--- a/app/views/phases/admin_add.html.erb
+++ b/app/views/phases/admin_add.html.erb
@@ -41,13 +41,15 @@
                     <%= f.label :description %>
                     <%= text_area_tag("phase-desc","" , class: "tinymce") %>
                     <div class="inline">
-                      <%= link_to( image_tag("help_button.png"), "#", 'data-toggle': 'popover', rel: "popover", "data-html" => "true", "data-content" => _("Enter a basic description. This will be presented to users on the 'Admin Plan' tab, above the summary of the sections and questions which they will be asked to answer."))%>
+                      <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                         data-content="<%= _("Enter a basic description. This will be presented to users on the 'Admin Plan' tab, above the summary of the sections and questions which they will be asked to answer.") %>">
+                      <span class="fa fa-question-circle"></span></a>
                     </div>
                   </div>
                   
                   <br />
                   <div class="form-input">
-                    <label></label>
+                    <div class="button-spacer">&nbsp;</div>
                     <%= f.submit _('Save'), class: "btn btn-primary" %>
                     <%= link_to _('Cancel'), admin_template_template_path(@template), class: "btn cancel" %>
                   </div>
diff --git a/app/views/phases/admin_show.html.erb b/app/views/phases/admin_show.html.erb
index d6239fb..11b95db 100644
--- a/app/views/phases/admin_show.html.erb
+++ b/app/views/phases/admin_show.html.erb
@@ -43,18 +43,18 @@
                 <%= render partial: 'sections/show_section', locals: {section: section}%>
               <% end %>
             </div>
-					<% end %>
-					
-					<% if @edit || @phase.template.customization_of.present? %>
-						<h2><%= _('Add section') %><span class="fa fa-plus"></span></h2>
-					  <!-- add section block -->
-					  <div id="add_section_block_div" style="display: none">
-					    <%= render partial: 'sections/add_section', locals: {phase: @phase} %>
-					  </div>
-					<% end %>
+          <% end %>
+          
+          <% if @edit || @phase.template.customization_of.present? %>
+            <h2><%= _('Add section') %><span class="fa fa-plus"></span></h2>
+            <!-- add section block -->
+            <div id="add_section_block_div" style="display: none">
+              <%= render partial: 'sections/add_section', locals: {phase: @phase} %>
+            </div>
+          <% end %>
         </div>
-			</div>
-		</div>
+      </div>
+    </div>
   </div>
 </div>
 
diff --git a/app/views/plans/_available_templates.html.erb b/app/views/plans/_available_templates.html.erb
index d826258..900fded 100644
--- a/app/views/plans/_available_templates.html.erb
+++ b/app/views/plans/_available_templates.html.erb
@@ -5,7 +5,7 @@
     <%= _('Select a template') %>
   </label>
 
-  <select id="plan_template_selector" class="left-indent fixed-width-large">
+  <select id="plan_template_selector" class="left-indent input-extra-large">
     <option value=""><%= _('Please select one') %></option>
     <%= raw @templates.collect{|t| "<option value=\"#{t.id}\">#{t.title}</option>" }.join('') %>
   </select>
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index d6c92f9..8b63228 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -49,7 +49,7 @@
       <br />
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <input type="submit" class="form-submit" value="<%= _('Save') %>" />
       </div>
     </fieldset>
diff --git a/app/views/plans/_show_details.html.erb b/app/views/plans/_show_details.html.erb
index 3f4e681..67195d0 100644
--- a/app/views/plans/_show_details.html.erb
+++ b/app/views/plans/_show_details.html.erb
@@ -1,39 +1,19 @@
-<div class="read-only-form show-plan">
-  <div class="side-by-side">
-    <div>
-      <label><%= _('Project Title') %></label>
-      <div class="read-only left-indent"><%= plan.title %></div>
-    </div>
-
-    <div>
-      <label><%= _('Grant Number') %></label>
-      <div class="read-only left-indent"><%= plan.grant_number %></div>
-    </div>
-
-    <div>
-      <label><%= _('Principal Investigator') %></label>
-      <div class="read-only left-indent"><%= plan.principal_investigator %></div>
-    </div>
-
-    <div>
-      <label><%= _('Project Abstract') %></label>
-      <div class="read-only left-indent"><%= raw plan.description %></div>
-    </div>
-
-    <hr />
-
-    <div>
-      <label><%= _('Plan ID') %></label>
-      <div class="read-only left-indent"><%= plan.identifier %></div>
-    </div>
-
-    <br />
-    <div>
-      <label><strong><%= _('Data Contact Person') %></strong></label>
-    </div>
-    <div>
-      <label><%= _('Name') %></label>
-      <div class="read-only left-indent"><%= plan.data_contact %></div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
+<dl>
+  <dt><%= _('Project Title') %></dt>
+  <dd><%= plan.title %></dd>
+  <dt><%= _('Grant Number') %></dt>
+  <dd><%= plan.grant_number %></dd>
+  <dt><%= _('Principal Investigator') %></dt>
+  <dd><%= plan.principal_investigator %></dd>
+  <dt><%= _('Project Abstract') %></dt>
+  <dd><%= raw plan.description %></dd>
+</dl>
+<hr />
+<dl>
+  <dt><%= _('Plan ID') %></dt>
+  <dd><%= plan.identifier %></dd>
+	<dt><%= _('Data Contact Person') %></dt>
+	<dd></dd>
+	<dt><%= _('Name') %></dt>
+	<dd><%= plan.data_contact %></dd>
+</dl>
diff --git a/app/views/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb
index 6675827..25f2202 100644
--- a/app/views/questions/_add_question.html.erb
+++ b/app/views/questions/_add_question.html.erb
@@ -43,7 +43,9 @@
                   {}, class: "question_format" %>
             </div>
             <div class="div_right_icon">
-              <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true",  "data-content" => _("You can choose from:<ul><li>- text area (large box for paragraphs);</li> <li>- text field (for a short answer);</li> <li>- checkboxes where options are presented in a list and multiple values can be selected;</li> <li>- radio buttons where options are presented in a list but only one can be selected;</li> <li>- dropdown like this box - only one option can be selected;</li> <li>- multiple select box allows users to select several options from a scrollable list, using the CTRL key;</li></ul>"))%>
+              <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                 data-content="<%= _("You can choose from:<ul><li>- text area (large box for paragraphs);</li> <li>- text field (for a short answer);</li> <li>- checkboxes where options are presented in a list and multiple values can be selected;</li> <li>- radio buttons where options are presented in a list but only one can be selected;</li> <li>- dropdown like this box - only one option can be selected;</li> <li>- multiple select box allows users to select several options from a scrollable list, using the CTRL key;</li></ul>") %>">
+              <span class="fa fa-question-circle"></span></a>
             </div>
           </div>
           <div class="clearfix"></div>
@@ -55,7 +57,10 @@
                   <th nowrap class="small"><%= _('Order')%></th>
                   <th nowrap class="medium"><%= _('Text')%></th>
                   <th nowrap class="small"><%= _('Default')%></th>
-                  <th nowrap class="small"><%= link_to( image_tag("help_button.png"), "#", class: "question_options_popover", "data-toggle": "popover",rel: "popover", "data-html" => "true", "data-content" => _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.'))%></th>
+                  <th nowrap class="small">
+                    <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                       data-content="<%= _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.') %>">
+                    <span class="fa fa-question-circle"></span></a></th>
                 </tr>
               </thead>
               <tbody class="options_tbody">
@@ -97,7 +102,9 @@
             </div>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.'))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.') %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
@@ -113,7 +120,9 @@
             <%= text_area_tag(:example_answer, "", class: "tinymce") %>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted.'))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _('You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
@@ -127,7 +136,9 @@
             <%= text_area_tag(:guidance, "", class: "tinymce") %>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text."))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text.") %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
@@ -143,7 +154,9 @@
                 :id, :title, {prompt: false, include_blank: _('None')}, {multiple: true})%>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("<p>Select themes that are relevant to this question.</p> <p>This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for. </p> <p>You can select multiple themes by using the CTRL button.</p>"))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _("<p>Select themes that are relevant to this question.</p> <p>This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for. </p> <p>You can select multiple themes by using the CTRL button.</p>") %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
         </td>
       </tr>
diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb
index 0d721d4..f9f1ad6 100644
--- a/app/views/questions/_edit_question.html.erb
+++ b/app/views/questions/_edit_question.html.erb
@@ -38,7 +38,9 @@
                 {}, class: "question_format", id: "#{question.id}-select-format"%>
             </div>
             <div class="div_right_icon">
-              <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true",  "data-content" => _("You can choose from:<ul><li>- text area (large box for paragraphs);</li> <li>- text field (for a short answer);</li> <li>- checkboxes where options are presented in a list and multiple values can be selected;</li> <li>- radio buttons where options are presented in a list but only one can be selected;</li> <li>- dropdown like this box - only one option can be selected;</li> <li>- multiple select box allows users to select several options from a scrollable list, using the CTRL key;</li></ul>"))%>
+              <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                 data-content="<%= _("You can choose from:<ul><li>- text area (large box for paragraphs);</li> <li>- text field (for a short answer);</li> <li>- checkboxes where options are presented in a list and multiple values can be selected;</li> <li>- radio buttons where options are presented in a list but only one can be selected;</li> <li>- dropdown like this box - only one option can be selected;</li> <li>- multiple select box allows users to select several options from a scrollable list, using the CTRL key;</li></ul>") %>">
+              <span class="fa fa-question-circle"></span></a>
             </div>
 
           </div>
@@ -51,7 +53,11 @@
                   <th nowrap class="small"><%= _('Order')%></th>
                   <th nowrap class="medium"><%= _('Text')%></th>
                   <th nowrap class="small"><%= _('Default')%></th>
-                  <th nowrap class="small"><%= link_to( image_tag("help_button.png"), "#", class: "question_options_popover", "data-toggle": "popover",rel: "popover", "data-html" => "true", "data-content" => _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.'))%></th>
+                  <th nowrap class="small">
+                    <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                       data-content="<%= _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.') %>">
+                    <span class="fa fa-question-circle"></span></a>
+                  </th>
                 </tr>
               </thead>
               <tbody class="options_tbody">
@@ -92,7 +98,9 @@
             </div>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.'))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.') %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
@@ -116,7 +124,9 @@
           <% end %>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted.'))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _('You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
@@ -132,7 +142,9 @@
             <%= text_area_tag("question-guidance-#{question.id}", guidance_text , class: "tinymce") %>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text."))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text.") %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
@@ -147,7 +159,9 @@
               :id, :title, {prompt: false, include_blank: "None"}, {multiple: true})%>
           </div>
           <div class="div_right_icon">
-            <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("<p>Select themes that are relevant to this question.</p> <p>This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for. </p> <p>You can select multiple themes by using the CTRL button.</p>"))%>
+            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+               data-content="<%= _("<p>Select themes that are relevant to this question.</p> <p>This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for. </p> <p>You can select multiple themes by using the CTRL button.</p>") %>">
+            <span class="fa fa-question-circle"></span></a>
           </div>
         </td>
       </tr>
diff --git a/app/views/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb
index 93564b8..61dd490 100644
--- a/app/views/sections/_add_section.html.erb
+++ b/app/views/sections/_add_section.html.erb
@@ -36,7 +36,9 @@
                 <%= text_area_tag("section-desc", "" , class: "tinymce") %>
               </div>
               <div class="div_right_icon">
-                <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("<div class='tooltip_box'>Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.</div>"))%>
+                <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                   data-content="<%= _("Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.") %>">
+                <span class="fa fa-question-circle"></span></a>
               </div>
             </td>
           </tr>
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index 0fff8f5..473c176 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -7,26 +7,28 @@
 
 <h3><%= _('Section details') %></h3>
 <div id="collapse-sec-<%= section.id %>">
-	<%= form_for(section, url: admin_update_section_path(section, phase: phase, edit: edit), html: { method: :put, class: 'roadmap-form bordered'}) do |s| %>
-		<fieldset class="side-by-side">
-			<div class="form-input">
-      	<%= s.label :title %>
-				<%= s.text_field :title, as: :string, class: 'input-large', placeholder: _('New section title') %>
-			</div>
-			<div class="form-input">
-				<%= s.label _('Order of display'), for: :number %>
+  <%= form_for(section, url: admin_update_section_path(section, phase: phase, edit: edit), html: { method: :put, class: 'roadmap-form bordered'}) do |s| %>
+    <fieldset class="side-by-side">
+      <div class="form-input">
+        <%= s.label :title %>
+        <%= s.text_field :title, as: :string, class: 'input-large', placeholder: _('New section title') %>
+      </div>
+      <div class="form-input">
+        <%= s.label _('Order of display'), for: :number %>
         <%= s.number_field :number, in: 1..15, class: "input-small has-tooltip", 'data-toggle' => "tooltip", 'title' => _('This allows you to order sections.') %>
       <div class="form-input">
-				<%= s.label :description %>
+        <%= s.label :description %>
         <%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %>
         <div class="inline">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _("<div class='tooltip_box'>Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.</div>"))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _("Enter a basic description. This could be a summary of what is covered in the section or instructions on how to answer. This text will be displayed in the coloured banner once a section is opened to edit.") %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
-			</div>
-			
+      </div>
+      
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= s.submit _('Save'), class: 'btn btn-primary' %>
         <% if section.modifiable %>
           <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id),
@@ -34,16 +36,16 @@
         <% end %>
         <%= link_to _('Cancel'), :back, class: 'btn cancel' %>
       </div>
-		</fieldset>
-	<% end %>
+    </fieldset>
+  <% end %>
 </div>
-	
+  
 <h3><%= _('Questions') %></h3>
 <% @questions = section.questions.order("number")%>
 <% if @questions.length > 0 %>
-	<% @questions.each do |question| %>
-		<div class="question_guidance_block">
-			<div id="show_question_div_<%= question.id%>" class="<%= if question.id == @question_id then "current_question" end %>">
+  <% @questions.each do |question| %>
+    <div class="question_guidance_block">
+      <div id="show_question_div_<%= question.id%>" class="<%= if question.id == @question_id then "current_question" end %>">
         <!-- render the show question block-->
         <%= render partial: 'questions/show_question', locals: {question: question} %>
       </div>
@@ -52,19 +54,19 @@
         <!-- render the edit question block-->
         <%= render partial: 'questions/edit_question', locals: {question: question} %>
       </div>
-		</div>
+    </div>
   <% end %>
 <% end %>
         
 <!-- Add a new question if the version is not published-->
 <% if section.modifiable %>
-	<!-- add question block -->
-	<div id="add_question_block_div_<%= section.id%>" style="display: none">
-		<%= render partial: 'questions/add_question', locals: {section: section} %>
-	</div>
+  <!-- add question block -->
+  <div id="add_question_block_div_<%= section.id%>" style="display: none">
+    <%= render partial: 'questions/add_question', locals: {section: section} %>
+  </div>
 
   <!-- add question button-->
-	<div id="add_question_button_div_<%= section.id%>">
+  <div id="add_question_button_div_<%= section.id%>">
     <div class="div_left">
       <%= hidden_field_tag :section_id, section.id, class: "section_id" %>
       <%= link_to _('Add question'), '#', class: "btn btn-primary add_question_button" %>
diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index e06ec20..4fe65ca 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -21,6 +21,8 @@
   <!-- the selected id is found after the combobox loses focus by finding the selected item in the crosswalk json -->
   <input type="hidden" id="<%= id.gsub("_#{attribute}", "_id") %>" name="<%= name.gsub("_#{attribute}]", "_id]") %>"
          value="<%= default_selection.id unless default_selection.nil? %>" />
+
+  <span role="" id="<%= id.gsub("_#{attribute}", "_error") %>" class="error-tooltip left-indent"></span>
  
 
   <script type="text/javascript">
diff --git a/app/views/shared/_accessible_submit_button.html.erb b/app/views/shared/_accessible_submit_button.html.erb
index c93b163..32551fb 100644
--- a/app/views/shared/_accessible_submit_button.html.erb
+++ b/app/views/shared/_accessible_submit_button.html.erb
@@ -5,7 +5,7 @@
        aria-disabled="<%= disabled_initially %>"
        aria-describedby="<%= id %>_tip" />
 
-<span role="" class="submit-tooltip left-indent"><%= tooltip %></span>
+<span role="" class="error-tooltip-right left-indent"><%= tooltip %></span>
 
 <script type="text/javascript">
   $(document).ready(function(){
@@ -13,12 +13,12 @@
     $("#<%= id %>").on('click focus', function(e){
       if($(this).attr('aria-disabled') == 'true'){
         e.preventDefault();
-        $(this).siblings(".submit-tooltip").attr('role', 'tooltip');
+        $(this).siblings(".error-tooltip-right").attr('role', 'tooltip');
       }else{
-        $(this).siblings(".submit-tooltip").attr('role', '');
+        $(this).siblings(".error-tooltip-right").attr('role', '');
       }
     }).on('blur', function(){
-      $(this).siblings(".submit-tooltip").attr('role', '');
+      $(this).siblings(".error-tooltip-right").attr('role', '');
     });
   });
 </script>
\ No newline at end of file
diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb
index e69961f..94a7846 100644
--- a/app/views/templates/_edit_annotations.html.erb
+++ b/app/views/templates/_edit_annotations.html.erb
@@ -59,7 +59,9 @@
           <% end %>
         </div>
         <div class="div_right_icon">
-          <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _('You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted.'))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _('You can add an example or suggested answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
         <div class="clearfix"></div>
         <div class="border_bottom"></div>
@@ -74,7 +76,9 @@
           <%= text_area_tag("question-guidance-#{question.id}", question.guidance , class: "tinymce") %>
         </div>
         <div class="div_right_icon">
-          <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text."))%>
+          <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+             data-content="<%= _("Enter specific guidance to accompany this question. If you have guidance by themes too, this will be pulled in based on your selections below so it's best not to duplicate too much text.") %>">
+          <span class="fa fa-question-circle"></span></a>
         </div>
         <div class="clearfix"></div>
         <div class="border_bottom"></div>
diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
index dab4241..0481d27 100644
--- a/app/views/templates/_edit_template.html.erb
+++ b/app/views/templates/_edit_template.html.erb
@@ -1,59 +1,54 @@
 <!-- edit template details A template is passed as an argument-->
 
-<%= form_for(template, url: admin_update_template_path(template), html: { method: :put}) do |f| %>
-  <br/>
-  <table class="dmp_details_table">
-    <tr>
-      <td class="first_template"><%= _('Title') %></td>
-      <td><%= f.text_field :title, as: :string,
-            class: 'text_field has-tooltip', 'data-toggle' => "tooltip", title: _('Please enter a title for your template.') %></td>
-    </tr>
-    <tr>
-      <td class="first_template"><%= _('Description') %></td>
-      <td class="tinymce">
-        <div class="div_left_icon">
-          <%= text_area_tag("template-desc", template.description, class: "tinymce") %>
-        </div>
-        <div class="div_right_icon">
-          <%= link_to( image_tag('help_button.png'), '#', "data-toggle": "popover", rel: "popover", 'data-html' => "true", 'data-content' => _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences'))%>
-        </div>
-        <div class="clearfix"></div>
-      </td>
-    </tr>
-    <tr>
-      <td class="first_template"><%= _('Status') %></td>
-      <td>
+<%= form_for(template, url: admin_update_template_path(template), html: { method: :put, class: 'roadmap-form'}) do |f| %>
+  <fieldset class="side-by-side">
+    <div class="form-input">
+      <%= f.label :title, class: 'required' %>
+      <%= f.text_field :title, as: :string, class: 'input-large has-tooltip', 
+                       'data-toggle': "tooltip", 
+                       title: _('Please enter a title for your template.') %>
+    </div>
+    <div class="form-input">
+      <%= f.label _('Description'), for: template.description %>
+      <%= text_area_tag("template-desc", template.description, class: "input-large tinymce") %>
+      <div class="inline">
+        <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+           data-content="<%= _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>">
+        <span class="fa fa-question-circle"></span></a>
+      </div>
+    </div>
+    <div class="form-input">
+      <label for="status"><%= _('Status') %></label>
+      <div id="status" class="read-only">
         <% if hash[:live].nil? %>
           <%= _('Unpublished') %>
-        
+    
         <% elsif hash[:current].dirty? %>
           <%= _('You have un-published changes') %>
-        
+    
         <% else %>
           <%= _('Published') %>
         <% end %>
-      </td>
-    </tr>
-    <tr>
-      <td class="first_template"><%= _('Created at') %></td>
-      <td>
-        <%= l template.created_at.to_date, formats: :short %>
-      </td>
-    </tr>
-    <tr>
-      <td class="first_template"><%= _('Last updated') %></td>
-      <td>
-        <%= l template.updated_at.to_date, formats: :short %>
-      </td>
-    </tr>
-  </table>
-  <!-- submit buttons -->
-
-    <div class="move_2_right">
-      <%= f.submit _('Save'), class: 'btn btn-primary' %>
-      <%= link_to _('Cancel'), admin_template_template_path(template), class: 'btn cancel' %>
+      </div>
     </div>
-
-  <br />
-
+    <div class="form-input">
+      <label for="created"><%= _('Created at') %></label>
+      <div id="created" class="read-only">
+        <%= l template.created_at.to_date, formats: :short %>
+      </div>
+    </div>
+    <div class="form-input">
+      <label for="updated"><%= _('Last updated') %></label>
+      <div id="updated" class="read-only">
+        <%= l template.updated_at.to_date, formats: :short %>
+      </div>
+    </div>
+    
+    <br />
+    <div class="form-input">
+      <div class="button-spacer">&nbsp;</div>
+      <%= f.submit _('Save'), class: 'form-submit' %>
+      <%= link_to _('Cancel'), admin_template_template_path(template) %>
+    </div>
+  </fieldset>
 <% end %>
\ No newline at end of file
diff --git a/app/views/templates/_show_phases_sections.html.erb b/app/views/templates/_show_phases_sections.html.erb
index 41569e5..62acdb8 100644
--- a/app/views/templates/_show_phases_sections.html.erb
+++ b/app/views/templates/_show_phases_sections.html.erb
@@ -2,23 +2,23 @@
 
 <h2><%= phase.title %><span class="fa fa-plus"></span></h2>
 
-<div class="div_left admin_left_smaller">
+<div class="accordion-section">
   <p><%= raw phase.description %></p>
 	
-  <div class="div_right admin_right_bigger">
+  <div class="right">
       <!--delete a phase button. only displays when template not published-->
-
       <% if phase_hash[:sections].length > 0 %>
-          <%= link_to _('Preview'), admin_preview_phase_path(id: phase.id), class: 'btn btn-primary'%>
+        <%= link_to _('Preview'), admin_preview_phase_path(id: phase.id), class: "link-as-button" %>
       <% end %>
+      
       <% if template == current && phase.modifiable %>
           <%= link_to _('Delete'), admin_destroy_phase_path(phase_id: phase.id),
-          confirm: _("You are about to delete '%{phase_title}'. This will affect versions, sections and questions linked to this phase. Are you sure?") % { :phase_title => phase.title }, method: :delete, class: "btn btn-primary"%>
+          confirm: _("You are about to delete '%{phase_title}'. This will affect versions, sections and questions linked to this phase. Are you sure?") % {phase_title: phase.title}, method: :delete, class: "link-as-button" %>
           <% b_label = _('Edit phase')%>
       <% else %>
           <% b_label = _('View phase')%>
       <% end %>
-      <%= link_to b_label, admin_show_phase_path(id: phase.id, edit: (b_label == _('Edit phase'))), class: "btn btn-primary" %>
+      <%= link_to b_label, admin_show_phase_path(id: phase.id, edit: (b_label == _('Edit phase'))), class: "link-as-button" %>
 
   </div>
   <% if phase_hash[:sections].present? %>
diff --git a/app/views/templates/_show_template.html.erb b/app/views/templates/_show_template.html.erb
index 33abaf6..5f4411a 100644
--- a/app/views/templates/_show_template.html.erb
+++ b/app/views/templates/_show_template.html.erb
@@ -1,49 +1,35 @@
 <!-- show template details A template is passed as an argument-->
-
-<% if template == current then %>
-	<!-- edit template button -->
-  <% if template.customization_of.nil? %>
-    <div class="right">
-      <%= link_to _('Edit template details'), '# ', class: "btn btn-primary", id: "edit_template_button"%>
-    </div>
-  <% end %>
-<% end %>
-<br/>
-
-<table class="dmp_details_table">
-  <tr>
-    <td class="first_template"><%= _('Title') %></td>
-    <td><%= template.title %></td>
-  </tr>
-  <tr>
-    <td class="first_template"><%= _('Description') %></td>
-    <td><% if !template.description.nil? && template.description != "" then %>
-        <%= raw template.description %>
-      <% else %>
-         -
+<dl>
+  <dt><%= _('Title') %></dt>
+  <dd><%= template.title %></dd>
+  <dt><%= _('Description') %></dt>
+  <dd>
+    <%= (!template.description.nil? && template.description != "" ? raw( template.description) : '-') %>
+  </dd>
+  <dt><%= _('Status') %></dt>
+  <dd>
+    <% if hash[:live].nil? %>
+      <%= _('Unpublished') %>
+    
+    <% elsif hash[:current].dirty? %>
+      <%= _('You have un-published changes') %>
+    
+    <% else %>
+      <%= _('Published') %>
+    <% end %>
+  </dd>
+  <dt><%= _('Created at') %></dt>
+  <dd><%= l template.created_at.to_date, formats: :short %></dd>
+  <dt><%= _('Last updated') %></dt>
+  <dd><%= l template.updated_at.to_date, formats: :short %></dd>
+  
+  <dt class="dl-buttons"></dt>
+  <dd>
+    <% if template == current then %>
+      <!-- edit template button -->
+      <% if template.customization_of.nil? %>
+        <a href="#" class="link-as-button" id="edit_template_button"><%= _('Edit template details') %></a>
       <% end %>
-    </td>
-  </tr>
-  <tr>
-    <td class="first_template"><%= _('Status') %></td>
-    <td>
-      <% if hash[:live].nil? %>
-        <%= _('Unpublished') %>
-        
-      <% elsif hash[:current].dirty? %>
-        <%= _('You have un-published changes') %>
-        
-      <% else %>
-        <%= _('Published') %>
-      <% end %>
-    </td>
-  </tr>
-  <tr>
-    <td class="first_template"><%= _('Created at') %></td>
-    <td><%= l template.created_at.to_date, formats: :short %></td>
-  </tr>
-  <tr>
-    <td class="first_template"><%= _('Last updated') %></td>
-    <td class="phase_table_last_column"><%= l template.updated_at.to_date, formats: :short %></td>
-  </tr>
-</table>
+    <% end %>
+  </dd>
+</dl>
diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb
index 0acf208..a1e9bb2 100644
--- a/app/views/templates/admin_new.html.erb
+++ b/app/views/templates/admin_new.html.erb
@@ -29,7 +29,9 @@
               <%= text_area_tag("template-desc", "", class: "tinymce") %>
             </div>
             <div class="div_right_icon">
-              <%= link_to( image_tag("help_button.png"), "#", "data-toggle": "popover", rel: "popover", "data-html" => "true", "data-content" => _("<div class='tooltip_box'>Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences.</div>"))%>
+              <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
+                 data-content="<%= _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>">
+              <span class="fa fa-question-circle"></span></a>
             </div>
           </td>
         </tr>
diff --git a/app/views/users/_notification_preferences.html.erb b/app/views/users/_notification_preferences.html.erb
index cdcb003..81a3c58 100644
--- a/app/views/users/_notification_preferences.html.erb
+++ b/app/views/users/_notification_preferences.html.erb
@@ -5,7 +5,7 @@
 
 
 <fieldset class="preferences">
-  <%= form_tag(user_update_preferences_path, html: {method: :put, class: "roadmap-form"}) do |f| %>
+  <%= form_tag( url_for(controller: 'users', action: 'update_preferences', tab: 'notification-preferences-tab', escape: false), html: {method: :put, class: "roadmap-form"}) do |f| %>
 
     <%= hidden_field_tag :user_id, @user.id %>
 
@@ -47,7 +47,7 @@
 
     <br/>
     <div class='form-input'>
-      <label></label>
+      <div class="button-spacer">&nbsp;</div>
       <%= submit_tag 'Save', class: 'btn btn-primary' %>
     </div>
   <% end %>
diff --git a/lib/assets/javascripts/dmproadmap/forms.js b/lib/assets/javascripts/dmproadmap/forms.js
index 3adfd82..5434b52 100644
--- a/lib/assets/javascripts/dmproadmap/forms.js
+++ b/lib/assets/javascripts/dmproadmap/forms.js
@@ -1,15 +1,39 @@
 // ---------------------------------------------------------------------------
+function toggleAutocompleteError(autocomplete, idbox, errorMessage){
+	if(autocomplete.length > 0 && idbox.length > 0){
+	  var err = $(idbox).siblings("span.error-tooltip");
+	  if(err.length <= 0){
+	    err = $(idbox).siblings("span.error-tooltip-right");
+	  }
+  
+	  // If an error element is available and the error message is not empty and the field
+	  // is not empty
+	  if(err.length > 0 && (errorMessage === '' || $(autocomplete).val().trim().length <= 0)){
+	    err.html('').attr('role', '');
+	    $(autocomplete).removeClass('red-border');
+	  }else{
+	    err.html(errorMessage).attr('role', 'tooltip');
+	    $(autocomplete).addClass('red-border');
+	  }
+	}
+}
+
+// ---------------------------------------------------------------------------
 function toggleInputError(input, errorMessage){
   var err = $(input).siblings("span.error-tooltip");
   if(err.length <= 0){
     err = $(input).siblings("span.error-tooltip-right");
   }
   
+console.log(err.length + ' - ' + errorMessage + ' - ' + $(input).val().trim().length);
+	
+  // If an error element is available and the error message is not empty and the field
+  // is not empty
   if(err.length > 0 && (errorMessage === '' || $(input).val().trim().length <= 0)){
     err.html('').attr('role', '');
     $(input).removeClass('red-border');
   }else{
-    err.html(__('Error: ') + errorMessage).attr('role', 'tooltip');
+    err.html(errorMessage).attr('role', 'tooltip');
     $(input).addClass('red-border');
   }
 }
diff --git a/lib/assets/javascripts/dmproadmap/tabs.js b/lib/assets/javascripts/dmproadmap/tabs.js
index 1c68fdf..31f108b 100644
--- a/lib/assets/javascripts/dmproadmap/tabs.js
+++ b/lib/assets/javascripts/dmproadmap/tabs.js
@@ -11,11 +11,40 @@
 		if($(this).attr("href")[0] == '#'){
 	    e.preventDefault();
 			
-			var panel = $($(this).attr("href"));
+		var panel = $($(this).attr("href"));
 	    panel.show().attr("aria-hidden", 'false');
 	    $.each($(panel).siblings(), function(i, p){
 	      $(p).hide().attr("aria-hidden", 'true');
 	    });
 		}
   });
-});
\ No newline at end of file
+});
+
+function selectActiveTab(){
+  var tab = getURLParameter('tab');
+	if (tab != '') 
+	{
+    // Unselect the other tabs
+    $("li[role='tab']").removeClass('active').children('a').attr('aria-selected', 'false');
+		// Select the current tab
+		$(".tabs").find('#' + tab).attr('aria-selected', 'true').addClass('active');
+
+		// Display the corresponding panel if its a page anchor otherwise just follow the target
+		var panel = $(".tabs").find('#' + tab).children('a').attr("href");
+	  $(".tab-panels").find(panel).addClass('active');
+    $.each($(".tab-panels").find(panel).siblings(), function(i, p){
+    	$(p).removeClass('active');
+  	});
+	}
+}
+
+function getURLParameter(sParam){
+  var sPageURL = window.location.search.substring(1);
+  var sURLVariables = sPageURL.split('&');
+  for (var i = 0; i < sURLVariables.length; i++)    {
+      var sParameterName = sURLVariables[i].split('=');
+      if (sParameterName[0] == sParam){
+          return sParameterName[1];
+      }
+  }
+}
\ No newline at end of file
diff --git a/lib/assets/javascripts/dmproadmap/utils.js b/lib/assets/javascripts/dmproadmap/utils.js
index 240510d..8aff27d 100644
--- a/lib/assets/javascripts/dmproadmap/utils.js
+++ b/lib/assets/javascripts/dmproadmap/utils.js
@@ -23,9 +23,25 @@
   $("[data-toggle='tooltip']").on('focus', function(e){
     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');
+      $(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();
   });
+  
+  // Display tooltips when the item has focus or hover
+  $("[data-toggle='popover']").on('click', function(e){
+    e.preventDefault();
+    
+    if($(this).attr('data-content') != undefined){
+      if($(this).parent().find(".popover-message").length > 0){
+        $(this).parent().find(".popover-message").remove();
+      }else{
+        var y = $(this).width() + 35;
+        $(this).parent().append('<div class="popover-message" style="left: ' + y + 'px;">' + $(this).attr('data-content') + '</div>');
+      }
+    }
+  }).on('blur', function(e){
+    $(this).parent().find('div.popover-message').remove();
+  });
 });
diff --git a/lib/assets/javascripts/views/devise/registrations/edit.js b/lib/assets/javascripts/views/devise/registrations/edit.js
index ff38153..d5365b8 100644
--- a/lib/assets/javascripts/views/devise/registrations/edit.js
+++ b/lib/assets/javascripts/views/devise/registrations/edit.js
@@ -20,7 +20,7 @@
   });
   
   // Toggle the password field so that its visible/masked
-  $("#passwords_show").click(function(){
+  $("#password_show").click(function(){
     var typ = $("#user_current_password").attr('type');
     $("#user_current_password").attr('type', (typ === 'password' ? 'text' : 'password'));
     $("#user_new_password").attr('type', (typ === 'password' ? 'text' : 'password'));
@@ -28,7 +28,7 @@
   });
   
   // Make sure the show password checkbox is unchecked on load
-  $("#passwords_show").attr("checked", false);
+  $("#password_show").attr("checked", false);
   
   toggleSubmit();
   
@@ -49,8 +49,7 @@
     var disabled = ($("#user_firstname").val().trim().length <= 0 || 
                     $("#user_surname").val().trim().length <= 0 || 
                     validateEmail($("#user_email").val()) != '' ||
-                    validateEmail($("#user_recovery_email").val()) != '' ||
-                    $("#user_new_password").val() != $("#user_password_confirmation").val());
+                    validateEmail($("#user_recovery_email").val()) != '');
     $("#update").attr('aria-disabled', disabled);
   }
 });
diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index 7bf6e19..5e97d3e 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -11,6 +11,16 @@
     handleComboboxChange();
   });
 
+  // If there was no selection, highlight the box and display tooltip 
+  $("#plan_org_id").change(function(){
+    var msg = ($(this).val().trim().length <= 0 ? __('Please select a valid research institution from the list') : '');
+    toggleAutocompleteError($("#plan_org_name"), $(this), msg);
+  });
+  $("#plan_funder_id").change(function(){
+    var msg = ($(this).val().trim().length <= 0 ? __('Please select a valid funding organisation from the list') : '');
+    toggleAutocompleteError($("#plan_funder_name"), $(this), msg);
+  });
+
   // Make sure the checkbox is unchecked if we're entering text
   $(".js-combobox").keyup(function(){
     var whichOne = $(this).prop('id').split('_')[1];
@@ -24,6 +34,7 @@
     handleCheckboxClick(whichOne, this.checked);
   });
   
+  // When the form receives a valid template id enable the button
   $("#plan_template_id").change(function(){
     $("#create_plan_submit").attr('aria-disabled', ($(this).val().trim().length <= 0));
   });
@@ -56,7 +67,8 @@
 function handleCheckboxClick(name, checked){
   $("#plan_" + name + "_name").prop("disabled", checked);
   $("#plan_template_id").val("").change();
-
+  $("#available-templates").fadeOut();
+  
   if(checked){
     $("#plan_" + name + "_name").val("");
     $("#plan_" + name + "_id").val("").change();
diff --git a/lib/assets/stylesheets/application.scss b/lib/assets/stylesheets/application.scss
index 5a1ab6d..7e33cf1 100644
--- a/lib/assets/stylesheets/application.scss
+++ b/lib/assets/stylesheets/application.scss
@@ -17,8 +17,8 @@
 @import "dmproadmap";
 @import "dmproadmap/base";
 
+@import "dmproadmap/tabs";
 @import "dmproadmap/accordions";
-@import "dmproadmap/forms";
 @import "dmproadmap/modals";
 @import "dmproadmap/tables";
-@import "dmproadmap/tabs";
\ No newline at end of file
+@import "dmproadmap/forms";
\ No newline at end of file
diff --git a/lib/assets/stylesheets/dmproadmap/accordions.scss b/lib/assets/stylesheets/dmproadmap/accordions.scss
index 7f1834c..086be4b 100644
--- a/lib/assets/stylesheets/dmproadmap/accordions.scss
+++ b/lib/assets/stylesheets/dmproadmap/accordions.scss
@@ -26,6 +26,7 @@
   }
   
   div.accordion-section {
+    position: relative;
     background-color: white;
   }
 }
\ No newline at end of file
diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss
index d4661cc..64a05c1 100644
--- a/lib/assets/stylesheets/dmproadmap/base.scss
+++ b/lib/assets/stylesheets/dmproadmap/base.scss
@@ -40,7 +40,8 @@
 .top-indent { margin-top: 25px; }
 
 .right {
-  position: relative;
+  position: absolute;
+  top: 15px;
   right: 10px;
 }
 
@@ -108,6 +109,10 @@
 
 [data-toggle='popover']{
   position: relative;
+  
+  .fa {
+    font-size: 18px;
+  }
 }
 div.popover-message {
   position: absolute;
@@ -226,7 +231,8 @@
         }
         .header-org-banner-text {
           width: 60%;
-          vertical-align: top;
+          vertical-align: bottom;
+          margin-left: 25px;
         }
       }
       .main-nav {
@@ -332,6 +338,7 @@
     }
     
     div.page {
+      position: relative;
       width: 100%;
       background-color: $white;
       border-radius: 3px;
@@ -350,6 +357,36 @@
           margin-left: 35px;
           vertical-align: top;
         }
+        
+        /* Description Lists - Used to display the read-only version of forms */
+        dl {
+          width: 100%;
+          margin: 0 auto;
+          
+          dt {
+            display: inline-block;
+            width: 15%;
+            text-align: right;
+            margin-right: 10px;
+            font-weight: bold;
+          }
+          dt:not(.dl-buttons):after {
+            content: " :";
+          }
+          
+          dd {
+            display: inline-block;
+            width: 65%;
+          }
+          dd:after {
+            display: block;
+            content: " ";
+            margin-bottom: 10px;
+          }
+          dt.dl-buttons {
+            margin-top: 25px;
+          }
+        }
       }
     }
   }
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss
index 63995e0..44561fa 100644
--- a/lib/assets/stylesheets/dmproadmap/forms.scss
+++ b/lib/assets/stylesheets/dmproadmap/forms.scss
@@ -18,10 +18,12 @@
 input[type="checkbox"], input[type="radio"], select {
   border: 1px solid $medium-grey;
 }
-div.wysiwyg-textarea {
-  display: inline-block;
-  margin: 10px 10px 10px 15px;
+
+/* Tinymce control hover (e.g. bold, italic, etc.) */
+.mce-btn button:hover {
+  background-color: $white;
 }
+
 textarea:focus, select:focus,
 input[type="text"]:focus, input[type="email"]:focus, input[type="password"]:focus,
 input[type="search"]:focus, input[type="checkbox"]:focus, input[type="radio"]:focus {
@@ -71,8 +73,7 @@
 
 /* Roadmap Form Styling */
 /* ------------------------------------------------ */
-form.roadmap-form, 
-div.read-only-form {
+form.roadmap-form {
   text-align: top;
 
   fieldset.padded {
@@ -110,16 +111,18 @@
 
   /* Fieldset with labels to the left of inputs */
   /* ------------------------------------------ */
-  fieldset.side-by-side, 
-  div.side-by-side {
+  fieldset.side-by-side {
     border: 0;
     
     .mce-tinymce {
       display: inline-block;
+      margin-bottom: 15px;
+      width: 51%;
     }
 
     div {
       label,
+      .button-spacer,
       div.read-only,
       input[type="checkbox"],
       .combobox-container,
@@ -131,7 +134,7 @@
         margin-left: -5px;
       }
 
-      label {
+      label, .button-spacer {
         width: 25%;
         text-align: right;
         margin-right: 10px;
@@ -146,11 +149,9 @@
         font-size: 10pt;
         text-decoration:none;
       }
-    }
-
-    .button-spacer {
-      display: inline-block;
-      width: 21%;
+      div.read-only{
+        margin-bottom: 15px;
+      }
     }
   }
 
@@ -168,7 +169,17 @@
     float: left; /* positions the legend within the fieldset box */
     border-bottom: none;
   }
-
+  
+  label {
+    font-weight: bold;
+  }
+  label:not(.no-colon):after {
+    content: " :";
+  }
+  label.required:after {
+    content: " * :";
+  }
+  
   .form-input {
     clear: both;
   }