diff --git a/app/views/devise/registrations/_external_identifier_orcid.html.erb b/app/views/devise/registrations/_external_identifier_orcid.html.erb
index b5e9acb..16a6e02 100644
--- a/app/views/devise/registrations/_external_identifier_orcid.html.erb
+++ b/app/views/devise/registrations/_external_identifier_orcid.html.erb
@@ -1,13 +1,11 @@
 <% if id.nil? || id.identifier == '' %>
-    <%= link_to 'Create or connect your ORCID iD', Rails.application.routes.url_helpers.send("user_#{scheme.name.downcase}_omniauth_authorize_path"), id:"connect-orcid-button", target: '_blank', title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: "") %>
+    <%= link_to 'Create or connect your ORCID iD', Rails.application.routes.url_helpers.send("user_#{scheme.name.downcase}_omniauth_authorize_path"), id:"connect-orcid-button", target: '_blank', title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: ""), 'data-toggle': "tooltip" %>
 <% else %>
   <% if scheme.user_landing_url.nil? %>
     <%= _("Your account has been linked to #{scheme.description}.") %>
   <% else %>
-    <%= link_to (image_tag("#{scheme.logo_url}", id: 'orcid-id-logo', alt: scheme.description)) + "#{scheme.user_landing_url}/#{id.identifier}", "#{scheme.user_landing_url}/#{id.identifier}", id: 'orcid-id', target: '_blank', title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: "") %>
+    <%= link_to (image_tag("#{scheme.logo_url}", id: 'orcid-id-logo', alt: scheme.description)) + "#{scheme.user_landing_url}/#{id.identifier}", "#{scheme.user_landing_url}/#{id.identifier}", id: 'orcid-id', target: '_blank', title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: " "), 'data-toggle': "tooltip" %>
   <% end %>
   <% title = _("Unlink your account from #{scheme.description}. You can link again at any time.") %>
-  <%= link_to '<i class="fa fa-fw fa-times-circle" aria-hidden="true"></i>'.html_safe, 
-              destroy_user_identifier_path(id), method: :delete, title: title, 'aria-label': title,
-              data: {confirm: _("Are you sure you want to unlink #{scheme.description} ID?")} %>
+  <%= link_to '<i class="fa fa-fw fa-times-circle" aria-hidden="true"></i>'.html_safe, destroy_user_identifier_path(id), method: :delete, title: title, 'aria-label': title, 'data-toggle': "tooltip", data: {confirm: _("Are you sure you want to unlink #{scheme.description} ID?")} %>
 <% end %>
diff --git a/app/views/devise/registrations/_external_identifier_shibboleth.html.erb b/app/views/devise/registrations/_external_identifier_shibboleth.html.erb
index 9daa7f1..8e7283b 100644
--- a/app/views/devise/registrations/_external_identifier_shibboleth.html.erb
+++ b/app/views/devise/registrations/_external_identifier_shibboleth.html.erb
@@ -2,18 +2,18 @@
     <%= link_to "#{_("Link account with #{scheme.description} ID")}",
                 Rails.application.routes.url_helpers.send(
                   "user_#{scheme.name.downcase}_omniauth_authorize_path"
-                ),
+                ), 'data-toggle': "tooltip", 
                 title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: "")
     %>
 <% else %>
   <% if scheme.user_landing_url.nil? %>
     <%= _("Your account has been linked to #{scheme.description}.") %>
   <% else %>
-    <%= link_to "#{_("Your account has been linked to #{scheme.description}.")}", "#{scheme.user_landing_url}/#{id.identifier}", target: '_blank', 
+    <%= link_to "#{_("Your account has been linked to #{scheme.description}.")}", "#{scheme.user_landing_url}/#{id.identifier}", target: '_blank', 'data-toggle': "tooltip", 
         title: t("identifier_schemes.schemes.#{scheme.name}.connect_tooltip", default: "") %>
   <% end %>
   <% title = _("Unlink your account from #{scheme.description}. You can link again at any time.") %>
   <%= link_to '<i class="fa fa-fw fa-times-circle" aria-hidden="true"></i>'.html_safe, 
-              destroy_user_identifier_path(id), method: :delete, title: title, 'aria-label': title,
+              destroy_user_identifier_path(id), method: :delete, title: title, 'aria-label': title, 'data-toggle': "tooltip", 
               data: {confirm: _("Are you sure you want to unlink #{scheme.description} ID?")} %>
 <% end %>
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index e08b028..4514f7e 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -11,9 +11,7 @@
   <div class="form-group">
     <%= f.label(:email, _('Email'), class: "col-sm-2 control-label") %>
     <div class="col-sm-6">
-      <%= f.email_field(:email, class: "form-control", "aria-required": true,
-                        title: _('Please enter your current password below when changing your email address.'),
-                        value: @user.email) %>
+      <%= f.email_field(:email, class: "form-control", "aria-required": true, 'data-toggle': "tooltip", title: _('Please enter your current password below when changing your email address.'), value: @user.email) %>
     </div>
   </div>
 
@@ -34,9 +32,7 @@
   <div class="form-group">
     <%= f.label(:recovery_email, _('Recovery email'), class: "col-sm-2 control-label") %>
     <div class="col-sm-6">
-      <%= f.email_field(:recovery_email, class: 'form-control',  "aria-required": true,
-                        title: _('This email will be used to recover your account if you change institutions'),
-                        value: @user.recovery_email) %>
+      <%= f.email_field(:recovery_email, class: 'form-control',  "aria-required": true, 'data-toggle': "tooltip", title: _('This email will be used to recover your account if you change institutions'), value: @user.recovery_email) %>
     </div>
   </div>
 
@@ -67,7 +63,7 @@
       <% other_organisations = Org.where("parent_id IS ? AND is_other = ?", nil, true).pluck(:id) %>
       <div id="other-org-name" style="display: <%= @other_organisations.nil? ? 'block' : 'none' %>" data-orgs="<%= other_organisations.join(',') %>">
         <%= f.label _('Organisation name'), for: :other_organisation, class: "col-sm-2 control-label" %>
-          <%= f.text_field :other_organisation, :autocomplete => "off", :class => 'form-control has-tooltip', 'data-toggle' => "tooltip", 'data-container' => "body", 'title' => _('Please enter the name of your organisation.') %>
+          <%= f.text_field :other_organisation, :autocomplete => "off", class: 'form-control', 'data-toggle' => "tooltip", 'title': _('Please enter the name of your organisation.') %>
       </div>
     </div>
   </div>
@@ -106,9 +102,8 @@
   <% unless @user.api_token.blank? %>
     <div class="form-group">
       <%= f.label(:api_token, _('API token'), class: "col-sm-2 control-label") %>
