diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index 26cf54b..7d9a06d 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>
 
   <%= 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..2cd1eaa 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" %>
+  <%= 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 8ddee08..64991f2 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -6,8 +6,29 @@
 
 <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"}) do |f| %>
-      <%= render partial: 'guidance_group_form', locals: { f: 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 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" %>
+        </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) ') %>
+        </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 %>
   </div>
 </div>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index 82f1cd5..2686266 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -5,9 +5,22 @@
 </div>
 
 <div class="row">
-  <div class="col-md-8">
+  <div class="col-md-12">
     <%= form_for :guidance_group, url: {action: "admin_create"}, id: 'admin_create_guidance_group_form' do |f| %>
-      <%= render partial: 'guidance_group_form', locals: { f: 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-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) ') %>
+        </div>
+      
+        <!-- submit buttons -->
+        <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/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 5208ccf..b1157c4 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,5 +1,5 @@
 <!-- footer container -->
-<div id="footer-navbar" class="navbar-inverse" role="navigation">
+<div id="footer-navbar" class="navbar-inverse navbar-fixed-bottom" role="navigation">
   <div class="container-fluid">
     <ul class="nav navbar-nav">
       <li><%= link_to "&copy; 2004 - #{Time.now.year} #{Rails.configuration.branding[:organisation][:name]}".sanitize, "#{Rails.configuration.branding[:organisation][:url]}"%></li>
diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb
index daef359..05fdce0 100644
--- a/app/views/orgs/admin_edit.html.erb
+++ b/app/views/orgs/admin_edit.html.erb
@@ -6,28 +6,29 @@
 
 <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="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>
@@ -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 1358473..a5f8e72 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -7,11 +7,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">
-        <%= 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">
+          <select id="org_name">
             <option value=""><%= _('Please select one') %></option>
             <%= raw @orgs.collect{|o| "<option value=\"#{o.id}\">#{o.name}</option>" }.join('') %>
           </select>
@@ -30,7 +30,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>
@@ -40,8 +40,8 @@
       </div>
     <% end %>
   
-    <div id="full_list" class="hidden" aria-hidden="true">
-      <div class="row">
+    <div id="full_list" style="display: none" aria-hidden="true">
+      <div id="org-list">
         <%
         increment, cols, letter, total, row = 50, 1, '', @orgs.length, 0
 
@@ -73,10 +73,10 @@
     <hr />
   
     <p>
-      <%= _('Institution not in the list?') %>
-      <a href="#header-signin" data-toggle="modal" data-target="#header-signin">
-        <%= _('Create an account with any email address') %>
-      </a>
+      <%= _('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')%>
+      </button>
     </p>
   </div>
 </div>
diff --git a/app/views/phases/_admin_add.html.erb b/app/views/phases/_admin_add.html.erb
index a884b10..d4150b5 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..fe0edf8 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/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index fabe519..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,11 +50,11 @@
           <%= 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>
-      <hr />
+      
       <h3><%= _('Principal Investigator') %></h3>
       <div class="form-group"><!-- principal_investigator -->
         <div class="col-md-12">
@@ -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,11 +97,11 @@
         <div class="col-md-8">
           <%= f.phone_field(
             :principal_investigator_phone,
-            class: 'form-control',
+            class: "form-control",
             "aria-required": false) %>
         </div>
       </div>
-      <hr />
+
       <h3><%= _('Data Contact Person') %></h3>
       <div class="checkbox">
         <% checked = ((@plan.data_contact.present? || @plan.data_contact_phone.present? || @plan.data_contact_email.present?) ? 1 : 0) %>
@@ -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/_share_form.html.erb b/app/views/plans/_share_form.html.erb
index 640f622..86f6638 100644
--- a/app/views/plans/_share_form.html.erb
+++ b/app/views/plans/_share_form.html.erb
@@ -1,16 +1,18 @@
 <h2><%= _('Set plan visibility') %></h2>
-<p><%= _('Public and organisational visibility are intended for finished plans. You must answer at least %{percentage}%% of the questions to enable these options. Test plans are private by default and not included in usage information.') % {percentage: Rails.application.config.default_plan_percentage_answered.round} %></p>
+<p class="form-control-static"><%= _('Public or organisational visibility is intended for finished plans. You must answer at least one question to enable these options.') %></p>
 
 <%= form_for @plan, html: {method: :put, id: "set_visibility"} do |f| %>
   <fieldset<%= (@allow_visibility ? '' : ' disabled') %>>
