diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index ef63ce6..7d9a06d 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -1,33 +1,33 @@
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name,  tab: 'password-details-tab'), html: {method: :put, id: "password_details_registration_form" }) do |f| %>
 
-  <p class='form-control-static'><%= _('If you would like to change your password please complete the following fields.') %></p>
+  <p class="form-control-static"><%= _('If you would like to change your password please complete the following fields.') %></p>
 
   <%= hidden_field_tag :skip_personal_details, "true" %>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:current_password, _('Current password'), class: 'control-label') %>
-    <%= f.password_field(:current_password,  class: 'form-control', "aria-required": true ) %>
+    <%= f.password_field(:current_password,  class: "form-control", "aria-required": true ) %>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:password, _('New password'),  class: 'control-label') %> 
-    <%= f.password_field(:password,  class: 'form-control', "aria-required": true , id: 'user_new_password') %>
+    <%= f.password_field(:password,  class: "form-control", "aria-required": true , id: 'user_new_password') %>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:password_confirmation, _('Password confirmation'),  class: 'control-label') %>
-    <%= f.password_field(:password_confirmation, class: 'form-control', "aria-required": true,  ) %>
+    <%= f.password_field(:password_confirmation, class: "form-control", "aria-required": true,  ) %>
   </div>
 
-  <div class='form-group col-xs-8'>
-    <div class='checkbox'>
+  <div class="form-group col-xs-8">
+    <div class="checkbox">
       <label>
          <input type="checkbox" id="passwords_toggle" /><%= _('Show passwords') %>
       </label>
     </div>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
   </div>
 <% end %>
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index 1995270..2cd1eaa 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -4,36 +4,36 @@
     If you change this, remember to use your new email address on sign in.") %>
   </p>
 
-  <p class='form-control-static'><%= _('You can edit any of the details below.') %></p>
+  <p class="form-control-static"><%= _('You can edit any of the details below.') %></p>
   <%= hidden_field_tag :unlink_flag, "false", id: 'unlink_flag' %>
   <%= hidden_field_tag :skip_personal_details, "false" %>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:email, _('Email'), class: 'control-label') %>
-    <%= 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) %>
+    <%= 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 class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:firstname, _('First name'), class: 'control-label') %>
-    <%= f.text_field(:firstname, class: 'form-control', "aria-required": true, value: @user.firstname) %>
+    <%= f.text_field(:firstname, class: "form-control", "aria-required": true, value: @user.firstname) %>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:surname, _('Last name'), class: 'control-label') %>
-    <%= f.text_field(:surname, class: 'form-control', "aria-required": true, value: @user.surname) %>
+    <%= f.text_field(:surname, class: "form-control", "aria-required": true, value: @user.surname) %>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:recovery_email, _('Recovery email'), class: 'control-label') %>
-    <%= 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) %>
+    <%= 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 class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:password, _('Password'), class: 'control-label') %>
-    <%= f.password_field(:password, class: 'form-control', "aria-required": true) %>
+    <%= f.password_field(:password, class: "form-control", "aria-required": true) %>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:org_name, _('Organisation'), class: 'control-label') %>
     <%= render partial: "shared/accessible_combobox",
              locals: {name: "#{resource_name}[org_name]",
@@ -49,22 +49,22 @@
     <% 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: 'control-label' %>
-    <%= f.text_field :other_organisation, :autocomplete => "off", class: 'form-control', 'data-toggle' => "tooltip", '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>
 
   <% if MANY_LANGUAGES %>
-    <div class='form-group col-xs-8'>
+    <div class="form-group col-xs-8">
       <% lang_id = current_user.language.nil? ? Language.id_for(FastGettext.default_locale) : current_user.language.id %>
       <%= f.label(:language_id, _('Language'), class: 'control-label') %>
       <%= select_tag("user[language_id]",
           options_from_collection_for_select(@languages, "id", "name", lang_id),
-          class: 'form-control') %>
+          class: "form-control") %>
     </div>
   <% end %>
 
   <% @identifier_schemes.each do |scheme| %>