-      <div class="col-sm-6"><%= @user.api_token %></div>
-      <%= label_tag(:api_information, _('API Information'), class: "col-sm-2 control-label") %>
-      <div><%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%></div>
+      <%= @user.api_token %>
+      <%= link_to( _('How to use the API'), controller: "token_permission_types", action: "index")%>
     </div>
   <% end %>
 
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 9b9d7b4..3f3e3f5 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -10,33 +10,17 @@
       <fieldset class="side-by-side">
         <div class="form-input">
           <%= f.label _('Name'), for: :name %>
-          <%= f.text_field :name, as: :string, class: 'input-medium required' %>
-          <div class="inline">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.') %>" aria-label="<%= _('More information: Guidance group names') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
+          <%= f.text_field :name, as: :string, class: 'input-medium required', 'data-toggle': 'tooltip', title: _('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.') %>
         </div>
     
         <div class="form-input">
           <%= f.label _('Published'), for: :published %>
-          <%= f.check_box :published %>
-          <div class="inline">
-            <% lbl = _("Check this box when you are ready for guidance associated with this group to appear on user's plans.") %>
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true"
-               data-content="<%= lbl %>" aria-label="<%= lbl %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
+          <%= f.check_box :published, 'data-toggle': 'tooltip', title: _("Check this box when you are ready for guidance associated with this group to appear on user's plans.") %>
         </div>
 
         <div class="form-input">
           <%= f.label _('Optional Subset'), for: :optional_subset %>
-          <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
-          <div class="inline">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.") %>" aria-label="<%= _('More information: Optional subsets for guidance groups') %>">
-              <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
+          <%= f.check_box :optional_subset, 'data-toggle': 'tooltip', title: _("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.") %> <%= _('e.g. School/ Department') %>
         </div>
        
         <!-- submit buttons -->
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index 7b625fd..3893fe1 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -10,21 +10,11 @@
       <fieldset class="side-by-side">
         <div class="form-input">
           <%= f.label _('Name'), for: :name %>
-          <%= f.text_field :name, as: :string, class: "input-medium required" %>
-          <div class="inline">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.') %>" aria-label="<%= _('More information: Guidance group names') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
+          <%= f.text_field :name, as: :string, class: "input-medium required", 'data-toggle': 'tooltip', title: _('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.') %>
         </div>
         <div class="form-input">
           <%= f.label _('Optional Subset'), for: :optional_subset %>
-          <%= f.check_box :optional_subset %> <%= _('e.g. School/ Department') %>
-          <div class="inline">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.") %>" aria-label="<%= _('More information: Optional subsets for guidance groups') %>">
-              <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
+          <%= f.check_box :optional_subset, 'data-toggle': 'tooltip', title: _("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.") %> <%= _('e.g. School/ Department') %>
         </div>
       
         <!-- submit buttons -->
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb
index 952f800..6c27a87 100644
--- a/app/views/guidances/admin_edit.html.erb
+++ b/app/views/guidances/admin_edit.html.erb
@@ -7,30 +7,23 @@
   <div class="col-md-12">
     <%= form_for(@guidance, url: admin_update_guidance_path(@guidance), html: { method: :put , id: 'edit_guidance_form', class: 'roadmap-form bordered'}) do |f| %>
       <fieldset class="side-by-side">
-        <div class="form-input">
+        <div class="form-input" data-toggle="tooltip" title="<%= _('Enter your guidance here. You can include links where needed.') %>">
           <%= f.label _('Text'), for: @guidance.text %>
           <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %>
-          <div class="inline">
-            <% lbl =  %>
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               data-content="<%= _('Enter your guidance here. You can include links where needed.') %>" 
-               aria-label="<%= _('More information: Guidance') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
         </div>
         <div class="form-input">
           <%= f.label _('Themes'), for: :theme_ids %>
           <%= f.collection_select(:theme_ids, @themes, :id, :title,
-                      {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')})%>
+                      {prompt: false, include_blank: 'None'}, {multiple: true, 'data-toggle': 'tooltip', title: _('Select which theme(s) this guidance relates to.')})%>
         </div>
         <div class="form-input">
           <%= f.label _('Published'), for: :published %>
-          <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %>
+          <%= f.check_box :published , as: :check_boxes, 'data-toggle': 'tooltip', title: _("Check this box when you are ready for this guidance to appear on user's plans.") %>
         </div>
         <div class="form-input">
           <%= f.label _('Guidance group'), for: :guidance_group_id %>
           <%= f.collection_select(:guidance_group_id, @guidance_groups,
-                    :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%>
+                    :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, 'data-toggle': 'tooltip', title: _('Select which group this guidance relates to.')})%>
         </div>
     
         <br />
diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb
index 9a97d4c..cefaf2f 100644
--- a/app/views/guidances/admin_new.html.erb
+++ b/app/views/guidances/admin_new.html.erb
@@ -8,30 +8,23 @@
   <div class="col-md-12">
     <%= form_for :guidance, url: {action: 'admin_create'}, html: {id: 'edit_guidance_form', class: 'roadmap-form bordered'} do |f| %>
       <fieldset class="side-by-side">
-        <div class="form-input">
+        <div class="form-input" data-toggle="tooltip" title="<%= _('Enter your guidance here. You can include links where needed.') %>">
           <%= f.label :text %>
           <%= text_area_tag("guidance-text", "", class: "tinymce") %>
-          <div class="inline">
-            <% lbl = _('Enter your guidance here. You can include links where needed.') %>
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               data-content="<%= _('Enter your guidance here. You can include links where needed.') %>" 
-               aria-label="<%= _('More information: Guidance') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
         </div>
         <div class="form-input">
           <%= f.label _('Themes'), for: :theme_ids %>
           <%= f.collection_select(:theme_ids, @themes,
-                    :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true, title: _('Select which theme(s) this guidance relates to.')}) %>
+                    :id, :title, {prompt: false, include_blank: 'None'}, {multiple: true, 'data-toggle': 'tooltip', title: _('Select which theme(s) this guidance relates to.')}) %>
         </div>
         <div class="form-input">
           <%= f.label :published %>
-          <%= f.check_box :published , as: :check_boxes, title: _("Check this box when you are ready for this guidance to appear on user's plans.") %>
+          <%= f.check_box :published , as: :check_boxes, 'data-toggle': 'tooltip', title: _("Check this box when you are ready for this guidance to appear on user's plans.") %>
         </div>
         <div class="form-input">
           <%= f.label _('Guidance group'), for: :guidance_group_id %>
           <%= f.collection_select(:guidance_group_id, @guidance_groups,
-                  :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, title: _('Select which group this guidance relates to.')})%>
+                  :id, :name, {prompt: false, include_blank: 'None'}, {multiple: false, 'data-toggle': 'tooltip', title: _('Select which group this guidance relates to.')})%>
         </div>
 
         <br />
diff --git a/app/views/layouts/_es5_scripts.html.erb b/app/views/layouts/_es5_scripts.html.erb
index ca9b01a..fbcd0e7 100644
--- a/app/views/layouts/_es5_scripts.html.erb
+++ b/app/views/layouts/_es5_scripts.html.erb
@@ -25,14 +25,13 @@
     <%#= javascript_include_tag 'dmproadmap/accordions.js' %>
     <%= javascript_include_tag 'dmproadmap/admin.js' %>
     <%= javascript_include_tag 'dmproadmap/forms.js' %>