-    <div class="radio">
-      <%= f.label :visibility, raw("#{f.radio_button :visibility, :privately_visible} #{_('Private: restricted to me and my collaborators')}") %>
-    </div>
-    <div class="radio">
-      <%= f.label :visibility, raw("#{f.radio_button :visibility, :organisationally_visible} #{_('Organisation: anyone at my organisation can view')}") %>
-    </div>
-    <div class="radio">
-      <%= f.label :visibility, raw("#{f.radio_button :visibility, :publicly_visible} #{_('Public: anyone can view')}") %>
+    <div class="form-group col-xs-8">
+      <div class="radio">
+        <%= f.label :visibility, raw("#{f.radio_button :visibility, :privately_visible} #{_('Private: restricted to me and my collaborators')}") %>
+      </div>
+      <div class="radio">
+        <%= f.label :visibility, raw("#{f.radio_button :visibility, :organisationally_visible} #{_('Organisation: anyone at my organisation can view')}") %>
+      </div>
+      <div class="radio">
+        <%= f.label :visibility, raw("#{f.radio_button :visibility, :publicly_visible} #{_('Public: anyone can view')}") %>
+      </div>
     </div>
   </fieldset>
 <% end %>
@@ -19,12 +21,12 @@
 <p><%= _('Invite specific people to read, edit, or administer your plan. Invitees will receive an email notification that they have access to this plan.') %></p>
 
 <% if @plan.roles.any? then %>
-  <table class="table table-hover tablesorter" id="collaborator-table">
+  <table class="table table-hover table-bordered" id="collaborator-table">
     <thead>
       <tr>
         <th><%= _('Email address')%></th>
         <th><%= _('Permissions')%></th>
-        <th class="sorter-false"><span aria-hidden="false" class="sr-only"><%= _('Actions') %></span></th>
+        <th><span aria-hidden="false" class="sr-only"><%= _('Actions') %></span></th>
       </tr>
     </thead>
     <tbody>
@@ -38,8 +40,9 @@
             <% elsif !role.creator? && role.user == current_user %>
               <span><%= display_role(role) %></span>
             <% elsif !role.creator? && role.user != current_user %>
-              <%= form_for role, url: {controller: :roles, action: :update, id: role.id }, html: {method: :put, class: 'change_plan_role'} do |f| %>
-                <div class="form-group">
+
+              <%= form_for role, url: {controller: :roles, action: :update, id: role.id }, html: {method: :put} do |f| %>
+                <div class="form-group col-xs-8">
                   <%= f.hidden_field :id %>
                   <%= f.select :access_level, {"#{_('Co-owner')}": 3, "#{_('Editor')}": 2, "#{_('Read only')}": 1}, {}, {id: "#{role.id}-can-edit", class: "toggle-existing-user-access has-tooltip", 'data-toggle': "tooltip", 'title': _('Editors can contribute to plans. Co-owners have additional rights to edit plan details and control access.') } %>
                 </div>
@@ -61,7 +64,7 @@
 <% new_role = Role.new %>
 <% new_role.plan = @plan %>
 <%= form_for new_role, url: {controller: :roles, action: :create }, html: {method: :post} do |f| %>
-  <div class="form-group">
+  <div class="form-group col-xs-8">
     <%= f.hidden_field :plan_id %>
     <%= f.fields_for :user do |user| %>
       <%= user.label :email, _('Email'), class: 'control-label' %>
@@ -69,16 +72,19 @@
     <% end %>
   </div>
 