-    <div class='form-group col-xs-8'>
+    <div class="form-group col-xs-8">
       <% if scheme.name == 'shibboleth' %>
           <label class='control-label'>
             <span class="aria-only" aria-hidden="false"><%= scheme.description.capitalize %></span>
@@ -82,7 +82,7 @@
   <% end %>
 
   <% unless @user.api_token.blank? %>
-    <div class='form-group col-xs-8'>
+    <div class="form-group col-xs-8">
       <%= f.label(:api_token, _('API token'), class: 'control-label') %>
       <%= @user.api_token %>
     </div>
@@ -90,7 +90,7 @@
     <div><a href="https://github.com/DMPRoadmap/roadmap/wiki/API-Documentation"><%= _('How to use the API') %></a></div>
   <% end %>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
   </div>
 <% end %>
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index a1ee71c..42ad47d 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -8,25 +8,25 @@
   <div class="col-md-12">
     <%= form_for(@guidance_group, url: admin_update_guidance_group_path(@guidance_group), html: {method: :put, id: "admin_update_guidance_group_form" }) do |f| %>
       
-        <div class='form-group col-xs-8'>
-          <%= f.label _('Name'), for: :name, class: 'control-label' %>
-          <%= f.text_field :name, as: :string, class: 'form-control', '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 class="form-group col-xs-8">
+          <%= f.label _('Name'), for: :name, class: "control-label" %>
+          <%= f.text_field :name, as: :string, class: "form-control", '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 col-xs-8'> 
           <%= 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.") %>
-          <%= f.label _('Published'), for: :published, class: 'control-label' %>
+          <%= f.label _('Published'), for: :published, class: "control-label" %>
         </div>
 
         <div class='form-input col-xs-8'>
           <%= 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.") %>
-          <%= f.label _('Optional Subset'), for: :optional_subset, class: 'control-label' %><%= _(' (e.g. School/ Department) ') %>
+          <%= f.label _('Optional Subset'), for: :optional_subset, class: "control-label" %><%= _(' (e.g. School/ Department) ') %>
         </div>
      
-        <div class='form-group col-xs-8'>
-          <%= f.submit _('Save'), class: 'btn btn-primary' %>
+        <div class="form-group col-xs-8">
+          <%= f.submit _('Save'), class: "btn btn-primary" %>
           <% if @guidance_group.published == false then %>
-            <%= f.submit _('Publish'), name: "save_publish", class: 'btn btn-primary' %>
+            <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary" %>
           <% end %>
         </div>
 
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index 2614039..2686266 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -7,9 +7,9 @@
 <div class="row">
   <div class="col-md-12">
     <%= form_for :guidance_group, url: {action: "admin_create"}, id: 'admin_create_guidance_group_form' do |f| %>
-        <div class='form-group col-xs-8'>
+        <div class="form-group col-xs-8">
           <%= f.label _('Name'), for: :name, class: 'control-label' %>
-          <%= f.text_field :name, as: :string, class: 'form-control', '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.') %>
+          <%= f.text_field :name, as: :string, class: "form-control", '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 col-xs-8'>
@@ -18,8 +18,8 @@
         </div>
       
         <!-- submit buttons -->
-        <div class='form-group col-xs-8'>
-          <%= f.submit _('Save'), name: "draft", class: 'btn btn-primary' %>
+        <div class="form-group col-xs-8">
+          <%= f.submit _('Save'), name: "draft", class: "btn btn-primary" %>
         </div>
     <% end %>
   </div>
diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb
index 203ba79..05fdce0 100644
--- a/app/views/orgs/admin_edit.html.erb
+++ b/app/views/orgs/admin_edit.html.erb
@@ -8,28 +8,28 @@
   <div class="col-md-12">
   <%= form_for(@org, url: admin_update_org_path(@org), html: { multipart: true, method: :put, id: "edit_org_details_form" } ) do |f| %>
     