-    <%= javascript_include_tag 'dmproadmap/utils.js' %>
+    <%#= javascript_include_tag 'dmproadmap/utils.js' %>
 <!-- END dmproadmap scripts -->
 
 <!-- START views scripts -->
     <%= javascript_include_tag 'views/guidances/admin_edit.js' %>   <!-- (app/views/guidances/admin_new.html.erb) -->
     <%= javascript_include_tag 'views/home/index.js' %> <!-- (app/views/home/index.html.erb) -->
     <%= javascript_include_tag 'views/orgs/admin_edit.js' %>    <!-- (app/views/orgs/admin_edit.html.erb) -->
-    <%= javascript_include_tag 'views/orgs/shibboleth_ds.js' %> <!-- (app/views/orgs/shibboleth_ds.html.erb) -->
     <%= javascript_include_tag 'views/plans/available_templates.js' %>  <!-- (app/views/plans/_available_templates.html.erb) -->
     <%= javascript_include_tag 'views/registrations/sign_in_sign_up.js' %>  <!-- -->
     <%= javascript_include_tag 'views/shared/login_form.js' %>  <!-- -->
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 4d6ee9d..0d6cbce 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -8,45 +8,38 @@
 
 <div class="row">
   <div class="col-md-12">
-    <%= form_for 'shibboleth_ds', url: shibboleth_ds_path, html: {class: "shibboleth-ds-form roadmap-form"} do |f| %>
-      <fieldset class="standard padded">
-        <div class="form-input">
-          <%= f.label(:org_name, _('Look up your institution here')) %>
-    
-          <% if @orgs.length <= 10 %>
-            <select id="org_name" class="left-indent">
-              <option value=""><%= _('Please select one') %></option>
-              <%= raw @orgs.collect{|o| "<option value=\"#{o.id}\">#{o.name}</option>" }.join('') %>
-            </select>
-          
-          <% else %>
-            <%= render partial: "shared/accessible_combobox", 
-                       locals: {name: 'org_name',
-                                id: 'org_name',
-                                default_selection: nil,
-                                models: @orgs,
-                                attribute: 'name',
-                                classes: 'fixed-width-large'} %>
-          <% end %>
+    <%= form_for 'shibboleth_ds', url: shibboleth_ds_path, html: {id: 'shibboleth_ds'} do |f| %>
+      <div class="form-group">
+        <%= f.label(:org_name, _('Look up your institution here')) %>
+  
+        <% if @orgs.length <= 10 %>
+          <select id="org_name" class="left-indent">
+            <option value=""><%= _('Please select one') %></option>
+            <%= raw @orgs.collect{|o| "<option value=\"#{o.id}\">#{o.name}</option>" }.join('') %>
+          </select>
         
-          <%= render partial: 'shared/accessible_submit_button',
-                     locals: {id: 'submit-button', 
-                              val: _('Go'), 
-                              disabled_initially: true,
-                              classes: 'small-input-button',
-                              tooltip: _('Select an institution.'),
-                              classes: 'inline left-indent'} %>
+        <% else %>
+          <%= render partial: "shared/accessible_combobox", 
+                     locals: {name: 'org_name',
+                              id: 'org_name',
+                              default_selection: nil,
+                              models: @orgs,
+                              attribute: 'name',
+                              required: true,
+                              classes: ''} %>
+        <% end %>
+      
+        <%= f.button(_('Go'), class: "btn btn-default", type: "submit") %>
 
-          <% if @orgs.length > 10 %>
-            <p class="centered left-indent">
-              <strong>- <%= _('or') %> -</strong>
-              <br />
-              <a id="show_list" href="#"><%= _('See the full list of participating institutions') %></a>
-            </p>
-          <% end %>
+        <% if @orgs.length > 10 %>
+          <p class="centered left-indent">
+            <strong>- <%= _('or') %> -</strong>
+            <br />
+            <a id="show_list" href="#"><%= _('See the full list of participating institutions') %></a>
+          </p>
+        <% end %>
 
-        </div>
-      </fieldset>
+      </div>
     <% end %>
   
     <div id="full_list" style="display: none" class="left-indent" aria-hidden="true">
diff --git a/app/views/phases/_admin_add.html.erb b/app/views/phases/_admin_add.html.erb
index 39bff5a..a884b10 100644
--- a/app/views/phases/_admin_add.html.erb
+++ b/app/views/phases/_admin_add.html.erb
@@ -4,30 +4,21 @@
   <%= f.hidden_field :template_id, value: @template.id%>
     <div class="form-group">
       <%= f.label(:title, _('Title') ,class: 'col-md-2 control-label') %>
