diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index 26cf54b..ef63ce6 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -1,43 +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", class: "form-horizontal"}) do |f| %>
+<%= 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">
-    <%= f.label(:current_password, _('Current password'), class: 'col-sm-2 control-label') %>
-    <div class="col-sm-6">
-      <%= f.password_field(:current_password,  class: 'form-control', "aria-required": true ) %>
+  <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 ) %>
+  </div>
+
+  <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') %>
+  </div>
+
+  <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,  ) %>
+  </div>
+
+  <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">
-    <%= f.label(:password, _('New password'),  class: 'col-sm-2 control-label') %>
-    <div class="col-sm-6"> 
-      <%= f.password_field(:password,  class: 'form-control', "aria-required": true , id: 'user_new_password') %>
-    </div>
-  </div>
-
-  <div class="form-group">
-    <%= f.label(:password_confirmation, _('Password confirmation'),  class: 'col-sm-2 control-label') %>
-    <div class="col-sm-6">
-      <%= f.password_field(:password_confirmation, class: 'form-control', "aria-required": true,  ) %>
-    </div>
-  </div>
-
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <div class="checkbox">
-        <label>
-           <input type="checkbox" id="passwords_toggle" /><%= _('Show passwords') %>
-        </label>
-      </div>
-    </div>
-  </div>
-
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-    <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
-    </div>
+  <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 69db266..1995270 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -1,97 +1,79 @@
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name, tab: 'personal-details-tab'), html: {method: :put, id: "personal_details_registration_form", class: "form-horizontal"}) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name, tab: 'personal-details-tab'), html: {method: :put, id: 'personal_details_registration_form' }) do |f| %>
   <p class="form-control-static">
     <%= _("Please note that your email address is used as your username.
     If you change this, remember to use your new email address on sign in.") %>
   </p>
 
-  <p class="form-control-static"><%= _('You can edit any of the details below.') %></p>
-  <%= hidden_field_tag :unlink_flag, "false", id: "unlink_flag" %>
+  <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">
-    <%= 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, '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'>
+    <%= 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) %>
   </div>
 
-  <div class="form-group">
-    <%= f.label(:firstname, _('First name'), class: "col-sm-2 control-label") %>
-    <div class="col-sm-6">
-      <%= f.text_field(:firstname, class: 'form-control', "aria-required": true, value: @user.firstname) %>
-    </div>
+  <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) %>
   </div>
 
-  <div class="form-group">
-    <%= f.label(:surname, _('Last name'), class: "col-sm-2 control-label") %>
-    <div class="col-sm-6">
-      <%= f.text_field(:surname, class: 'form-control', "aria-required": true, value: @user.surname) %>
-    </div>
+  <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) %>
   </div>
 
-  <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, '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'>
+    <%= 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) %>
   </div>
 
-  <div class="form-group">
-    <%= f.label(:password, _('Password'), class: "col-sm-2 control-label") %>
-    <div class="col-sm-6">
-      <%= f.password_field(:password, class: 'form-control', "aria-required": true) %>
-    </div>
+  <div class='form-group col-xs-8'>
+    <%= f.label(:password, _('Password'), class: 'control-label') %>
+    <%= f.password_field(:password, class: 'form-control', "aria-required": true) %>
   </div>
 
-  <div class="form-group">
-    <%= f.label(:org_name, _('Organisation'), class: "col-sm-2 control-label") %>
-    <div class="col-sm-6">
-      <%= render partial: "shared/accessible_combobox",
-               locals: {name: "#{resource_name}[org_name]",
-                        id: "#{resource_name}_org_name",
-                        default_selection: @default_org,
-                        models: @orgs,
-                        attribute: 'name',
-                        classes: 'form-control'} %>
+  <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]",
+                      id: "#{resource_name}_org_name",
+                      default_selection: @default_org,
+                      models: @orgs,
+                      attribute: 'name'} %>
 
-      <div id="other-org-link">
-        <a href="#"><%= _("My organisation isn't listed.") %></a>
-      </div>
+    <div id='other-org-link'>
+      <a href="#"><%= _("My organisation isn't listed.") %></a>
     </div>
 