-    <div class='form-group col-xs-8'>
-      <%= f.label :name, 'Organization Name', class: 'control-label' %>
-      <%= f.text_field :name, id: "org_name", class: 'form-control', "aria-required": true %>
+    <div class="form-group col-xs-8">
+      <%= f.label :name, 'Organization Name', class: "control-label" %>
+      <%= f.text_field :name, id: "org_name", class: "form-control", "aria-required": true %>
     </div>
 
-    <div class='form-group col-xs-8'>
-      <%= f.label :abbreviation, 'Abbreviated Name', class: 'control-label' %>
-      <%= f.text_field :abbreviation, id: "org_abbreviation", class: 'form-control', "aria-required": true %>
+    <div class="form-group col-xs-8">
+      <%= f.label :abbreviation, 'Abbreviated Name', class: "control-label" %>
+      <%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control", "aria-required": true %>
     </div>
 
-    <div class='form-group col-xs-8' id="banner-text">
-      <%= f.label _('Top banner text'), for: @org.banner_text, class: 'control-label' %>
-      <%= text_area_tag('org_banner_text', @org.banner_text, id: "org_banner_text", class: 'form-control', rows: "3") %>
+    <div class="form-group col-xs-8" id="banner-text">
+      <%= f.label _('Top banner text'), for: @org.banner_text, class: "control-label" %>
+      <%= text_area_tag('org_banner_text', @org.banner_text, id: "org_banner_text", class: "form-control", rows: "3") %>
     </div>
 
     <% if @org.logo.present? %>
-      <div class='form-group col-xs-8'>
-        <%= f.label :logo, 'Organization Logo', class: 'control-label' %>
+      <div class="form-group col-xs-8">
+        <%= f.label :logo, 'Organization Logo', class: "control-label" %>
         <%= image_tag @org.logo.url, alt: "#{@org.name} #{_('logo')}" %>
-        <div class='form-group col-xs-8'>
-          <%= f.label _('Remove logo') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo, class: 'control-label' %>
-          <div class='checkbox'>
+        <div class="form-group col-xs-8">
+          <%= f.label _('Remove logo') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo, class: "control-label" %>
+          <div class="checkbox">
             <%= f.check_box :remove_logo, title: _("This will remove your organisation's logo") %>
           </div>
           <br />
@@ -41,25 +41,25 @@
         </div>
       </div>
     <% else %>
-      <div class='form-group col-xs-8'>
-        <%= f.label :logo, 'Organization Logo', class: 'control-label'  %>
+      <div class="form-group col-xs-8">
+        <%= f.label :logo, 'Organization Logo', class: "control-label"  %>
         <%= f.file_field :logo %>
         </div>
 
     <% end %>
 
-    <div class='form-group col-xs-8'>
-      <%= f.label :target_url, 'Organization URL', class: 'control-label' %>
-      <%= f.text_field :target_url, class: 'form-control' %>
+    <div class="form-group col-xs-8">
+      <%= f.label :target_url, 'Organization URL', class: "control-label" %>
+      <%= f.text_field :target_url, class: "form-control" %>
     </div>
 
-    <div class='form-group col-xs-8'>
-      <%= f.label :contact_email, 'Contact Email', class: 'control-label' %>
-      <%= f.text_field :contact_email, class: 'form-control' %>
+    <div class="form-group col-xs-8">
+      <%= f.label :contact_email, 'Contact Email', class: "control-label" %>
+      <%= f.text_field :contact_email, class: "form-control" %>
     </div>
     
-    <div class='form-group col-xs-8'>
-      <%= f.button(_('Save'), id:"save_org_submit", class: 'btn btn-primary', type: "submit") %>
+    <div class="form-group col-xs-8">
+      <%= f.button(_('Save'), id:"save_org_submit", class: "btn btn-primary", type: "submit") %>
     </div>
 
   <% end %>
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 154778c..2e982eb 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -9,11 +9,11 @@
 <div class="row">
   <div class="col-md-12">
     <%= form_for 'shibboleth_ds', url: shibboleth_ds_path, html: {id: 'shibboleth_ds'} do |f| %>