-      <div class="col-md-8">
-        <%= f.text_field(:title, class: 'col-md-10 form-control', 'aria-required': false) %> 
-      </div>
-      <div class="col-md-2">
-        <%= render partial: '/shared/tooltip', locals: { aria_label: _('Title'), placement: 'top', title: _('Enter a title for the phase e.g. intial DMP, full DMP... This is what users will see in the tabs when completing a plan. If you only have one phase, call it something generic e.g. Glasgow DMP') } %>
+      <div class="col-md-10">
+        <%= f.text_field(:title, class: 'col-md-10 form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('Enter a title for the phase e.g. intial DMP, full DMP... This is what users will see in the tabs when completing a plan. If you only have one phase, call it something generic e.g. Glasgow DMP')) %> 
       </div>
     </div>
     <div class="form-group">
       <%= f.label(:number, _('Order of display'), class: 'col-md-2 control-label') %>
-      <div class="col-md-8">
-        <%= f.number_field(:number, in: 1..5, class: 'form-control', 'aria-required': false) %>
-      </div>
-      <div class="col-md-2">
-        <%= render partial: '/shared/tooltip', locals: { aria_label: _('Order of display'), placement: 'top', title: _('This allows you to order the phases of your template.') } %>
+      <div class="col-md-10">
+        <%= f.number_field(:number, in: 1..5, class: 'form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('This allows you to order the phases of your template.')) %>
       </div>
     </div>
     <div class="form-group">
       <%= f.label(:description, _('Description'), class: 'col-md-2 control-label') %>
-      <div class="col-md-8">
+      <div class="col-md-10" data-toggle="tooltip" title="<%= _("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.") %>">
         <%= text_area_tag('phase-desc', '', class: 'tinymce') %>
       </div>
-      <div class="col-md-2">
-        <%= render partial: '/shared/popover', locals: { aria_label: _('Description'), placement: 'top', title: _('More information: Phase descriptions'), 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>
     </div>
     <div class="pull-right">
       <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb
index 4b0c392..6b876aa 100644
--- a/app/views/phases/_edit_phase.html.erb
+++ b/app/views/phases/_edit_phase.html.erb
@@ -1,30 +1,21 @@
 <%= form_for :phase, { url: admin_update_phase_path(phase.id), html: { method: :put, class: 'form-horizontal' }} do |f| %>
     <div class="form-group">
       <%= f.label(:title, _('Title') ,class: 'col-md-2 control-label') %>
-      <div class="col-md-8">
-        <%= f.text_field(:title, class: 'col-md-10 form-control', 'aria-required': false) %> 
-      </div>
-      <div class="col-md-2">
-        <%= render partial: '/shared/tooltip', locals: { aria_label: _('Title'), placement: 'top', title: _('Enter a title for the phase e.g. intial DMP, full DMP... This is what users will see in the tabs when completing a plan. If you only have one phase, call it something generic e.g. Glasgow DMP') } %>
+      <div class="col-md-10">
+        <%= f.text_field(:title, class: 'col-md-10 form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('Enter a title for the phase e.g. intial DMP, full DMP... This is what users will see in the tabs when completing a plan. If you only have one phase, call it something generic e.g. Glasgow DMP')) %> 
       </div>
     </div>
     <div class="form-group">
       <%= f.label(:number, _('Order of display'), class: 'col-md-2 control-label') %>
-      <div class="col-md-8">
-        <%= f.number_field(:number, in: 1..5, class: 'form-control', 'aria-required': false) %>
-      </div>
-      <div class="col-md-2">
-        <%= render partial: '/shared/tooltip', locals: { aria_label: _('Order of display'), placement: 'top', title: _('This allows you to order the phases of your template.') } %>
+      <div class="col-md-10">
+        <%= f.number_field(:number, in: 1..5, class: 'form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('This allows you to order the phases of your template.')) %>
       </div>
     </div>
     <div class="form-group">
       <%= f.label(:description, _('Description'), class: 'col-md-2 control-label') %>
-      <div class="col-md-8">
+      <div class="col-md-10" data-toggle="tooltip" title="<%= _("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.") %>">
         <%= text_area_tag('phase-desc', phase.description, class: 'tinymce') %>
       </div>
-      <div class="col-md-2">
-        <%= render partial: '/shared/popover', locals: { aria_label: _('Description'), placement: 'top', title: _('More information: Phase descriptions'), 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>
     </div>
     <div class="pull-right">
       <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index 4da60a0..9d9d86a 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -6,21 +6,8 @@
           <%= f.label(:title, _('Project Title'), class: 'control-label') %>
         </div>
         <div class="col-md-8">
-          <%= f.text_field(
-            :title,
-            class: 'form-control',
-            "aria-required": true) %>
-        </div>
-        <div class="col-md-4">
-          <button
-            type="button"
-            class="btn btn-link"
-            aria-label="<%= _('Project Title') %>"
-            data-toggle="tooltip"
-            data-placement="top"
-            title="<%= _('If applying for funding, state the name exactly as in the grant proposal.') %>">
-                <i class="fa fa-question-circle" aria-hidden="true"></i>
-          </button>
+          <%= f.text_field(:title, class: 'form-control', "aria-required": true, 'data-toggle': 'tooltip', 
+            title: _('If applying for funding, state the name exactly as in the grant proposal.')) %>
         </div>
       </div>
       <div class="form-group"><!-- visibility -->
@@ -48,66 +35,28 @@
           <%= f.label(:grant_number, _('Grant Number'), class: 'control-label') %>
         </div>
         <div class="col-md-8">
-          <%= f.text_field(
-            :grant_number,
-            class: 'form-control',
-            "aria-required": false) %>
-        </div>
-        <div class="col-md-4">
-          <button
-            type="button"
-            class="btn btn-link"
-            aria-label="<%= _('Grant Number') %>"
-            data-toggle="tooltip"
-            data-placement="top"
-            title="<%= _('Grant reference number if applicable [POST-AWARD DMPs ONLY]') %>">
-                <i class="fa fa-question-circle" aria-hidden="true"></i>
-          </button>
+          <%= f.text_field(:grant_number, class: 'form-control', "aria-required": false, 'data-toggle': 'tooltip', 
+            title: _('Grant reference number if applicable [POST-AWARD DMPs ONLY]')) %>
         </div>
       </div>
       <div class="form-group"><!-- description -->
         <div class="col-md-12">
           <%= f.label(:description, _('Project Abstract'), class: 'control-label') %>
         </div>
-        <div class="col-md-8">
+        <div class="col-md-8" data-toggle="tooltip" data-html="true" title="<%= _("<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>").html_safe %>">
           <%= f.text_area(
             :description,
             class: 'form-control tinymce',
             "aria-required": false) %>
         </div>
-        <div class="col-md-4">
-          <button
-            type="button"
-            class="btn btn-link"
-            aria-label="<%= _('Project Abstract') %>"
-            data-toggle="popover"
-            data-placement="top"
-            title="<%= _('More information: Guidance') %>"
-            data-content="<%= _("<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>") %>">
-                <i class="fa fa-question-circle" aria-hidden="true"></i>
-          </button>
-        </div>
       </div>
       <div class="form-group"><!-- identifier -->
         <div class="col-md-12">
           <%= f.label(:identifier, _('ID'), class: 'control-label') %>
         </div>
         <div class="col-md-8">
-          <%= f.text_field(
-            :identifier,
-            class: 'form-control',
-            "aria-required": false) %>
-        </div>
-        <div class="col-md-4">
-          <button
-            type="button"
-            class="btn btn-link"
-            aria-label="<%= _('ID') %>"
-            data-toggle="tooltip"
-            data-placement="top"
-            title="<%= _('A pertinent ID as determined by the funder and/or institution.') %>">
-                <i class="fa fa-question-circle" aria-hidden="true"></i>
-          </button>
+          <%= f.text_field(:identifier, class: 'form-control', "aria-required": false, 'data-toggle': "tooltip", 
+                           title: _('A pertinent ID as determined by the funder and/or institution.')) %>
         </div>
       </div>
       <hr />
diff --git a/app/views/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb
index b4cb2e3..df2229e 100644
--- a/app/views/questions/_add_question.html.erb
+++ b/app/views/questions/_add_question.html.erb
@@ -17,7 +17,7 @@
       <!--Question number -->
       <tr>
         <td class="first_template"><%= _('Question number')%></td>
-        <td><%= f.number_field :number, in: 1..50, class: "number_field has-tooltip", "data-toggle" => "tooltip", title: _('This allows you to order questions within a section.') %>
+        <td><%= f.number_field :number, in: 1..50, class: "number_field has-tooltip", "data-toggle": "tooltip", title: _('This allows you to order questions within a section.') %>
 
           <div class="border_bottom"></div>
         </td>
@@ -40,29 +40,19 @@
             <div class="div_left_icon">
               <%= f.select :question_format_id,
                 options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, QuestionFormat.id_for(QuestionFormat.formattypes[:textarea])),
-                  {}, class: "question_format" %>
-            </div>
-            <div class="div_right_icon">
-              <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-                 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>") %>"
-                 aria-label="<%= _('More information: Answer formats') %>">
-              <span class="fa fa-question-circle" aria-hidden="true"></span></a>
+                  {}, class: "question_format", 'data-toggle': 'tooltip', 'data-html': true, title: _("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>") %>
             </div>
           </div>
           <div class="clearfix"></div>
           <!--display form to enter option from checkbox/radio button/ dropdown/ multi select box-->
           <div style="display:none;" class="ques_format_option">
             <table class="options_table">
-              <thead>
+              <thead data-toggle="tooltip" title="<%= _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.') %>">
                 <tr>
                   <th nowrap class="small"><%= _('Order')%></th>
                   <th nowrap class="medium"><%= _('Text')%></th>
                   <th nowrap class="small"><%= _('Default')%></th>
-                  <th nowrap class="small">
-                    <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-                       data-content="<%= _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.') %>"
-                        aria-label="<%= _('More information: Question options') %>">
-                    <span class="fa fa-question-circle" aria-hidden="true"></span></a></th>
+                  <th nowrap class="small"></th>
                 </tr>
               </thead>
               <tbody class="options_tbody">
@@ -97,24 +87,18 @@
       <tr class="default_answer">
         <td class="first_template"><%= _('Default answer')%></td>
         <td>
-          <div class="div_left_icon">
+          <div class="div_left_icon" data-toggle="tooltip" title="<%= _('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.') %>">
             <div>
               <%= text_field_tag("question-default-value-textfield", @new_question.default_value, class: "default_answer_textfield", style: 'display:none') %>
               <%= text_area_tag("question-default-value-textarea", @new_question.default_value, class: "default_answer_textarea tinymce") %>
             </div>
           </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.') %>"
-                aria-label="<%= _('More information: Default answer') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
         </td>
       </tr>
       <!-- Suggested answer or Example for Question -->
-      <tr>
+      <tr data-toggle="tooltip" title="<%= _('You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>">
         <td class="first_template">
           <%= _('Example Answer')%>
         </td>
@@ -122,29 +106,17 @@
           <div class="div_left_icon">
             <%= text_area_tag(:example_answer, "", class: "tinymce") %>
           </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.') %>"
-                aria-label="<%= _('More information: Example answers') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
         </td>
       </tr>
       <!-- Guidance for Question -->
-      <tr>
+      <tr data-toggle="tooltip" title="<%= _("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.") %>">
         <td class="first_template"><%= _('Guidance')%></td>
         <td class="tinymce">
           <div class="div_left_icon">
             <%= text_area_tag(:guidance, "", class: "tinymce") %>
           </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.") %>"
-                aria-label="<%= _('More information: Guidance') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
         </td>
@@ -156,12 +128,7 @@
           <div class="div_left_icon">
             <%= f.collection_select(:theme_ids,
                 Theme.all.order("title"),
-                :id, :title, {prompt: false, include_blank: _('None')}, {multiple: true})%>
-          </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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>") %>" aria-label="<%= _('More information: Themes') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
+                :id, :title, {prompt: false, include_blank: _('None')}, {multiple: true, 'data-toggle': 'tooltip', 'data-html': true, title: _("<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>")})%>
           </div>
         </td>
       </tr>
diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb
index 154a500..a7ce7a8 100644
--- a/app/views/questions/_edit_question.html.erb
+++ b/app/views/questions/_edit_question.html.erb
@@ -12,7 +12,7 @@
       <!--Question number -->
       <tr>
         <td class="first_template"><%= _('Question number')%></td>
-        <td><%= f.number_field :number, in: 1..50, class: "number_field has-tooltip", "data-toggle" => "tooltip", "title" => _('This allows you to order questions within a section.') %>
+        <td><%= f.number_field :number, in: 1..50, class: "number_field", "data-toggle": "tooltip", "title" => _('This allows you to order questions within a section.') %>
           <div class="border_bottom"></div>
         </td>
       </tr>
@@ -35,31 +35,19 @@
               <%= f.hidden_field :id,{ class: "quest_id" } %>
               <%= f.select :question_format_id,
                 options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, question.question_format_id),
-                {}, class: "question_format", id: "#{question.id}-select-format"%>
+                {}, class: "question_format", id: "#{question.id}-select-format", 'data-toggle': 'tooltip', 'data-html': true, title: _("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>")%>
             </div>
-            <div class="div_right_icon">
-              <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-                 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>") %>"
-                 aria-label="<%= _('More information: Answer format') %>">
-              <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-            </div>
-
           </div>
 
           <!--display form to enter option from checkbox/radio button/ dropdown/ multi select box-->
           <div id="options-<%= question.id %>" style="<%= question.question_format.option_based? ? '' : 'display:none;'%>" class="ques_format_option">
             <table class="options_table">
-              <thead>
+              <thead data-toggle="tooltip" title="<%= _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.') %>">
                 <tr>
                   <th nowrap class="small"><%= _('Order')%></th>
                   <th nowrap class="medium"><%= _('Text')%></th>
                   <th nowrap class="small"><%= _('Default')%></th>
-                  <th nowrap class="small">
-                    <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-                       data-content="<%= _('Enter any options that you wish to display. If you want to pre-set one option as selected, check the default box.') %>"
-                       aria-label="<%= _('More information: Question options') %>">
-                    <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-                  </th>
+                  <th nowrap class="small"></th>
                 </tr>
               </thead>
               <tbody class="options_tbody">
@@ -93,24 +81,18 @@
       <tr class="default_answer" style="<%= !question.question_format.option_based? ? '' : 'display:none;'%>">
         <td class="first_template"><%= _('Default answer')%></td>
         <td>
-          <div class="div_left_icon">
+          <div class="div_left_icon" data-toggle="tooltip" title="<%= _('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.') %>">
             <div>
               <%= text_field_tag("question-default-value-textfield", question.default_value, class: "default_answer_textfield", style: question.question_format.textfield? ? '' : 'display:none;') %>
               <%= text_area_tag("question-default-value-textarea", question.default_value, class: "default_answer_textarea tinymce", style: question.question_format.textarea? ? '' : 'display:none;') %>
             </div>
           </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.') %>"
-               aria-label="<%= _('More information: Default answer') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
         </td>
       </tr>
       <!-- Suggested answer or Example-->
-      <tr>
+      <tr data-toggle="tooltip" title="<%= _('You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted.') %>">
         <td class="first_template"><%= _('Example Answer')%></td>
         <td><div class="div_left_icon">
           <% example_answer = question.get_example_answer(current_user.org.id) %>
@@ -126,18 +108,12 @@
             </ul>
           <% end %>
           </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.') %>"
-               aria-label="<%= _('More information: Example answers') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
         </td>
       </tr>
       <!-- Guidance for Question -->
-      <tr>
+      <tr data-toggle="tooltip" title="<%= _("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.") %>">
         <td class="first_template"><%= _('Guidance')%></td>
         <td class="tinymce">
           <div class="div_left_icon">
@@ -145,12 +121,6 @@
             <% guidance_text = guidance.present? ? guidance.text : "" %>
             <%= text_area_tag("question-guidance-#{question.id}", guidance_text , class: "tinymce") %>
           </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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.") %>"
-               aria-label="<%= _('More information: Guidance') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-          </div>
           <div class="clearfix"></div>
           <div class="border_bottom"></div>
         </td>
@@ -161,13 +131,7 @@
         <td><div class="div_left_icon">
             <%= f.collection_select(:theme_ids,
               Theme.all.order("title"),
-              :id, :title, {prompt: false, include_blank: "None"}, {multiple: true})%>
-          </div>
-          <div class="div_right_icon">
-            <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-               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>") %>"
-               aria-label="<%= _('More information: Themes') %>">
-            <span class="fa fa-question-circle" aria-hidden="true"></span></a>
+              :id, :title, {prompt: false, include_blank: "None"}, {multiple: true, 'data-toggle': 'tooltip', 'data-html': true, title: _("<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>")})%>
           </div>
         </td>
       </tr>
diff --git a/app/views/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb
index ebed50f..73805a8 100644
--- a/app/views/sections/_add_section.html.erb
+++ b/app/views/sections/_add_section.html.erb
@@ -15,21 +15,15 @@
     <div class="panel-body">
       <div class="form-group">
         <%= f.label(:number, _('Order of display'), class: 'col-md-2 control-label') %>
-        <div class="col-md-8">
-          <%= f.number_field(:number, in: 1..15, class: 'form-control', 'aria-required': false) %>
-        </div>
-        <div class="col-md-2">
-          <%= render partial: '/shared/tooltip', locals: { aria_label: _('Order of display'), placement: 'top', title: _('This allows you to order sections.') } %>
+        <div class="col-md-10">
+          <%= f.number_field(:number, in: 1..15, class: 'form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('This allows you to order sections.')) %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label(:description, _('Description'), class: 'col-md-2 control-label') %>
-        <div class="col-md-8">
+        <div class="col-md-10" data-toggle="tooltip" title="<%= _("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.") %>">
           <%= text_area_tag('section-desc', '', class: 'tinymce') %>
         </div>
-        <div class="col-md-2">
-          <%= render partial: '/shared/popover', locals: { aria_label: _('Description'), placement: 'top', title: _('More information: Section descriptions'), 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.") } %>
-        </div>
       </div>
       <div class="pull-right">
         <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index 38d02f6..e9cedfe 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -8,30 +8,21 @@
     <%= form_for(section, url: admin_update_section_path(section, phase: phase), html: { method: :put, class: 'form-horizontal'}) do |f| %>
       <div class="form-group">
           <%= f.label(:title, _('Title'), { class: 'col-md-2 control-label' }) %>
-        <div class="col-md-8">
-          <%= f.text_field(:title, { class: 'form-control', 'aria-required': false, placeholder: _('Enter a title for the section') } ) %>
-        </div>
-        <div class="col-md-2">
-          <%= render partial: '/shared/tooltip', locals: { aria_label: _('Title'), placement: 'top', title: _('Enter a title for the section') } %>
+        <div class="col-md-10">
+          <%= f.text_field(:title, { class: 'form-control', 'aria-required': false, placeholder: _('Enter a title for the section'), 'data-toggle': 'tooltip', title: _('Enter a title for the section')} ) %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label(:number, _('Order of display'), class: 'col-md-2 control-label') %>
-        <div class="col-md-8">
-          <%= f.number_field(:number, in: 1..15, class: 'form-control', 'aria-required': false) %>
-        </div>
-        <div class="col-md-2">
-          <%= render partial: '/shared/tooltip', locals: { aria_label: _('Order of display'), placement: 'top', title: _('This allows you to order sections.') } %>
+        <div class="col-md-10">
+          <%= f.number_field(:number, in: 1..15, class: 'form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('This allows you to order sections.')) %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label(:description, _('Description'), class: 'col-md-2 control-label') %>
-        <div class="col-md-8">
+        <div class="col-md-10" data-toggle="tooltip" title="<%= _("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.") %>">
           <%= text_area_tag('section-desc', section.description, class: 'tinymce') %>
         </div>
-        <div class="col-md-2">
-          <%= render partial: '/shared/popover', locals: { aria_label: _('Description'), placement: 'top', title: _('More information: Section descriptions'), 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.") } %>
-        </div>
       </div>
       <div class="pull-right">
         <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index f2ef99f..dd1b4bb 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -1,6 +1,7 @@
 <% if !models.nil? %>
   <% required = required ||= false %>
   <% classes = classes ||= '' %>
+  <% title = tooltip ||= '' %>
   <% error = error ||= _('Please select an item from the list.') %>
 
   <% json = {} %>
@@ -13,6 +14,8 @@
          data-combobox-case-sensitive="no"
          data-combobox-search-option="containing"
          data-combobox-allow-suggestion-on-empty="true"
+         data-toggle="<%= title == '' ? '' : 'tooltip' %>"
+         title="<%= title %>"
          value="<%= default_selection[attribute] unless default_selection.nil? %>" />
   <datalist id="<%= id %>_list">
     <% models.each do |model| %>
diff --git a/app/views/shared/_create_account_form.html.erb b/app/views/shared/_create_account_form.html.erb
index 2e8f3e0..c9d8cba 100644
--- a/app/views/shared/_create_account_form.html.erb
+++ b/app/views/shared/_create_account_form.html.erb
@@ -24,7 +24,7 @@
                         classes: 'form-control'} %>
 
     <% other_organisations = Org.where("parent_id IS ? AND is_other = ?", nil, true).pluck(:id) %>
-    <%= f.text_field :other_organisation, autocomplete: "off", class: 'form-control', 'data-toggle': "tooltip", 'data-placement': "right", title: _('Please enter the name of your organisation.'), style: 'display: none;' %>
+    <%= f.text_field :other_organisation, autocomplete: "off", class: 'form-control', 'data-toggle': "tooltip", title: _('Please enter the name of your organisation.'), style: 'display: none;' %>
     <a href="#" id="other_org_link"><%= _("My organisation isn't listed.") %></a>
   </div>
   
diff --git a/app/views/shared/_popover.html.erb b/app/views/shared/_popover.html.erb
deleted file mode 100644
index ae5691b..0000000
--- a/app/views/shared/_popover.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- local variables: aria_label, placement, title, content -->
-<button
-    type="button"
-    class="btn btn-link"
-    aria-label="<%= aria_label.present? ? aria_label.to_s : _('Provide the label to any assistive technology') %>"
-    data-toggle="popover"
-    data-placement="<%= ['top', 'right', 'bottom', 'left'].include?(placement) ? placement : 'top' %>"
-    title="<%= title.present? ? title.to_s : _('Popover title') %>"
-    data-content="<%= content.present? ? content.to_s : _('Content for the popover') %>">
-        <i class="fa fa-question-circle" aria-hidden="true"></i>
-</button>
\ No newline at end of file
diff --git a/app/views/shared/_table_filter.html.erb b/app/views/shared/_table_filter.html.erb
index dae9f28..692d1fb 100644
--- a/app/views/shared/_table_filter.html.erb
+++ b/app/views/shared/_table_filter.html.erb
@@ -3,6 +3,7 @@
     <%= label_tag :filter, _('Filter plans'), class: "sr-only" %>
     <%= search_field_tag(:filter, params[:filter], placeholder: placeholder, class: "form-control") %>
     <a id="clear_filter" href="<%= path -%>" 
+       data-toggle="tooltip"
        title="<%= _('Remove the filter') -%>" 
        aria-label="<%= _('Remove the filter') %>">
       <i class="fa fa-times" aria-hidden="true"></i>
diff --git a/app/views/shared/_tooltip.html.erb b/app/views/shared/_tooltip.html.erb
deleted file mode 100644
index f30b5af..0000000
--- a/app/views/shared/_tooltip.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- local variables: aria_label, placement, title -->
-<button
-    type="button"
-    class="btn btn-link"
-    aria-label="<%= aria_label.present? ? aria_label.to_s : _('Provide the label to any assistive technology') %>"
-    data-toggle="tooltip"
-    data-placement="<%= ['top', 'right', 'bottom', 'left'].include?(placement) ? placement : 'top' %>"
-    title="<%= title.present? ? title.to_s : _('Tooltip title') %>">
-        <i class="fa fa-question-circle" aria-hidden="true"></i>
-</button>
\ 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 52a84a5..efc2244 100644
--- a/app/views/templates/_edit_annotations.html.erb
+++ b/app/views/templates/_edit_annotations.html.erb
@@ -54,15 +54,10 @@
           <%= f.fields_for :annotations, annotation do |s|%>
             <%= s.hidden_field :org_id, value: current_user.org.id %>
             <ul>
-              <li><%= s.text_area :text, rows: 5 %></li>
+              <li><%= s.text_area :text, rows: 5, 'data-toggle': 'tooltip', title: _('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.') %></li>
             </ul>
           <% end %>
         </div>
-        <div class="div_right_icon">
-          <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-             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.') %>" aria-label="<%= _('More information: Example answers') %>">
-          <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-        </div>
         <div class="clearfix"></div>
         <div class="border_bottom"></div>
       </td>
@@ -72,14 +67,9 @@
     <tr>
       <td class="first_template"><%= _('Guidance')%></td>
       <td>
-        <div class="div_left_icon">
+        <div class="div_left_icon" data-toggle="tooltip" title="<%= _("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.") %>">
           <%= text_area_tag("question-guidance-#{question.id}", question.guidance , class: "tinymce") %>
         </div>
-        <div class="div_right_icon">
-          <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-             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.") %>" aria-label="<%= _('More information: Guidance') %>">
-          <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-        </div>
         <div class="clearfix"></div>
         <div class="border_bottom"></div>
       </td>
diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
index 317f970..8200626 100644
--- a/app/views/templates/_edit_template.html.erb
+++ b/app/views/templates/_edit_template.html.erb
@@ -2,24 +2,15 @@
 <%= form_for(template, url: admin_update_template_path(template), html: { method: :put, class: 'form-horizontal' }) do |f| %>
   <div class="form-group">
     <%= f.label(:title, _('Title'), class: 'col-md-2 control-label') %>
-    <div class="col-md-8">
-      <%= f.text_field(
-      :title,
-      class: "form-control",
-      "aria-required": false) %>
-    </div>
-    <div class="col-md-2">
-      <%= render partial: '/shared/tooltip', locals: { aria_label: _('Title'), placement: 'top', title: _('Add tooltip Please enter a title for your template.') } %>
+    <div class="col-md-10">
+      <%= f.text_field(:title, class: "form-control", "aria-required": false, 'data-toggle': 'tooltip', title: _('Please enter a title for your template.')) %>
     </div>
   </div>
   <div class="form-group">
     <%= f.label(:description, _('Description'), class: 'col-md-2 control-label') %>
-    <div class="col-md-8">
+    <div class="col-md-10" data-toggle="tooltip" title="<%= _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>">
       <%= text_area_tag("template-desc", template.description, { class: 'form-control tinymce', "aria-required": false }) %>
     </div>
-    <div class="col-md-2">
-      <%= render partial: '/shared/popover', locals: { aria_label: _('Description'), placement: 'top', title: _('More information: Template descriptions'), content: _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') } %>
-    </div>
   </div>
   <div class="form-group">
     <%= label_tag(:status, _('Status'), class: 'col-md-2 control-label') %>
diff --git a/app/views/templates/admin_new.html.erb b/app/views/templates/admin_new.html.erb
index 0ffe313..8166201 100644
--- a/app/views/templates/admin_new.html.erb
+++ b/app/views/templates/admin_new.html.erb
@@ -23,19 +23,14 @@
           <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>
+                  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">
+              <div class="div_left_icon" data-toggle="tooltip" title="<%= _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>">
                 <%= text_area_tag("template-desc", "", class: "tinymce") %>
               </div>
-              <div class="div_right_icon">
-                <a href="#" data-toggle="popover" rel: "popover" data-html: "true" role="button" 
-                   data-content="<%= _('Enter a description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>" aria-label="<%= _('More information: Template descriptions') %>">
-                <span class="fa fa-question-circle" aria-hidden="true"></span></a>
-              </div>
             </td>
           </tr>
 
diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb
index 2dc172e..e2e74b6 100644
--- a/app/views/users/admin_grant_permissions.html.erb
+++ b/app/views/users/admin_grant_permissions.html.erb
@@ -15,23 +15,23 @@
           
             <% @perms.each do |perm| %>
               <% case perm.name when 'grant_permissions' %>
-                <th title="<%= _('Allows the user to assign permissions to other users within the same organisation. Users can only assign permissions they own themselves') %>">
+                <th data-toggle="tooltip" title="<%= _('Allows the user to assign permissions to other users within the same organisation. Users can only assign permissions they own themselves') %>">
                   <%= _('Grant permissions') %>
                 </th>
               <% when 'modify_templates' %>
-                <th title="<%= _('Allows the user to create new institutional templates, edit existing ones and customise funder templates') %>">
+                <th data-toggle="tooltip" title="<%= _('Allows the user to create new institutional templates, edit existing ones and customise funder templates') %>">
                   <%= _('Modify templates') %>
                 </th>
               <% when 'modify_guidance' %>
-                <th title="<%= _('Allows the user to create and edit guidance') %>">
+                <th data-toggle="tooltip" title="<%= _('Allows the user to create and edit guidance') %>">
                   <%= _('Modify guidance') %>
                 </th>
               <% when 'use_api' %>
-                <th title="<%= _('Provides the user with an API token and grants rights to harvest information from the tool') %>">
+                <th data-toggle="tooltip" title="<%= _('Provides the user with an API token and grants rights to harvest information from the tool') %>">
                   <%= _('API rights') %>
                 </th>
               <% when 'change_org_details' %>
-                <th title="<%= _('Allows the user to amend the organisation details (name, URL etc) and add basic branding such as the logo') %>">
+                <th data-toggle="tooltip" title="<%= _('Allows the user to amend the organisation details (name, URL etc) and add basic branding such as the logo') %>">
                   <%= _('Change organisation details') %>
                 </th>
               <% end %>
diff --git a/lib/assets/javascripts/application.js b/lib/assets/javascripts/application.js
index 8780e69..f51454c 100644
--- a/lib/assets/javascripts/application.js
+++ b/lib/assets/javascripts/application.js
@@ -1,3 +1,6 @@
+// Not sure if this file is the best place for this.
+import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
+
 import './views/answers/status';
 import './views/contacts/new';
 import './views/devise/invitations/edit';
@@ -5,6 +8,7 @@
 import './views/devise/passwords/new';
 import './views/devise/registrations/edit';
 import './views/notes/index';
+import './views/orgs/shibboleth_ds';
 import './views/phases/edit';
 import './views/phases/show';
 import './views/plans/download';
@@ -21,11 +25,22 @@
 import './views/templates/show';
 import './views/templates/edit';
 
-// Not sure if this belongs here. All tables share the same class/id selectors 
-// so having it on one page makes it work everywhere
+// Not sure if this file is the best place for this. 
+// All tables share the same class/id selectors so having it on one page makes it work everywhere
+// All tooltips have the data-toggle="tooltip" attribute
 import { collateTable, filteriseTable } from './utils/tableHelper';
 
-$().ready(() => {
+$(() => {
   collateTable({ selector: 'table.tablesorter' });
   filteriseTable({ selector: '#filter' });
+
+  // When using a tooltip on a tinymce textarea, add the HTML attributes for the tooltips to 
+  // the parent `<div class="form-group">`. TODO: this does not work on focus though since tinymce
+  // uses an iframe and we can't detect when the editor window gains focus. It only works on hover.
+  //
+  // If the content of the tooltip contains HTML, then add `data-html="true"` to the element
+  $('[data-toggle="tooltip"]').tooltip({
+    animated: 'fade',
+    placement: 'right',
+  });
 });
diff --git a/lib/assets/javascripts/constants.js b/lib/assets/javascripts/constants.js
index 3f7416e..f0a7673 100644
--- a/lib/assets/javascripts/constants.js
+++ b/lib/assets/javascripts/constants.js
@@ -18,3 +18,6 @@
 export const PLAN_VISIBILITY_WHEN_TEST = 'N/A';
 export const PLAN_VISIBILITY_WHEN_NOT_TEST = 'Private';
 export const PLAN_VISIBILITY_WHEN_NOT_TEST_TOOLTIP = 'Private: restricted to me and people I invite.';
+
+export const SHIBBOLETH_DISCOVERY_SERVICE_HIDE_LIST = 'Hide list.';
+export const SHIBBOLETH_DISCOVERY_SERVICE_SHOW_LIST = 'See the full list of partner institutions.';
diff --git a/lib/assets/javascripts/views/devise/registrations/edit.js b/lib/assets/javascripts/views/devise/registrations/edit.js
index 1e13ae2..a03e07e 100644
--- a/lib/assets/javascripts/views/devise/registrations/edit.js
+++ b/lib/assets/javascripts/views/devise/registrations/edit.js
@@ -1,5 +1,3 @@
-import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
-import 'bootstrap-sass/assets/javascripts/bootstrap/popover';
 import ariatiseForm from '../../../utils/ariatiseForm';
 
 import { addMatchingPasswordValidator, togglisePasswords } from '../../../utils/passwordHelper';
diff --git a/lib/assets/javascripts/views/orgs/shibboleth_ds.js b/lib/assets/javascripts/views/orgs/shibboleth_ds.js
index 2537ab6..b113489 100644
--- a/lib/assets/javascripts/views/orgs/shibboleth_ds.js
+++ b/lib/assets/javascripts/views/orgs/shibboleth_ds.js
@@ -1,21 +1,22 @@
-$(document).ready(function(){
-  // If the hidden valid-form field is set to true then enable the submit button
-  $("#org_name, #org_id").change(function(){
-    if($(this).prop('tagName') === 'select'){
-      $(this).siblings(".form-submit").attr('aria-disabled', $(this).children(':selected').attr('id') === "");
-    }else{
-      $(this).siblings(".form-submit").attr('aria-disabled', $("#org_id").val() === "");
-    }
-  });
+import ariatiseForm from '../../utils/ariatiseForm';
+import initAutoComplete from '../../utils/autoComplete';
+import {
+  SHIBBOLETH_DISCOVERY_SERVICE_HIDE_LIST,
+  SHIBBOLETH_DISCOVERY_SERVICE_SHOW_LIST,
+} from '../../constants';
 
-  $("#show_list").click(function(e){
+$(() => {
+  initAutoComplete();
+  ariatiseForm({ selector: '#shibboleth_ds' });
+
+  $('#show_list').click((e) => {
     e.preventDefault();
-    if($("#full_list").css("display") == "none"){
-      $("#full_list").attr('aria-hidden', 'false').show();
-      $(this).html(__('Hide list'));
-    }else{
-      $("#full_list").attr('aria-hidden', 'true').hide();
-      $(this).html(__('See the full list of partner institutions'));
+    if ($('#full_list').is('.hide')) {
+      $('#full_list').show();
+      $(e.currentTarget).html(SHIBBOLETH_DISCOVERY_SERVICE_HIDE_LIST);
+    } else {
+      $('#full_list').hide();
+      $(e.currentTarget).html(SHIBBOLETH_DISCOVERY_SERVICE_SHOW_LIST);
     }
   });
-});
\ No newline at end of file
+});
diff --git a/lib/assets/javascripts/views/plans/edit_details.js b/lib/assets/javascripts/views/plans/edit_details.js
index 85514c0..84f3535 100644
--- a/lib/assets/javascripts/views/plans/edit_details.js
+++ b/lib/assets/javascripts/views/plans/edit_details.js
@@ -1,11 +1,7 @@
-import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
-import 'bootstrap-sass/assets/javascripts/bootstrap/popover';
 import { Tinymce } from '../../utils/tinymce';
 import ariatiseForm from '../../utils/ariatiseForm';
 
 $(() => {
-  $('[data-toggle="tooltip"]').tooltip();
-  $('[data-toggle="popover"]').popover();
   Tinymce.init();
   $('#is_test').click(() => {
     $('#plan_visibility').val($(this).is(':checked') ? 'is_test' : 'privately_visible');