-    <div class="form-group">
-      <% 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', 'data-toggle' => "tooltip", 'title': _('Please enter the name of your organisation.') %>
-      </div>
+    <% 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.') %>
     </div>
   </div>
 
   <% if MANY_LANGUAGES %>
-    <div class="form-group">
+    <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: "col-sm-2 control-label") %>
-      <div class="col-sm-6">
-        <%= select_tag("user[language_id]",
-            options_from_collection_for_select(@languages, "id", "name", lang_id),
-            class: "form-control") %>
-      </div>
+      <%= 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') %>
     </div>
   <% end %>
 
   <% @identifier_schemes.each do |scheme| %>
-    <div class="form-group">
+    <div class='form-group col-xs-8'>
       <% if scheme.name == 'shibboleth' %>
-          <label class="col-sm-2 control-label">
+          <label class='control-label'>
             <span class="aria-only" aria-hidden="false"><%= scheme.description.capitalize %></span>
             <i class="fa fa-user" title="<%= scheme.description.capitalize %>" aria-hidden="true"></i>
           </label>
       <% else %>
-          <%= label_tag(:scheme_name, scheme.name.capitalize, class: "col-sm-2 control-label") %>
+          <%= label_tag(:scheme_name, scheme.name.capitalize, class: 'control-label') %>
       <% end %>
-
-      <div class="col-sm-6 identifier-scheme">
+      <div class='identifier-scheme'>
         <%= render partial: "external_identifier_#{scheme.name}",
                    locals: { scheme: scheme,
                              id: current_user.identifier_for(scheme)} %>
@@ -100,18 +82,16 @@
   <% end %>
 
   <% 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><a href="https://github.com/DMPRoadmap/roadmap/wiki/API-Documentation"><%= _('How to use the API') %></a></div>
+    <div class='form-group col-xs-8'>
+      <%= f.label(:api_token, _('API token'), class: 'control-label') %>
+      <%= @user.api_token %>
     </div>
+      <%= label_tag(:api_information, _('API Information'), class: 'control-label') %>
+    <div><a href="https://github.com/DMPRoadmap/roadmap/wiki/API-Documentation"><%= _('How to use the API') %></a></div>
   <% end %>
 
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
-    </div>
+  <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 1ff0013..6195772 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -6,36 +6,32 @@
 
 <div class="row">
   <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", class: "form-horizontal"}) do |f| %>
+    <%= 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">
-          <%= f.label _('Name'), for: :name, class: "col-sm-2 control-label" %>
-          <div class="col-sm-8">
-            <%= 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-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-group">
-          <%= f.label _('Published'), for: :published, class: "col-sm-2 control-label" %>
-          <div class="checkbox col-sm-8">
+
+        <div class='form-group col-xs-8'> 
+          <div class='checkbox'>
             <%= 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' %>
           </div>
         </div>
 
-        <div class="form-group">
-          <%= f.label _('Optional Subset'), for: :optional_subset, class: "col-sm-2 control-label" %>
-          <div class="checkbox col-sm-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.") %> <%= _('e.g. School/ Department') %>
+        <div class='form-group col-xs-8'>
+          <div class='checkbox'>
+            <%= 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) ') %>
           </div>
         </div>
-       
-        <div class="form-group">
-          <div class="col-sm-offset-2">
-            <%= f.submit _('Save'), class: 'btn btn-primary' %>
-            <% if @guidance_group.published == false then %>
-              <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary" %>
-            <% end %>
-          </div>
+     
+        <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' %>
+          <% end %>
         </div>
 
     <% end %>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index fd79fc1..dfd5905 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -6,27 +6,23 @@
 
 <div class="row">
   <div class="col-md-12">
-    <%= form_for :guidance_group, url: {action: "admin_create"}, id: 'admin_create_guidance_group_form', class: "form-horizontal" do |f| %>
-        <div class="form-group">
-          <%= f.label _('Name'), for: :name, class: "col-sm-2 control-label" %>
-          <div class="col-sm-6">
-            <%= 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>
+    <%= form_for :guidance_group, url: {action: "admin_create"}, id: 'admin_create_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>
 