-      <div class='form-group col-xs-8'>
-        <%= f.label(:org_name, _('Look up your institution here'), class: 'control-label') %>
+      <div class="form-group col-xs-8">
+        <%= f.label(:org_name, _('Look up your institution here'), class: "control-label") %>
   
         <% if @orgs.length <= 10 %>
-          <select id="org_name" class="left-indent">
+          <select id="org_name">
             <option value=""><%= _('Please select one') %></option>
             <%= raw @orgs.collect{|o| "<option value=\"#{o.id}\">#{o.name}</option>" }.join('') %>
           </select>
diff --git a/app/views/phases/_admin_add.html.erb b/app/views/phases/_admin_add.html.erb
index f110eca..d4150b5 100644
--- a/app/views/phases/_admin_add.html.erb
+++ b/app/views/phases/_admin_add.html.erb
@@ -4,24 +4,24 @@
 
   <%= f.hidden_field :template_id, value: @template.id%>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:title, _('Title') ,class: 'control-label') %>
-    <%= f.text_field(:title, class: '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')) %> 
+    <%= f.text_field(:title, class: "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 class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:number, _('Order of display'), class: 'control-label') %>
-    <%= 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.')) %>
+    <%= 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 class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:description, _('Description'), class: 'control-label') %>
     <div 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 form-control', rows: "3") %>
     </div>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
     <%= link_to(_('Cancel'), admin_template_template_path(@template), { class: 'btn btn-default', role: "button" }) %>
   </div>
diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb
index bbfd941..fe0edf8 100644
--- a/app/views/phases/_edit_phase.html.erb
+++ b/app/views/phases/_edit_phase.html.erb
@@ -1,21 +1,21 @@
 <%= form_for :phase, { url: admin_update_phase_path(phase.id), html: { method: :put }} do |f| %>
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:title, _('Title') ,class: 'control-label') %>
-    <%= f.text_field(:title, class: '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')) %> 
+    <%= f.text_field(:title, class: "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 class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:number, _('Order of display'), class: 'control-label') %>
-    <%= 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.')) %>
+    <%= 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 class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.label(:description, _('Description'), class: 'control-label') %>
     <div 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 form-control') %>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
     <%= link_to _('Cancel'), '#', class: 'btn btn-default phase_show_link', role: 'button' %>
   </div>
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index 9014efc..dadbe3d 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -6,7 +6,7 @@
           <%= f.label(:title, _('Project Title'), class: 'control-label') %>
         </div>
         <div class="col-md-8">
-          <%= f.text_field(:title, class: 'form-control', "aria-required": true, 'data-toggle': 'tooltip', 
+          <%= 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>
@@ -21,7 +21,7 @@
         <div class="col-md-8">
           <%= f.text_field(
             :funder_name,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false) %>
         </div>
       </div>
@@ -30,7 +30,7 @@
           <%= 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, 'data-toggle': 'tooltip', 
+          <%= 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>
@@ -50,7 +50,7 @@
           <%= f.label(:identifier, _('ID'), class: 'control-label') %>
         </div>
         <div class="col-md-8">
-          <%= f.text_field(:identifier, class: 'form-control', "aria-required": false, 'data-toggle': "tooltip", 
+          <%= 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>
@@ -63,7 +63,7 @@
         <div class="col-md-8">
           <%= f.text_field(
             :principal_investigator,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false) %>
         </div>
       </div>
@@ -74,7 +74,7 @@
         <div class="col-md-8">
           <%= f.text_field(
             :principal_investigator_identifier,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false) %>
         </div>
       </div>
@@ -85,7 +85,7 @@
         <div class="col-md-8">
           <%= f.email_field(
             :principal_investigator_email,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false,
             "data-validation": "email") %>
         </div>
@@ -97,7 +97,7 @@
         <div class="col-md-8">
           <%= f.phone_field(
             :principal_investigator_phone,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false) %>
         </div>
       </div>
@@ -114,7 +114,7 @@
         <div class="col-md-8">
           <%= f.text_field(
             :data_contact,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false) %>
         </div>
       </div>
@@ -125,7 +125,7 @@
         <div class="col-md-8">
           <%= f.email_field(
             :data_contact_email,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false,
             "data-validation": "email") %>
         </div>
@@ -137,7 +137,7 @@
         <div class="col-md-8">
           <%= f.phone_field(
             :data_contact_phone,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false) %>
         </div>
       </div>
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index 17657b5..dcb4cab 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -104,7 +104,7 @@
     <% end %>
 
     <div>
-      <%= link_to _('Create plan'), new_plan_path, class: 'btn btn-primary' %>
+      <%= link_to _('Create plan'), new_plan_path, class: "btn btn-primary" %>
     </div>
   </div>
 </div>
diff --git a/app/views/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb
index d9ab868..a7f6392 100644
--- a/app/views/sections/_add_section.html.erb
+++ b/app/views/sections/_add_section.html.erb
@@ -7,25 +7,25 @@
     <div class="panel-heading">
       <h4 class="panel-title">
         <div class="col-xs-8">
-          <%= f.text_field(:title, { class: 'form-control', 'aria-required': false, placeholder: _('Enter a title for the section') } ) %>
+          <%= f.text_field(:title, { class: "form-control", 'aria-required': false, placeholder: _('Enter a title for the section') } ) %>
         </div>
         <div class="clearfix"/>
       </h4>
     </div>
     <div class="panel-body">
-      <div class='form-group col-xs-8'>
+      <div class="form-group col-xs-8">
         <%= f.label(:number, _('Order of display'), class: 'control-label') %>
-        <%= f.number_field(:number, in: 1..15, class: 'form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('This allows you to order sections.')) %>
+        <%= 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 class='form-group col-xs-8'>
+      <div class="form-group col-xs-8">
         <%= f.label(:description, _('Description'), class: 'control-label') %>
         <div 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 form-control', rows: "3") %>
         </div>
       </div>
 
-      <div class='form-group col-xs-8'>
+      <div class="form-group col-xs-8">
         <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
         <%= link_to(_('Cancel'), '#', { class: 'btn btn-default section_new_cancel', role: "button" }) %>
       </div>
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index 6023c7a..05b6bd1 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -6,24 +6,24 @@
 <div class="row">
   <div class="col-md-12">
     <%= form_for(section, url: admin_update_section_path(section, phase: phase), html: { method: :put }) do |f| %>
-      <div class='form-group col-xs-8'>
-          <%= f.label(:title, _('Title'), { class: 'control-label' }) %>
-          <%= 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 class="form-group col-xs-8">
+          <%= f.label(:title, _('Title'), { class: "control-label" }) %>
+          <%= 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 class='form-group col-xs-8'>
-        <%= f.label(:number, _('Order of display'), class: 'control-label') %>
-        <%= f.number_field(:number, in: 1..15, class: 'form-control', 'aria-required': false, 'data-toggle': 'tooltip', title: _('This allows you to order sections.')) %>
+      <div class="form-group col-xs-8">
+        <%= f.label(:number, _('Order of display'), class: "control-label") %>
+        <%= 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 class='form-group col-xs-8'>
-        <%= f.label(:description, _('Description'), class: 'control-label') %>
+      <div class="form-group col-xs-8">
+        <%= f.label(:description, _('Description'), class: "control-label") %>
         <div 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 form-control') %>
         </div>
       </div>
 
-      <div class='form-group col-xs-8'>
+      <div class="form-group col-xs-8">
         <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
         <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id),
               confirm: _("You are about to delete '%{section_title}'. This will affect questions linked to this section. Are you sure?") % { :section_title => section.title }, method: :delete, class: 'btn btn-default', role:'button' %>
diff --git a/app/views/shared/_create_account_form.html.erb b/app/views/shared/_create_account_form.html.erb
index c9d8cba..44adc5d 100644
--- a/app/views/shared/_create_account_form.html.erb
+++ b/app/views/shared/_create_account_form.html.erb
@@ -1,20 +1,20 @@
 <%= form_for resource, as: 'user', url: registration_path("user"), html: {autocomplete: "off", id: "create_account_form"} do |f| %>
 
   <div class="form-group">
-    <%= f.label(:firstname, _('First Name'), class: 'control-label') %>
-    <%= f.text_field(:firstname, class: 'form-control', "aria-required": true) %>
+    <%= f.label(:firstname, _('First Name'), class: "control-label") %>
+    <%= f.text_field(:firstname, class: "form-control", "aria-required": true) %>
   </div>
   <div class="form-group">
-    <%= f.label(:surname, _('Last Name'), class: 'control-label') %>
-    <%= f.text_field(:surname, class: 'form-control', "aria-required": true) %>
+    <%= f.label(:surname, _('Last Name'), class: "control-label") %>
+    <%= f.text_field(:surname, class: "form-control", "aria-required": true) %>
   </div>
   <div class="form-group">
-    <%= f.label(:email, _('Email'), class: 'control-label') %>
-    <%= f.email_field(:email, class: 'form-control', "aria-required": true) %>
+    <%= f.label(:email, _('Email'), class: "control-label") %>
+    <%= f.email_field(:email, class: "form-control", "aria-required": true) %>
   </div>
   
   <div class="form-group">
-    <%= f.label _('Organisation'), for: :user_org_name, class: 'control-label' %>
+    <%= f.label _('Organisation'), for: :user_org_name, class: "control-label" %>
     <%= render partial: "shared/accessible_combobox", 
                locals: {name: 'user[org_name]',
                         id: 'user_org_name',
@@ -24,17 +24,17 @@
                         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", 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>
   
   <div class="form-group">
-    <%= f.label(:recovery_email, _('Recovery Email'), class: 'control-label') %>
-    <%= f.email_field(:recovery_email, class: 'form-control', "aria-required": false, "data-validation": 'email') %>
+    <%= f.label(:recovery_email, _('Recovery Email'), class: "control-label") %>
+    <%= f.email_field(:recovery_email, class: "form-control", "aria-required": false, "data-validation": 'email') %>
   </div>
   <div class="form-group">
-    <%= f.label(:password, _('Password'), class: 'control-label') %>
-    <%= f.password_field(:password, class: 'form-control', "aria-required": true) %>
+    <%= f.label(:password, _('Password'), class: "control-label") %>
+    <%= f.password_field(:password, class: "form-control", "aria-required": true) %>
   </div>
   <div class="checkbox">
     <label for="passwords_toggle">
diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
index 5708f4c..0300ddd 100644
--- a/app/views/templates/_edit_template.html.erb
+++ b/app/views/templates/_edit_template.html.erb
@@ -1,20 +1,20 @@
 <!-- edit template details A template is passed as an argument-->
 <%= form_for(template, url: admin_update_template_path(template), html: { method: :put }) do |f| %>
-  <div class='form-group col-xs-8'>
-    <%= f.label(:title, _('Title'), class: 'control-label') %>
-    <%= f.text_field(:title, class: 'form-control', "aria-required": false, 'data-toggle': 'tooltip', title: _('Please enter a title for your template.')) %>
+  <div class="form-group col-xs-8">
+    <%= f.label(:title, _('Title'), class: "control-label") %>
+    <%= f.text_field(:title, class: "form-control", "aria-required": false, 'data-toggle': 'tooltip', title: _('Please enter a title for your template.')) %>
   </div>
 
-  <div class='form-group col-xs-8'>
-    <%= f.label(:description, _('Description'), class: 'control-label') %>
+  <div class="form-group col-xs-8">
+    <%= f.label(:description, _('Description'), class: "control-label") %>
     <div 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>
 
-  <div class='form-group col-xs-8'>
-    <%= label_tag(:status, _('Status'), class: 'control-label') %>
-      <p class='form-control-static'>
+  <div class="form-group col-xs-8">
+    <%= label_tag(:status, _('Status'), class: "control-label") %>
+      <p class="form-control-static">
         <% if template_hash[:live].nil? %>
           <%= _('Unpublished') %>
         <% elsif template_hash[:current].dirty? %>
@@ -25,21 +25,21 @@
       </p>
   </div>
 
-  <div class='form-group col-xs-8'>
-    <%= label_tag(:created_at, _('Created at'), class: 'control-label') %>
-    <p class='form-control-static'>
+  <div class="form-group col-xs-8">
+    <%= label_tag(:created_at, _('Created at'), class: "control-label") %>
+    <p class="form-control-static">
       <%= l template.created_at.to_date, formats: :short %>
     </p>
   </div>
 
-  <div class='form-group col-xs-8'>
-    <%= label_tag(:updated, _('Last updated'), class: 'control-label') %>
-    <p class='form-control-static'>
+  <div class="form-group col-xs-8">
+    <%= label_tag(:updated, _('Last updated'), class: "control-label") %>
+    <p class="form-control-static">
       <%= l template.updated_at.to_date, formats: :short %>
     </p>
   </div>
 
-  <div class='form-group col-xs-8'>
+  <div class="form-group col-xs-8">
     <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
     <%= link_to(_('Cancel'), '#', { class: 'btn btn-default template_show_link', role: "button" }) %>
   </div>
diff --git a/app/views/templates/admin_template_history.html.erb b/app/views/templates/admin_template_history.html.erb
index e700743..ab4239a 100644
--- a/app/views/templates/admin_template_history.html.erb
+++ b/app/views/templates/admin_template_history.html.erb
@@ -57,7 +57,7 @@
       <p><%= _('This template is new and does not yet have any publication history.') %></p>
     <% end %>
     <div>
-      <%= link_to _('View all templates'), admin_index_template_path, class: 'btn btn-default' %>
+      <%= link_to _('View all templates'), admin_index_template_path, class: "btn btn-default" %>
     </div>
   </div>
 </div>
diff --git a/app/views/users/_notification_preferences.html.erb b/app/views/users/_notification_preferences.html.erb
index c9bba13..f81d56a 100644
--- a/app/views/users/_notification_preferences.html.erb
+++ b/app/views/users/_notification_preferences.html.erb
@@ -1,6 +1,6 @@
 <% if @prefs %>
   <%= form_tag( update_email_preferences_user_path(@user), method: :put, html: { id: "preferences_registration_form", class: "form-horizontal" }) do |f| %>
-    <div class='preferences'>
+    <div class="preferences">
   
     <p>
       <%= link_to _('Select all'), '#', id: 'select_all' %> |
@@ -9,52 +9,52 @@
   
     <%= hidden_field_tag :tab, 'notification-preferences-tab' %>
   
-    <p class='form-control-static'><strong>All Users</strong></p>
-    <div class='checkbox'>
+    <p class="form-control-static"><strong>All Users</strong></p>
+    <div class="checkbox">
       <label for="prefs[users][new_comment]">
         <%= hidden_field_tag 'prefs[users][new_comment]', false %>
         <%= check_box_tag 'prefs[users][new_comment]', true, @prefs[:users][:new_comment] %><%= _('A new comment has been added to my DMP')  %>
       </label>
     </div>
-    <div class='checkbox'>
+    <div class="checkbox">
       <label for="prefs[users][added_as_coowner]">
         <%= hidden_field_tag 'prefs[users][added_as_coowner]', false %>
         <%= check_box_tag 'prefs[users][added_as_coowner]', true, @prefs[:users][:added_as_coowner] %><%= _('A plan has been shared with me')  %>
       </label>
     </div>
-    <div class='checkbox'>
+    <div class="checkbox">
       <label for="prefs[users][admin_privileges]">
         <%= hidden_field_tag 'prefs[users][admin_privileges]', false %>
         <%= check_box_tag 'prefs[users][admin_privileges]', true, @prefs[:users][:admin_privileges] %><%= _('Admin privileges granted to me')  %>
       </label>
     </div>
   
-    <p class='form-control-static'><strong>DMP owners and co-owners</strong></p>
+    <p class="form-control-static"><strong>DMP owners and co-owners</strong></p>
   
-    <div class='checkbox'>
+    <div class="checkbox">
       <label for="prefs[owners_and_coowners][visibility_changed]">
         <%= hidden_field_tag 'prefs[owners_and_coowners][visibility_changed]', false %>
         <%= check_box_tag 'prefs[owners_and_coowners][visibility_changed]', true, @prefs[:owners_and_coowners][:visibility_changed] %><%= _("My DMP's visibility has changed")  %>
       </label>          
     </div>
   
-    <p class='form-control-static'><strong>DMP administrators</strong></p>
+    <p class="form-control-static"><strong>DMP administrators</strong></p>
   
-    <div class='checkbox'>
+    <div class="checkbox">
       <label for="prefs[admins][template_published]">
         <%= hidden_field_tag 'prefs[admins][template_published]', false %>
         <%= check_box_tag 'prefs[admins][template_published]', true, @prefs[:admins][:template_published] %><%= _('An organisational template is published')  %>
       </label>
     </div>
   
-    <div class='checkbox'>
+    <div class="checkbox">
       <label for="prefs[admins][template_unpublished]">
         <%= hidden_field_tag 'prefs[admins][template_unpublished]', false %>
         <%= check_box_tag 'prefs[admins][template_unpublished]', true, @prefs[:admins][:template_unpublished] %><%= _('An organisational template is unpublished')  %>
       </label>
     </div>
   
-    <div class='checkbox'>
+    <div class="checkbox">
       <label for="prefs[admins][feedback_requested]">
         <%= hidden_field_tag 'prefs[admins][feedback_requested]', false %>
         <%= check_box_tag 'prefs[admins][feedback_requested]', true, @prefs[:admins][:feedback_requested] %><%= _('A user has requested feedback on a DMP')  %>
diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb
index a82ebd4..ca462c3 100644
--- a/app/views/users/admin_grant_permissions.html.erb
+++ b/app/views/users/admin_grant_permissions.html.erb
@@ -8,30 +8,30 @@
   <div class="col-md-12">
     <%= form_tag( admin_update_permissions_user_path(@user), method: :put) do %>
     <div class='table-responsive'>
-      <table class='table tablesorter table-hover table-bordered'>
+      <table class="table tablesorter table-hover table-bordered">
         <thead>
           <tr>
             <th><%= _('Name') %></th>
           
             <% @perms.each do |perm| %>
               <% case perm.name when 'grant_permissions' %>
-                <th class='text-center' 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') %>">
+                <th class="text-center" 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 class='text-center' data-toggle="tooltip" title="<%= _('Allows the user to create new institutional templates, edit existing ones and customise funder templates') %>">
+                <th class="text-center" 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 class='text-center' data-toggle="tooltip" title="<%= _('Allows the user to create and edit guidance') %>">
+                <th class="text-center" data-toggle="tooltip" title="<%= _('Allows the user to create and edit guidance') %>">
                   <%= _('Modify guidance') %>
                 </th>
               <% when 'use_api' %>
-                <th class='text-center' data-toggle="tooltip" title="<%= _('Provides the user with an API token and grants rights to harvest information from the tool') %>">
+                <th class="text-center" 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 class='text-center' data-toggle="tooltip" title="<%= _('Allows the user to amend the organisation details (name, URL etc) and add basic branding such as the logo') %>">
+                <th class="text-center" 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 %>
@@ -42,14 +42,14 @@
           <tr>
             <td><%= @user.name(false) %></td>
             <% @perms.each do |perm| %>
-              <td class='text-center'><%= check_box_tag "perm_ids[]", perm.id, @user.perms.include?(perm) %></td>
+              <td class="text-center"><%= check_box_tag "perm_ids[]", perm.id, @user.perms.include?(perm) %></td>
             <% end %>
           </tr>
         </tbody>
       </table>
     </div>
-    <div class='form-group'>
-      <%= submit_tag _('Save'), class: 'btn btn-primary' %>
+    <div class="form-group">
+      <%= submit_tag _('Save'), class: "btn btn-primary" %>
     </div>
     <% end %>
   </div>