-  <p><strong><%= _('Permissions') %></strong></p>
-  <div class="radio">
-    <%= f.label :access_level, raw("#{f.radio_button :access_level, 1} #{_('Read only: can view but not make changes')}") %>
-  </div>
-  <div class="radio">
-    <%= f.label :access_level, raw("#{f.radio_button :access_level, 2} #{_('Editor: can comment and make changes')}") %>
-  </div>
-  <div class="radio">
-    <%= f.label :access_level, raw("#{f.radio_button :access_level, 3, "aria-required": true} #{_('Co-owner: can edit project details, change visibility, and add collaborators')}") %>
+  <div class="form-group col-xs-8">
+    <p><strong><%= _('Permissions') %></strong></p>
+    <div class="radio">
+      <%= f.label :access_level, raw("#{f.radio_button :access_level, 1} #{_('Read only: can view but not make changes')}") %>
+    </div>
+    <div class="radio">
+      <%= f.label :access_level, raw("#{f.radio_button :access_level, 2} #{_('Editor: can comment and make changes')}") %>
+    </div>
+    <div class="radio">
+      <%= f.label :access_level, raw("#{f.radio_button :access_level, 3, "aria-required": true} #{_('Co-owner: can edit project details, change visibility, and add collaborators')}") %>
+    </div>
+
+    <%= f.button(_('Submit'), class: "btn btn-primary", type: "submit") %>
   </div>
 
-  <%= f.button(_('Submit'), class: "btn btn-primary", type: "submit") %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index 00f1c42..ed5a0bc 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 73805a8..a7f6392 100644
--- a/app/views/sections/_add_section.html.erb
+++ b/app/views/sections/_add_section.html.erb
@@ -6,28 +6,28 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <div class="col-md-6">
-          <%= f.text_field(:title, { class: 'form-control', 'aria-required': false, placeholder: _('Enter a title for the section') } ) %>
+        <div class="col-xs-8">
+          <%= 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">
-        <%= f.label(:number, _('Order of display'), class: 'col-md-2 control-label') %>
-        <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 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 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">
-        <%= f.label(:description, _('Description'), class: 'col-md-2 control-label') %>
-        <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>
-      <div class="pull-right">
-        <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
-        <%= link_to(_('Cancel'), '#', { class: "btn btn-default section_new_cancel", role: "button" }) %>
+
+      <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>
     </div>
   </div>
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index e9cedfe..05b6bd1 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -5,33 +5,33 @@
 </div>
 <div class="row">
   <div class="col-md-12">
-    <%= 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-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')} ) %>
+    <%= 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>
+
+      <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 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">
-        <%= f.label(:number, _('Order of display'), class: 'col-md-2 control-label') %>
-        <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-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>
-      <div class="pull-right">
-        <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
+
+      <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' %>
+              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' %>
       </div>
     <% end %>
   </div>
 </div>
+
 <div class="row">
   <div class="col-md-12">
     <h3><%= _('Questions') %></h3>
@@ -53,7 +53,7 @@
 <div class="row">
   <div class="col-md-12">
     <div class="pull-right">
-      <%= link_to(_('Add Question'), '#', { class: "btn btn-default question_new_link", role: "button" }) %>
+      <%= link_to(_('Add Question'), '#', { class: 'btn btn-default question_new_link', role: "button" }) %>
     </div>
   </div>
   <div class="col-md-12">
diff --git a/app/views/shared/_create_account_form.html.erb b/app/views/shared/_create_account_form.html.erb
index e493c79..8d619f7 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/static_pages/about_us.html.erb b/app/views/static_pages/about_us.html.erb
index 0fa1053..7a119dd 100644
--- a/app/views/static_pages/about_us.html.erb
+++ b/app/views/static_pages/about_us.html.erb
@@ -12,12 +12,13 @@
         <h3><%= _('DMP Background') %></h3>
          
         <p><%= _("The Digital Curation Centre and UC3 team at the California Digital Library have developed and delivered tools for data management planning since the advent of open data policies in 2011. ")%>
-          <%= link_to "DMPOnline", "https://dmponline.dcc.ac.uk/" %><%=_(" (DCC-UK) and ") %><%= link_to "DMPTool", "https://dmptool.org/" %>
+          <%= link_to "DMPonline", "https://DMPonline.dcc.ac.uk/" %><%=_(" (DCC-UK) and ") %><%= link_to "DMPTool", "https://dmptool.org/" %>
           <%= _("(CDL-US) are now established in our national contexts as the resource for researchers seeking guidance in creating DMPs. We have worked together from the outset to share experiences, but with the explosion of interest in both of our tools across the globe we formalized our partnership to co-develop and maintain a single open-source platform for DMPs. By working together we can extend our reach, keep costs down, and move best practices forward, allowing us to participate in a truly global open science ecosystem.") %></p>
 
         <p><%= _("The new platform will be separate from the services each of our teams runs on top of it. Our shared goal: provide a combined DMPRoadmap platform as a core infrastructure for DMPs. Future enhancements will focus on making DMPs machine actionable so please continue sharing your use cases.") %></p>
 