-        <div class="form-group">
-          <%= f.label _('Optional Subset'), for: :optional_subset, class: "col-sm-2 control-label" %>
-          <div class="checkbox col-sm-6">
-            <%= 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 class='form-group col-xs-8'>
+          <div class='checkbox'>
+            <%= 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) ') %>
           </div>
         </div>
       
         <!-- submit buttons -->
-        <div class="form-group">
-          <div class="col-sm-6">
-            <%= f.submit _('Save'), name: "draft", class: 'btn btn-primary' %>
-          </div>
+        <div class='form-group col-xs-8'>
+          <%= f.submit _('Save'), name: "draft", class: 'btn btn-primary' %>
         </div>
     <% end %>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb
index daef359..203ba79 100644
--- a/app/views/orgs/admin_edit.html.erb
+++ b/app/views/orgs/admin_edit.html.erb
@@ -6,29 +6,30 @@
 
 <div class="row">
   <div class="col-md-12">
-  <%= form_for(@org, url: admin_update_org_path(@org), html: { multipart: true, method: :put, id: "edit_org_details_form", class: "form-horizontal" } ) do |f| %>
+  <%= 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">
-      <%= f.label :name, 'Organization Name', class: "col-sm-2 control-label" %>
-      <div class="col-sm-8">
-        <%= f.text_field :name, id: "org_name", class: "form-control", "aria-required": true %>
-      </div>
+    <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">
-      <%= f.label :abbreviation, 'Abbreviated Name', class: "col-sm-2 control-label" %>
-      <div class="col-sm-8">
-        <%= f.text_field :abbreviation, id: "org_abbreviation", 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>
+
+    <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">
-        <%= f.label :logo, 'Organization Logo', class: "col-sm-2 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">
-          <%= f.label _('Remove logo') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo, class: "col-sm-2 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 />
@@ -40,40 +41,26 @@
         </div>
       </div>
     <% else %>
-      <div class="form-group">
-        <%= f.label :logo, 'Organization Logo', class: "col-sm-2 control-label"  %>
-        <div class="col-sm-8">
-          <%= f.file_field :logo %>
+      <div class='form-group col-xs-8'>
+        <%= f.label :logo, 'Organization Logo', class: 'control-label'  %>
+        <%= f.file_field :logo %>
         </div>
-      </div>
+
     <% end %>
 
-    <div class="form-group" id="banner-text">
-      <%= f.label _('Top banner text'), for: @org.banner_text, class: "col-sm-2 control-label" %>
-      <div class="col-sm-8">
-        <%= text_area_tag('org_banner_text', @org.banner_text, id: "org_banner_text", class: "form-control") %>
-      </div>
+    <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">
-      <%= f.label :target_url, 'Organization URL', class: "col-sm-2 control-label" %>
-      <div class="col-sm-8">
-        <%= f.text_field :target_url, class: "form-control" %>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <%= f.label :contact_email, 'Contact Email', class: "col-sm-2 control-label" %>
-      <div class="col-sm-8">
-        <%= f.text_field :contact_email, 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>
     
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <%= f.button(_('Save'), id:"save_org_submit", class: "btn btn-default", type: "submit") %>
+    <div class='form-group col-xs-8'>
+      <%= f.button(_('Save'), id:"save_org_submit", class: 'btn btn-primary', type: "submit") %>
     </div>
-  </div>
 
   <% end %>
   </div>
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 0d6cbce..154778c 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -9,8 +9,8 @@
 <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">
-        <%= f.label(:org_name, _('Look up your institution here')) %>
+      <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">
@@ -32,7 +32,7 @@
         <%= f.button(_('Go'), class: "btn btn-default", type: "submit") %>
 
         <% if @orgs.length > 10 %>
-          <p class="centered left-indent">
+          <p class="centered">
             <strong>- <%= _('or') %> -</strong>
             <br />
             <a id="show_list" href="#"><%= _('See the full list of participating institutions') %></a>
@@ -42,7 +42,7 @@
       </div>
     <% end %>
   
-    <div id="full_list" style="display: none" class="left-indent" aria-hidden="true">
+    <div id="full_list" style="display: none" aria-hidden="true">
       <div id="org-list">
         <%
         increment, cols, letter, total, row = 50, 1, '', @orgs.length, 0
