diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 6195772..a1ee71c 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -13,18 +13,14 @@
           <%= 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'> 
-          <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 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-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 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'>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index dfd5905..2614039 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -12,11 +12,9 @@
           <%= 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'>
-          <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 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 -->
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/sections/_add_section.html.erb b/app/views/sections/_add_section.html.erb
index 73805a8..d9ab868 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">
+        <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..6023c7a 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">
+    <%= 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/templates/_edit_template.html.erb b/app/views/templates/_edit_template.html.erb
index 8200626..5708f4c 100644
--- a/app/views/templates/_edit_template.html.erb
+++ b/app/views/templates/_edit_template.html.erb
@@ -1,21 +1,20 @@
 <!-- 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">
-      <p class="form-control-static">
+
+  <div class='form-group col-xs-8'>
+    <%= label_tag(:status, _('Status'), class: 'control-label') %>
+      <p class='form-control-static'>
         <% if template_hash[:live].nil? %>
           <%= _('Unpublished') %>
         <% elsif template_hash[:current].dirty? %>
@@ -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/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss
index b036de9..9bd3f93 100644
--- a/lib/assets/stylesheets/overrides.scss
+++ b/lib/assets/stylesheets/overrides.scss
@@ -1,12 +1,104 @@
 /* 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;
+$red: #CC0025;
 
-  a { color: $footer-color; }
-	
-}
\ No newline at end of file
+/* LOGO STYLING */
+
+.org-logo {
+  height: 100px;
+  padding-right:15px;
+}
+
+/**** font configuration ****/
+/*
+@font-face {
+  font-family: 'GillSansLight';
+  src: font-url('GillSansLight.ttf') format('truetype');
+  font-weight: normal;
+}
+
+/* Font Smoothing in Webkit /* 
+body {
+  -webkit-font-smoothing: antialiased;
+}
+
+/* MESSAGES */
+/*
+$error-color: #4F5253;
+*/
+
+/* TABLE STYLING */
+
+.table { border: 1px solid #4F5253; }
+.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 #4F5253; }
+
+thead th {
+    background-color: #4F5253;
+    color: white;
+}
+.table-hover tbody tr:hover td, .table-hover tbody tr:hover th {
+  background-color: #CCC;
+}
+
+/* TABS STYLING */
+
+.nav-tabs{
+  background-color: #4F5253;
+  color: #fff;
+  border: none;
+  margin-right:2px;
+}
+.nav-tabs > li > a{
+  border-radius: 5px;
+  color: #fff;
+}
+.nav-tabs > li > a:hover{
+  background-color: #fff;
+  color: #4F5253;
+  border:1px solid #4F5253;
+  border-bottom: none;
+}
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li.active > a:hover{
+  background-color: #fff !important;
+  color:#4F5253;
+  border:1px solid #4F5253;
+  border-bottom: none;
+}
+
+/* PANEL STYLING */
+
+.panel-title a {
+    display: block;
+    padding: 8px 15px;
+    margin: -10px -15px;
+    background-color: #4F5253;
+    color: #fff;
+}
+
+/* BUTTONS STYLING */
+
+.btn-primary:hover, 
+.btn-primary:focus, 
+.btn-primary:active, 
+.btn-primary.active, 
+.btn-primary:active:focus {
+  background-color: #4F5253;
+  color: $white;
+  border-color: #4F5253;
+  box-shadow: none;
+}
+
+.btn-default:hover, 
+.btn-default:focus, 
+.btn-default:active, 
+.btn-default.active, 
+.btn-default:active:focus {
+  background-color: #4F5253;
+  color: $white;
+  border-color: #4F5253;
+  box-shadow: none;
+}