-        <p><%= _("We invite you to peruse the DMPRoadmap GitHub wiki to learn how to ")%><%= link_to( "get involved", "https://github.com/DMPRoadmap/roadmap/wiki/get-involved", id: "get involved" ) %><%= _(" in the project. You can also report bugs and request new features via ") %><a href='<%= Rails.configuration.branding[:application][:url] %>' target='_top'><%= _('GitHub Issues') %></a></p>
+        <p><%= _("We invite you to peruse the DMPRoadmap GitHub wiki to learn how to ")%><%= link_to( "get involved", "https://github.com/DMPRoadmap/roadmap/wiki/get-involved", target: '_blank', id: "get involved" ) %><%= _(" in the project. You can also report bugs and request new features via ") %><a href="https://github.com/DMPRoadmap/roadmap/issues" target='_blank'>
+          <%= _('GitHub Issues') %></a></p>
 
         <h3><%= _('Getting Started') %></h3> 
 
diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb
index e696f0e..3dbc495 100644
--- a/app/views/static_pages/help.html.erb
+++ b/app/views/static_pages/help.html.erb
@@ -7,7 +7,7 @@
 <div class="row">
   <div class="col-md-12">
     <div>
-        <%= raw _("<p>When you login to %{application_name} you will be directed to the 'My Dashboard' page. From here you can edit, share, download, copy or remove any of your plans. You will also see plans that have been shared with you by others.</p> 
+        <%= raw _("<p>When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page. From here you can edit, share, download, copy or remove any of your plans. You will also see plans that have been shared with you by others.</p> 
 
           <h3>Create a plan</h3> 
 
diff --git a/app/views/static_pages/termsuse.html.erb b/app/views/static_pages/termsuse.html.erb
index f321d9f..09acf04 100644
--- a/app/views/static_pages/termsuse.html.erb
+++ b/app/views/static_pages/termsuse.html.erb
@@ -16,7 +16,7 @@
 
       <%= raw _("<h3>Your personal details and consent notice</h3> 
 
-      <p>In order to help identify and administer your account with DMPRoadmap, we need to store your name and email address. We may also use it to contact you to obtain feedback on your use of the tool, or to inform you of the latest developments or releases. The information may be transferred between the DCC and CDL partner institutions but only for the following legitimate DCC and CDL purposes: marketing, improving our services and informing you of relevant content and events. We will not sell, rent, or trade any personal information you provide to us. 
+      <p>In order to help identify and administer your account with DMPRoadmap, we need to store your name and email address. We may also use it to contact you to obtain feedback on your use of the tool, or to inform you of the latest developments or releases. The information may be transferred between the DCC and CDL but only for the following legitimate DCC and CDL purposes: marketing, improving our services and informing you of relevant content and events. We will not sell, rent, or trade any personal information you provide to us. 
 
 
         By using this system, you consent to the collection, retention, and use of your personal information in accordance with the above. You have the right to ask us not to process your personal details for marketing purposes.</p> 
diff --git a/app/views/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
index 8200626..0300ddd 100644
--- a/app/views/templates/_edit_template.html.erb
+++ b/app/views/templates/_edit_template.html.erb
@@ -1,20 +1,19 @@
 <!-- edit template details A template is passed as an argument-->
-<%= 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-10">
-      <%= f.text_field(:title, class: "form-control", "aria-required": false, 'data-toggle': 'tooltip', title: _('Please enter a title for your template.')) %>
-    </div>
+<%= 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>
-  <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 description that helps you to differentiate between templates e.g. if you have ones for different audiences') %>">
+
+  <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">
-    <%= label_tag(:status, _('Status'), class: 'col-md-2 control-label') %>
-    <div class="col-md-10">
+
+  <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') %>
@@ -24,26 +23,24 @@
           <%= _('Published') %>
         <% end %>
       </p>
-    </div>
   </div>
-  <div class="form-group">
-    <%= label_tag(:created_at, _('Created at'), class: 'col-md-2 control-label') %>
-    <div class="col-md-10">
-      <p class="form-control-static">
-        <%= l template.created_at.to_date, formats: :short %>
-      </p>
-    </div>
+
+  <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">
-    <%= label_tag(:updated, _('Last updated'), class: 'col-md-2 control-label') %>
-    <div class="col-md-10">
-      <p class="form-control-static">
-        <%= l template.updated_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">
+      <%= l template.updated_at.to_date, formats: :short %>
+    </p>
   </div>
-  <div class="pull-right">
-    <%= f.button(_('Save'), class: "btn btn-default", type: "submit") %>
-    <%= link_to(_('Cancel'), '#', { class: "btn btn-default template_show_link", role: "button" }) %>
+
+  <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>
 <% end %>
\ No newline at end of file
diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb
index 2eec2dd..bb50c42 100644
--- a/app/views/templates/admin_index.html.erb
+++ b/app/views/templates/admin_index.html.erb
@@ -18,7 +18,7 @@
     <!-- List of own templates -->
     <% if @org_templates.length > 0 then %>
       <div class="table-responsive">
-        <table class="table table-hover table-striped">
+        <table class="table table-hover table-bordered">
           <thead>
             <tr>
               <th><%= _('Title') %></th>
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 37adbde..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 col-sm-10">
+    <div class="preferences">
   
     <p>
       <%= link_to _('Select all'), '#', id: 'select_all' %> |
@@ -61,7 +61,7 @@
       </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..ca462c3 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 %>
@@ -49,7 +49,7 @@
       </table>
     </div>
     <div class="form-group">
-      <%= submit_tag _('Save'), class: 'btn btn-primary' %>
+      <%= submit_tag _('Save'), class: "btn btn-primary" %>
     </div>
     <% end %>
   </div>
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>
diff --git a/lib/assets/stylesheets/application.scss b/lib/assets/stylesheets/application.scss
index 9e6ce38..66b416b 100644
--- a/lib/assets/stylesheets/application.scss
+++ b/lib/assets/stylesheets/application.scss
@@ -10,17 +10,7 @@
 *= require jquery-ui-dist/jquery-ui.theme.min
 */
 
-@import "dmproadmap.scss";
-
-/* These will eventually go away once Boostrap is in place */
-/*
-@import "dmproadmap/base";
-@import "dmproadmap/tabs"; 
-@import "dmproadmap/accordions";
-@import "dmproadmap/modals";
-@import "dmproadmap/tables";
-@import "dmproadmap/forms";
-*/
+@import "/overrides.scss";
 
 [class^="bg-"] {
     padding: 15px;
diff --git a/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss
index b036de9..897e3b4 100644
--- a/lib/assets/stylesheets/overrides.scss
+++ b/lib/assets/stylesheets/overrides.scss
@@ -1,12 +1,221 @@
 /* This file contains overrides to the core Bootstrap 3.x styling */
 /* -------------------------------------------------------------- */
 
-/* Footer Section */
-footer {
-  margin-top: $footer-margin-top;
-  background: $footer-background;
-  color: $footer-color;
+/**** font configuration ****/
+@font-face {
+  font-family: 'GillSansLight';
+  src: font-url('GillSansLight.ttf') format('truetype');
+  font-weight: normal;
+}
 
-  a { color: $footer-color; }
-	
-}
\ No newline at end of file
+$black: #000;
+$white: #FFF;
+$red:  #CC0025;
+$grey: #4F5253;
+$gold: #C09853;
+$highlight-color: $black;
+$highlight-background-color: #F36F24;
+
+/* Font Smoothing in Webkit /* 
+body {
+  -webkit-font-smoothing: antialiased;
+}
+
+
+/* TABLE STYLING */
+
+.table { border: 1px solid $grey; }
+.table thead > tr > th { border-bottom: none; }
+.table thead > tr > th, .table tbody > tr > th, .table tfoot > tr > th, .table thead > tr > td, .table tbody > tr > td, .table tfoot > tr > td { border: 1px solid $grey; }
+
+thead th {
+  background-color: $grey;
+  color: $white;
+}
+.table-hover tbody tr:hover td, .table-hover tbody tr:hover th {
+  background-color: #CCC;
+}
+
+/* TABS STYLING */
+
+.nav-tabs{
+  background-color: $grey;
+  color: $white;
+  border: none;
+  margin-right:2px;
+}
+.nav-tabs > li > a{
+  border-radius: 2px;
+  color: $white;
+}
+.nav-tabs > li > a:hover{
+  background-color: $white;
+  color: $grey;
+  border:1px solid $grey;
+  border-bottom: none;
+}
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li.active > a:hover{
+  background-color: $white !important;
+  color:$grey;
+  border:1px solid $grey;
+  border-bottom: none;
+}
+
+/* PANEL STYLING */
+
+.panel-default > .panel-heading {
+  background-color: $grey;
+  color: $white;
+}
+
+ .panel-title a {
+  display: block;
+  padding: 8px 15px;
+  margin: -10px -15px;
+  background-color: $grey;
+  color: $white;
+}
+
+/* BUTTONS STYLING */
+
+/*
+$disabled-button-color: #808080;
+$cancel-button-color: #F17D04;
+*/
+
+/* primary button */
+  .btn-primary,
+  .btn-primary:hover,
+  .btn-primary:focus,
+  .btn-primary:active,
+  .btn-primary:visited,
+  .btn-primary:active:hover, 
+  .btn-primary.active:hover { 
+    background-color: $grey;
+    color: $white;
+    border-color: $grey;
+    outline: none;
+    margin-top: 5px;
+  }
+
+/* primary button */
+  .btn-default,
+  .btn-default:hover,
+  .btn-default:focus,
+  .btn-default:active,
+  .btn-default:visited,
+  .btn-default:active:hover, 
+  .btn-default.active:hover { 
+    background-color: $grey;
+    color: $white;
+    border-color: $grey;
+    outline: none;
+    margin-top: 5px;
+  }
+
+/* MESSAGES */
+$error-color: $red;
+$error-background: #F2DEDE;
+
+$notice-color: $gold;
+$notice-background: #FCF8E3;
+
+$tooltip-color: $white;
+$tooltip-background: $grey;
+
+/****  ---------------------------------------------------------------------------- ****/ 
+/**** Main layout configuration ****/
+
+/* For sticky footer */
+main {
+  margin-bottom: 100px;
+  @media (max-width: 768px) {
+    margin-bottom: 420px;
+  }
+  @media (min-width: 768px) and (max-width: 1000px) {
+    margin-bottom: 200px;
+  }
+}
+
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+
+/* HEADER STYLING */
+/*
+$header-height: 165px;
+$header-logo-width: 165px;
+$header-background: $white;
+$header-text-color: $black;
+$header-background: linear-gradient(#ED6406, #F59503);
+*/
+
+#app-navbar {
+  border-radius: 0px;
+}
+
+/* For org navbar custom height */
+#org-navbar {
+  border-radius: 0px;
+  margin-top: -20px;
+}
+@media (min-width: 768px) {
+  #org-navbar .navbar-nav li a {
+    line-height: 102px;
+    height: 102px;
+    padding-top: 0;
+  }
+}
+@media (min-width: 768px) {
+  #admin-dropdown ul li a, #super-admin-dropdown ul li a {
+    line-height: 26px !important;
+    height: 26px !important;
+    margin-top: 3px !important;
+  }
+}
+
+/* For dark (inverse) navbars */
+.inverse-dropdown {
+  background-color: #222 !important;
+  border-color: #080808 !important;
+  & > li > a {
+    color: #999 !important;
+    &:hover {
+      color: #fff !important;
+      background-color: #000 !important;
+    }
+  }
+  .active a {
+      color: #fff !important;
+      background-color: #000 !important;
+  }
+}
+
+/* HEADER LOGOS */
+.app-logo {
+  height: 50px;
+  padding-right:15px;
+}
+.org-logo {
+  height: 100px;
+  padding-right:15px;
+}
+
+/* FOOTER STYLING */
+
+/* For sticky footer */
+#footer-navbar {
+  margin-bottom: 0px;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  border-radius:0px;
+  ul {
+    padding-right:15px;
+  }
+}
+