@@ -74,7 +74,7 @@
   
     <hr />
   
-    <p class="left-indent">
+    <p>
       <%= _('Institution not in the list?') %>&nbsp;
       <button type="button" class="btn btn-link" data-toggle="modal" data-target="#header-signin">
         <%= _('Create an account with any email address')%>
diff --git a/app/views/phases/_admin_add.html.erb b/app/views/phases/_admin_add.html.erb
index a884b10..f110eca 100644
--- a/app/views/phases/_admin_add.html.erb
+++ b/app/views/phases/_admin_add.html.erb
@@ -1,27 +1,29 @@
 <h2><%= _('Phase details') %></h2>
 <p><%= _('When you create a new phase for your template, a version will automatically be created. Once you complete the form below you will be provided with options to create sections and questions.') %></p>
-<%= form_for :phase, { url: admin_create_phase_path, html: { class: 'form-horizontal' }} do |f| %>
+<%= form_for :phase, { url: admin_create_phase_path } do |f| %>
+
   <%= 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-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 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')) %> 
+  </div>
+
+  <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.')) %>
+  </div>
+
+  <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 class="form-group">
-      <%= f.label(:number, _('Order of display'), class: 'col-md-2 control-label') %>
-      <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-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>
-    <div class="pull-right">
-      <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
-      <%= link_to(_('Cancel'), admin_template_template_path(@template), { class: "btn btn-default", role: "button" }) %>
-    </div>
+  </div>
+
+  <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>
+
 <% end %>
\ No newline at end of file
diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb
index 6b876aa..bbfd941 100644
--- a/app/views/phases/_edit_phase.html.erb
+++ b/app/views/phases/_edit_phase.html.erb
@@ -1,24 +1,22 @@
-<%= 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-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-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-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>
-    <div class="pull-right">
-      <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
-      <%= link_to _('Cancel'), '#', class: 'btn btn-default phase_show_link', role: 'button' %>
-    </div>
+<%= form_for :phase, { url: admin_update_phase_path(phase.id), 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: _('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'>
+    <%= 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.')) %>
+  </div>
+
+  <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'>
+    <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %>
+    <%= link_to _('Cancel'), '#', class: 'btn btn-default phase_show_link', role: 'button' %>
+  </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_notification_preferences.html.erb b/app/views/users/_notification_preferences.html.erb
index 37adbde..c9bba13 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 col-sm-10">
+    <div class='preferences'>
   
     <p>
       <%= link_to _('Select all'), '#', id: 'select_all' %> |
@@ -9,59 +9,59 @@
   
     <%= 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')  %>
       </label>
     </div>
   
-    <div class="form-group">
+    <div class='form-group'>
       <%= submit_tag _('Save'), class: 'btn btn-default' %>
     </div>
   
diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb
index e2e74b6..a82ebd4 100644
--- a/app/views/users/admin_grant_permissions.html.erb
+++ b/app/views/users/admin_grant_permissions.html.erb
@@ -7,31 +7,31 @@
 <div class="row">
   <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-striped">
+    <div class='table-responsive'>
+      <table class='table tablesorter table-hover table-bordered'>
         <thead>
           <tr>
             <th><%= _('Name') %></th>
           
             <% @perms.each do |perm| %>
               <% case perm.name when 'grant_permissions' %>
-                <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') %>">
+                <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 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 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 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 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,13 +42,13 @@
           <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">
+    <div class='form-group'>
       <%= submit_tag _('Save'), class: 'btn btn-primary' %>
     </div>
     <% end %>
diff --git a/app/views/users/admin_index.html.erb b/app/views/users/admin_index.html.erb
index 4c49368..177f8d8 100644
--- a/app/views/users/admin_index.html.erb
+++ b/app/views/users/admin_index.html.erb
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-md-12">
     <div class="table-responsive">
-      <table class="table tablesorter table-hover table-striped">
+      <table class="table tablesorter table-hover table-bordered">
         <thead>
           <% if @users.count > TABLE_FILTER_MIN_ROWS %>
             <tr>