diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index f95b651..12ae462 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,26 +1,29 @@
+<% javascript "devise/passwords/new.js" %>
+
+<% unless @user.errors[:email].nil? %>
+  <p class="alert alert-error"><%= _('The email address you entered is not registered.') %></p>
+<% end %>
+
 <h1><%= t('helpers.forgot_password') %></h1>
-	<div class="dmp_details_body">
 
-		<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
-		  <%= devise_error_messages! %>
-			<div class="dmp_details">
-				<table class="dmp_details_table">
-					<tr>
-						<td class="first"><%= t("helpers.email") %>
-							<p><%= t("helpers.send_password_info")%></p>
-				
-						</td>
-						<td><%= f.email_field :email, :autofocus => true , :style => "width:95%;" %></td>
-					</tr>
-				</table>
-				
-				
-	  		</div>
-	  		<div class="div_right">
-					<%= f.submit t("helpers.send"), :class => "btn btn-primary", :id => "send_btn" %>
-				</div>
-		<% end %>
+<p><%= _('Please enter your email below and we will send you instructions on how to reset your password.') %></p>
 
-<%= render "devise/shared/links" %>
-	
-</div>	
+<div class="dmp_details_body">
+  <%= form_for resource, as: 'user', url: user_password_path, html: {class: "password-reset roadmap-form", method: :post} do |f| %>
+
+    <fieldset id="password-reset-form" class="standard padded">
+      <%= render partial: 'shared/accessible_input',
+                 locals: {type: 'email', id: 'user_email', name: 'user[email]', label: _("Email"),
+                          classes: 'required', val: @user.email} %>
+
+      <br />
+      <%= render partial: 'shared/accessible_submit_button',
+                 locals: {id: 'password-reset-button', 
+                          val: _('Send'), 
+                          disabled_initially: true,
+                          classes: 'small-input-button',
+                          tooltip: _('Enter a valid email.')} %>
+    </fieldset>
+  <% end %>
+</div>
+
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index d1d3284..031ccee 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,4 +1,4 @@
-<%= javascript 'registrations/sign_in_sign_up.js'  %>
+<%= javascript 'home/index.js' %>
 
 <h1><%= _('Welcome.')%></h1>
 
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index 8d36ff7..8533b06 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -22,7 +22,13 @@
               <li><%= link_to _("Admin area"), admin_index_users_path, class: "signIn_dropdown_link" %></li>
             <% end %>
           <% end %>
-          <li><%= link_to _('Sign out'), destroy_user_session_path, method: :delete, class: "signIn_dropdown_link" %></li>
+          <li>
+						<% if Rails.application.config.shibboleth_enabled %>
+							<%= link_to _('Sign out'), destroy_user_session_path, method: :delete, class: "signIn_dropdown_link" %>
+						<% else %>
+							<%= link_to _('Sign out'), destroy_user_session_path, method: :delete, class: "signIn_dropdown_link" %>
+						<% end %>
+					</li>
         </ul>
       </li>
     <% else %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 483511b..78dc349 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -65,10 +65,10 @@
     <p id="main-page-alert" class="alert alert-notice" style="display:none"></p>
 
 		<div class="main_page_container">
-			<% if notice %>
+			<% if notice || flash[:notice] %>
   				<p class="alert alert-notice"><%= raw notice %></p>
 				<% end %>
-			<% if alert %>
+			<% if alert || flash[:alert] || flash[:error] %>
  				<p class="alert alert-error"><%= raw alert %></p>
 			<% end %>
 			
diff --git a/app/views/shared/_accessible_input.html.erb b/app/views/shared/_accessible_input.html.erb
index 09a4ebc..f0fe0d8 100644
--- a/app/views/shared/_accessible_input.html.erb
+++ b/app/views/shared/_accessible_input.html.erb
@@ -28,7 +28,6 @@
 
   <% if !tooltip.blank? %>
     <div role="" id="<%= tip %>" class="submit-tooltip">
-      <div class="arrow-left"></div>
       <span class="tooltip-msg"><%= tooltip %></span>
     </div>
     <script type="text/javascript">
@@ -44,10 +43,8 @@
 
   <% # If an error handler was passed in or the input type has a generic handler %>
   <% if !error_handler.blank? || ['email', 'password'].include?(type) %>
-    <div role="" id="<%= id %>_error" class="error-tooltip">
-      <div class="arrow-left"></div>
-      <span class="error-msg"></span>
-    </div>
+    <span role="" id="<%= id %>_error" class="error-tooltip left-indent"></span>
+
     <script type="text/javascript">
       $(document).ready(function(){
         let input = $("#<%= id %>");
@@ -55,12 +52,10 @@
         let validation = function(val){
           let msg = <%= error_handler.blank? ? "validate#{type.capitalize}(val)" : "#{error_handler}(val)" %>;
           if(msg === '' || val.trim().length <= 0){
-            $("#<%= id %>_error .error-msg").html('');
-            $("#<%= id %>_error").attr('role', '');
+            $("#<%= id %>_error").html('').attr('role', '');
             $("#<%= id %>").removeClass('red-border');
           }else{
-            $("#<%= id %>_error .error-msg").html(msg);
-            $("#<%= id %>_error").attr('role', 'tooltip');
+            $("#<%= id %>_error").html(__('Error: ') + msg).attr('role', 'tooltip');
             $("#<%= id %>").addClass('red-border');
           }
         }
diff --git a/app/views/shared/_login_form.html.erb b/app/views/shared/_login_form.html.erb
index cbd7c27..59f2803 100644
--- a/app/views/shared/_login_form.html.erb
+++ b/app/views/shared/_login_form.html.erb
@@ -1,20 +1,22 @@
-<p class="centered primary-color"><%= _('Sign in with') %></p>
+<% javascript "shared/login_form.js" %>
 
-<span class="omniauth-options centered">
-  <% if Rails.application.config.shibboleth_enabled %>
+<% if Rails.application.config.shibboleth_enabled %>
+  <h2 class="centered small-header"><%= _('Sign in with') %></h2>
+
+  <span class="omniauth-options centered">
     <% if request.fullpath != "/users/sign_up?nosplash=true" && session[:shibboleth_data].nil? then%>
       <button id="shibboleth-login" href="<%= user_shibboleth_omniauth_authorize_path %>" class="omniauth-login">
-        <%= _('Your Organization') %>
+        <%= _('Your Organisation') %>
       </button>
     <%else%>
       <%= f.hidden_field :shibboleth_id, :value => session[:shibboleth_data][:uid] %>
     <%end%> 
-  <% end %>
-</span>
+  </span>
 
-<p class="centered"><strong>- <%= _('or') %> -</strong></p>
-  
-<%= form_for resource, as: 'user', url: user_session_path, html: {class: "roadmap-form"} do |f| %>
+  <h2 class="centered small-header">- <%= _('or') %> -</h2>
+<% end %>  
+
+<%= form_for resource, as: 'user', url: user_session_path, html: {class: "login-form roadmap-form"} do |f| %>
   <%= devise_error_messages! %>
   <fieldset id="sign-in-form" class="standard padded">
     <%= render partial: 'shared/accessible_input',
diff --git a/config/application.rb b/config/application.rb
index 28bd517..786106b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -70,16 +70,27 @@
 #    config.assets.precompile += %w(*.js *.scss *.css)
     
     config.assets.precompile += %w(plans.js)
-        config.assets.precompile += %w(projects.js)    
-        config.assets.precompile += %w(jquery.placeholder.js)
-        config.assets.precompile += %w(jquery.tablesorter.js)
-        config.assets.precompile += %w(export_configure.js)
-        config.assets.precompile += %w(toolbar.js)
-        config.assets.precompile += %w(admin.js)
+    config.assets.precompile += %w(projects.js)    
+    config.assets.precompile += %w(jquery.placeholder.js)
+    config.assets.precompile += %w(jquery.tablesorter.js)
+    config.assets.precompile += %w(export_configure.js)
+    config.assets.precompile += %w(toolbar.js)
+    config.assets.precompile += %w(admin.js)
     config.assets.precompile += %w(admin.css)
  
-    config.assets.precompile += %w(roadmap.scss roadmap-tabs.scss roadmap-form.scss roadmap-hacks.scss)
-    config.assets.precompile += %w(roadmap.js plans/new_plan.js registrations/sign_in_sign_up.js)
+    config.assets.precompile += %w(roadmap.css 
+                                   roadmap-tabs.css 
+                                   roadmap-form.css 
+                                   roadmap-hacks.css)
+                                   
+    config.assets.precompile += %w(roadmap.js 
+                                   answers/status.js
+                                   devise/passwords/new.js
+                                   plans/new_plan.js 
+                                   contacts/new_contact.js
+                                   home/index.js
+                                   shared/register_form.js
+                                   shared/login_form.js)
     
     config.autoload_paths += %W(#{config.root}/lib)
     config.action_controller.include_all_helpers = true
@@ -90,10 +101,11 @@
     # Enable shibboleth as an alternative authentication method
     # Requires server configuration and omniauth shibboleth provider configuration
     # See config/initializers/devise.rb
-    config.shibboleth_enabled = true
+    config.shibboleth_enabled = false
 
     # Relative path to Shibboleth SSO Logout
-    config.shibboleth_logout_url = '/Shibboleth.sso/Logout?return='
+    config.shibboleth_login = '/Shibboleth.sso/Login'
+    config.shibboleth_logout_url = '/Shibboleth.sso/Logout'
 
     # Active Record will no longer suppress errors raised in after_rollback or after_commit
     # in the next version. Devise appears to be using those callbacks.
diff --git a/db/schema.rb b/db/schema.rb
index c139826..e6ff4b8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -14,367 +14,405 @@
 ActiveRecord::Schema.define(version: 20170516184429) do
 
   create_table "annotations", force: :cascade do |t|
-    t.integer  "question_id"
-    t.integer  "org_id"
-    t.text     "text"
-    t.integer  "type",        default: 0, null: false
+    t.integer  "question_id", limit: 4
+    t.integer  "org_id",      limit: 4
+    t.text     "text",        limit: 65535
+    t.integer  "type",        limit: 4,     default: 0, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "annotations", ["org_id"], name: "fk_rails_aca7521f72", using: :btree
+  add_index "annotations", ["question_id"], name: "fk_rails_0e08e753b6", using: :btree
+
   create_table "answers", force: :cascade do |t|
-    t.text     "text"
-    t.integer  "plan_id"
-    t.integer  "user_id"
-    t.integer  "question_id"
+    t.text     "text",         limit: 65535
+    t.integer  "plan_id",      limit: 4
+    t.integer  "user_id",      limit: 4
+    t.integer  "question_id",  limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "lock_version", default: 0
+    t.integer  "lock_version", limit: 4,     default: 0
   end
 
+  add_index "answers", ["plan_id"], name: "fk_rails_84a6005a3e", using: :btree
+  add_index "answers", ["question_id"], name: "fk_rails_3d5ed4418f", using: :btree
+  add_index "answers", ["user_id"], name: "fk_rails_584be190c2", using: :btree
+
   create_table "answers_question_options", id: false, force: :cascade do |t|
-    t.integer "answer_id",          null: false
-    t.integer "question_option_id", null: false
+    t.integer "answer_id",          limit: 4, null: false
+    t.integer "question_option_id", limit: 4, null: false
   end
 
-  add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index"
-  add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index"
+  add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index", using: :btree
+  add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index", using: :btree
 
   create_table "exported_plans", force: :cascade do |t|
-    t.integer  "plan_id"
-    t.integer  "user_id"
-    t.string   "format"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer  "phase_id"
+    t.integer  "plan_id",    limit: 4
+    t.integer  "user_id",    limit: 4
+    t.string   "format",     limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+    t.integer  "phase_id",   limit: 4
   end
 
   create_table "file_types", force: :cascade do |t|
-    t.string   "name"
-    t.string   "icon_name"
-    t.integer  "icon_size"
-    t.string   "icon_location"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
+    t.string   "name",          limit: 255
+    t.string   "icon_name",     limit: 255
+    t.integer  "icon_size",     limit: 4
+    t.string   "icon_location", limit: 255
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "file_uploads", force: :cascade do |t|
-    t.string   "name"
-    t.string   "title"
-    t.text     "description"
-    t.integer  "size"
+    t.string   "name",         limit: 255
+    t.string   "title",        limit: 255
+    t.text     "description",  limit: 65535
+    t.integer  "size",         limit: 4
     t.boolean  "published"
-    t.string   "location"
-    t.integer  "file_type_id"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
+    t.string   "location",     limit: 255
+    t.integer  "file_type_id", limit: 4
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
   create_table "friendly_id_slugs", force: :cascade do |t|
-    t.string   "slug",           null: false
-    t.integer  "sluggable_id",   null: false
-    t.string   "sluggable_type"
+    t.string   "slug",           limit: 255, null: false
+    t.integer  "sluggable_id",   limit: 4,   null: false
+    t.string   "sluggable_type", limit: 40
     t.datetime "created_at"
   end
 
-  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true
-  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id"
-  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type"
+  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true, using: :btree
+  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id", using: :btree
+  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
 
   create_table "guidance_groups", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "org_id"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.string   "name",            limit: 255
+    t.integer  "org_id",          limit: 4
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
     t.boolean  "optional_subset"
     t.boolean  "published"
   end
 
+  add_index "guidance_groups", ["org_id"], name: "fk_rails_819c1dbbc7", using: :btree
+
   create_table "guidances", force: :cascade do |t|
-    t.text     "text"
-    t.integer  "guidance_group_id"
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
-    t.integer  "question_id"
+    t.text     "text",              limit: 65535
+    t.integer  "guidance_group_id", limit: 4
+    t.datetime "created_at",                      null: false
+    t.datetime "updated_at",                      null: false
+    t.integer  "question_id",       limit: 4
     t.boolean  "published"
   end
 
+  add_index "guidances", ["guidance_group_id"], name: "fk_rails_20d29da787", using: :btree
+
   create_table "identifier_schemes", force: :cascade do |t|
     t.string   "name",             limit: 255
     t.string   "description",      limit: 255
     t.boolean  "active"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "logo_url"
-    t.string   "user_landing_url"
+    t.string   "logo_url",         limit: 255
+    t.string   "user_landing_url", limit: 255
   end
 
   create_table "languages", force: :cascade do |t|
-    t.string  "abbreviation"
-    t.string  "description"
-    t.string  "name"
+    t.string  "abbreviation",     limit: 255
+    t.string  "description",      limit: 255
+    t.string  "name",             limit: 255
     t.boolean "default_language"
   end
 
   create_table "notes", force: :cascade do |t|
-    t.integer  "user_id"
-    t.text     "text"
+    t.integer  "user_id",     limit: 4
+    t.text     "text",        limit: 65535
     t.boolean  "archived"
-    t.integer  "answer_id"
-    t.integer  "archived_by"
+    t.integer  "answer_id",   limit: 4
+    t.integer  "archived_by", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "notes", ["answer_id"], name: "fk_rails_907f8d48bf", using: :btree
+  add_index "notes", ["user_id"], name: "fk_rails_7f2323ad43", using: :btree
+
   create_table "org_token_permissions", force: :cascade do |t|
-    t.integer  "org_id"
-    t.integer  "token_permission_type_id"
+    t.integer  "org_id",                   limit: 4
+    t.integer  "token_permission_type_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "org_token_permissions", ["org_id"], name: "fk_rails_e1db1b22c5", using: :btree
+  add_index "org_token_permissions", ["token_permission_type_id"], name: "fk_rails_2aa265f538", using: :btree
+
   create_table "orgs", force: :cascade do |t|
-    t.string   "name"
-    t.string   "abbreviation"
-    t.string   "target_url"
-    t.string   "wayfless_entity"
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
-    t.integer  "parent_id"
+    t.string   "name",            limit: 255
+    t.string   "abbreviation",    limit: 255
+    t.string   "target_url",      limit: 255
+    t.string   "wayfless_entity", limit: 255
+    t.datetime "created_at",                                null: false
+    t.datetime "updated_at",                                null: false
+    t.integer  "parent_id",       limit: 4
     t.boolean  "is_other"
-    t.string   "sort_name"
-    t.text     "banner_text"
-    t.string   "logo_file_name"
-    t.integer  "region_id"
-    t.integer  "language_id"
-    t.string   "logo_uid"
-    t.string   "logo_name"
-    t.string   "contact_email"
-    t.integer  "org_type",        default: 0, null: false
+    t.string   "sort_name",       limit: 255
+    t.text     "banner_text",     limit: 65535
+    t.string   "logo_file_name",  limit: 255
+    t.integer  "region_id",       limit: 4
+    t.integer  "language_id",     limit: 4
+    t.string   "logo_uid",        limit: 255
+    t.string   "logo_name",       limit: 255
+    t.string   "contact_email",   limit: 255
+    t.integer  "org_type",        limit: 4,     default: 0, null: false
   end
 
+  add_index "orgs", ["language_id"], name: "fk_rails_5640112cab", using: :btree
+  add_index "orgs", ["region_id"], name: "fk_rails_5a6adf6bab", using: :btree
+
   create_table "perms", force: :cascade do |t|
-    t.string   "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.string   "name",       limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
-  add_index "perms", ["name"], name: "index_perms_on_name"
-  add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id"
+  add_index "perms", ["name"], name: "index_perms_on_name", using: :btree
+  add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree
 
   create_table "phases", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "number"
-    t.integer  "template_id"
+    t.string   "title",       limit: 255
+    t.text     "description", limit: 65535
+    t.integer  "number",      limit: 4
+    t.integer  "template_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug"
+    t.string   "slug",        limit: 255
     t.boolean  "modifiable"
   end
 
   add_index "phases", ["template_id"], name: "index_phases_on_template_id", using: :btree
 
   create_table "plans", force: :cascade do |t|
-    t.string   "title"
-    t.integer  "template_id"
+    t.string   "title",                             limit: 255
+    t.integer  "template_id",                       limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug"
-    t.string   "grant_number"
-    t.string   "identifier"
-    t.text     "description"
-    t.string   "principal_investigator"
-    t.string   "principal_investigator_identifier"
-    t.string   "data_contact"
-    t.string   "funder_name"
-    t.integer  "visibility",                        default: 0, null: false
+    t.string   "slug",                              limit: 255
+    t.string   "grant_number",                      limit: 255
+    t.string   "identifier",                        limit: 255
+    t.text     "description",                       limit: 65535
+    t.string   "principal_investigator",            limit: 255
+    t.string   "principal_investigator_identifier", limit: 255
+    t.string   "data_contact",                      limit: 255
+    t.string   "funder_name",                       limit: 255
+    t.integer  "visibility",                        limit: 4,     default: 0, null: false
   end
 
   add_index "plans", ["template_id"], name: "index_plans_on_template_id", using: :btree
 
   create_table "plans_guidance_groups", force: :cascade do |t|
-    t.integer "guidance_group_id"
-    t.integer "plan_id"
+    t.integer "guidance_group_id", limit: 4
+    t.integer "plan_id",           limit: 4
   end
 
+  add_index "plans_guidance_groups", ["guidance_group_id"], name: "fk_rails_ec1c5524d7", using: :btree
+  add_index "plans_guidance_groups", ["plan_id"], name: "fk_rails_13d0671430", using: :btree
+
   create_table "question_formats", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.datetime "created_at",                   null: false
-    t.datetime "updated_at",                   null: false
-    t.boolean  "option_based", default: false
-    t.integer  "formattype",   default: 0
+    t.string   "title",        limit: 255
+    t.text     "description",  limit: 65535
+    t.datetime "created_at",                                 null: false
+    t.datetime "updated_at",                                 null: false
+    t.boolean  "option_based",               default: false
+    t.integer  "formattype",   limit: 4,     default: 0
   end
 
   create_table "question_options", force: :cascade do |t|
-    t.integer  "question_id"
-    t.string   "text"
-    t.integer  "number"
+    t.integer  "question_id", limit: 4
+    t.string   "text",        limit: 255
+    t.integer  "number",      limit: 4
     t.boolean  "is_default"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "question_options", ["question_id"], name: "fk_rails_b9c5f61cf9", using: :btree
+
   create_table "questions", force: :cascade do |t|
-    t.text     "text"
-    t.text     "default_value"
-    t.integer  "number"
-    t.integer  "section_id"
+    t.text     "text",                   limit: 65535
+    t.text     "default_value",          limit: 65535
+    t.integer  "number",                 limit: 4
+    t.integer  "section_id",             limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "question_format_id"
-    t.boolean  "option_comment_display", default: true
+    t.integer  "question_format_id",     limit: 4
+    t.boolean  "option_comment_display",               default: true
     t.boolean  "modifiable"
   end
 
+  add_index "questions", ["question_format_id"], name: "fk_rails_4fbc38c8c7", using: :btree
   add_index "questions", ["section_id"], name: "index_questions_on_section_id", using: :btree
 
   create_table "questions_themes", id: false, force: :cascade do |t|
-    t.integer "question_id", null: false
-    t.integer "theme_id",    null: false
+    t.integer "question_id", limit: 4, null: false
+    t.integer "theme_id",    limit: 4, null: false
   end
 
-  add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index"
-  add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index"
+  add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index", using: :btree
+  add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index", using: :btree
 
   create_table "regions", force: :cascade do |t|
-    t.string  "abbreviation"
-    t.string  "description"
-    t.string  "name"
-    t.integer "super_region_id"
+    t.string  "abbreviation",    limit: 255
+    t.string  "description",     limit: 255
+    t.string  "name",            limit: 255
+    t.integer "super_region_id", limit: 4
   end
 
   create_table "roles", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "plan_id"
+    t.integer  "user_id",    limit: 4
+    t.integer  "plan_id",    limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "access",     default: 0, null: false
+    t.integer  "access",     limit: 4, default: 0, null: false
   end
 
+  add_index "roles", ["plan_id"], name: "fk_rails_a1ce6c2772", using: :btree
+  add_index "roles", ["user_id"], name: "fk_rails_ab35d699f0", using: :btree
+
   create_table "sections", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "number"
+    t.string   "title",       limit: 255
+    t.text     "description", limit: 65535
+    t.integer  "number",      limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "published"
-    t.integer  "phase_id"
+    t.integer  "phase_id",    limit: 4
     t.boolean  "modifiable"
   end
 
   add_index "sections", ["phase_id"], name: "index_sections_on_phase_id", using: :btree
 
   create_table "settings", force: :cascade do |t|
-    t.string   "var",         null: false
-    t.text     "value"
-    t.integer  "target_id",   null: false
-    t.string   "target_type", null: false
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.string   "var",         limit: 255,   null: false
+    t.text     "value",       limit: 65535
+    t.integer  "target_id",   limit: 4,     null: false
+    t.string   "target_type", limit: 255,   null: false
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
-  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true
+  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true, using: :btree
 
   create_table "splash_logs", force: :cascade do |t|
-    t.string   "destination"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.string   "destination", limit: 255
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
   create_table "templates", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
+    t.string   "title",            limit: 255
+    t.text     "description",      limit: 65535
     t.boolean  "published"
-    t.integer  "org_id"
-    t.string   "locale"
+    t.integer  "org_id",           limit: 4
+    t.string   "locale",           limit: 255
     t.boolean  "is_default"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "version"
-    t.integer  "visibility"
-    t.integer  "customization_of"
-    t.integer  "dmptemplate_id"
+    t.integer  "version",          limit: 4
+    t.integer  "visibility",       limit: 4
+    t.integer  "customization_of", limit: 4
+    t.integer  "dmptemplate_id",   limit: 4
     t.boolean  "migrated"
-    t.boolean  "dirty",            default: false
+    t.boolean  "dirty",                          default: false
   end
 
   add_index "templates", ["org_id", "dmptemplate_id"], name: "template_organisation_dmptemplate_index", using: :btree
   add_index "templates", ["org_id"], name: "index_templates_on_org_id", using: :btree
 
   create_table "themes", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-    t.string   "locale"
+    t.string   "title",       limit: 255
+    t.text     "description", limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.string   "locale",      limit: 255
   end
 
   create_table "themes_in_guidance", id: false, force: :cascade do |t|
-    t.integer "theme_id"
-    t.integer "guidance_id"
+    t.integer "theme_id",    limit: 4
+    t.integer "guidance_id", limit: 4
   end
 
+  add_index "themes_in_guidance", ["guidance_id"], name: "fk_rails_a5ab9402df", using: :btree
+  add_index "themes_in_guidance", ["theme_id"], name: "fk_rails_7d708f6f1e", using: :btree
+
   create_table "token_permission_types", force: :cascade do |t|
-    t.string   "token_type"
-    t.text     "text_description"
+    t.string   "token_type",       limit: 255
+    t.text     "text_description", limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "user_identifiers", force: :cascade do |t|
-    t.string   "identifier"
+    t.string   "identifier",           limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "user_id"
-    t.integer  "identifier_scheme_id"
+    t.integer  "user_id",              limit: 4
+    t.integer  "identifier_scheme_id", limit: 4
   end
 
+  add_index "user_identifiers", ["identifier_scheme_id"], name: "fk_rails_fe95df7db0", using: :btree
+  add_index "user_identifiers", ["user_id"], name: "fk_rails_65c9a98cdb", using: :btree
+
   create_table "users", force: :cascade do |t|
-    t.string   "firstname"
-    t.string   "surname"
-    t.string   "email",                  default: "", null: false
-    t.string   "orcid_id"
-    t.string   "shibboleth_id"
+    t.string   "firstname",              limit: 255
+    t.string   "surname",                limit: 255
+    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "orcid_id",               limit: 255
+    t.string   "shibboleth_id",          limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "encrypted_password",     default: ""
-    t.string   "reset_password_token"
+    t.string   "encrypted_password",     limit: 255, default: ""
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0
+    t.integer  "sign_in_count",          limit: 4,   default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.string   "confirmation_token"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "confirmation_token",     limit: 255
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "invitation_token"
+    t.string   "invitation_token",       limit: 255
     t.datetime "invitation_created_at"
     t.datetime "invitation_sent_at"
     t.datetime "invitation_accepted_at"
-    t.string   "other_organisation"
+    t.string   "other_organisation",     limit: 255
     t.boolean  "accept_terms"
-    t.integer  "org_id"
-    t.string   "api_token"
-    t.integer  "invited_by_id"
-    t.string   "invited_by_type"
-    t.integer  "language_id"
-    t.string   "recovery_email"
+    t.integer  "org_id",                 limit: 4
+    t.string   "api_token",              limit: 255
+    t.integer  "invited_by_id",          limit: 4
+    t.string   "invited_by_type",        limit: 255
+    t.integer  "language_id",            limit: 4
+    t.string   "recovery_email",         limit: 255
   end
 
-  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true, using: :btree
+  add_index "users", ["language_id"], name: "fk_rails_45f4f12508", using: :btree
+  add_index "users", ["org_id"], name: "fk_rails_e73753bccb", using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
   create_table "users_perms", id: false, force: :cascade do |t|
-    t.integer "user_id"
-    t.integer "perm_id"
+    t.integer "user_id", limit: 4
+    t.integer "perm_id", limit: 4
   end
 
+  add_index "users_perms", ["perm_id"], name: "fk_rails_457217c31c", using: :btree
   add_index "users_perms", ["user_id", "perm_id"], name: "index_users_perms_on_user_id_and_perm_id", using: :btree
 
   add_foreign_key "annotations", "orgs"
diff --git a/lib/assets/javascripts/devise/passwords/new.js b/lib/assets/javascripts/devise/passwords/new.js
new file mode 100644
index 0000000..7628f69
--- /dev/null
+++ b/lib/assets/javascripts/devise/passwords/new.js
@@ -0,0 +1,5 @@
+$(document).ready(function(){
+  $("#password-reset-form #user_email").change(function(){
+    $("#password-reset-form #password-reset-button").attr('aria-disabled', validateEmail($(this).val()) != '');
+  });
+});
\ No newline at end of file
diff --git a/lib/assets/javascripts/home/index.js b/lib/assets/javascripts/home/index.js
new file mode 100644
index 0000000..96ec922
--- /dev/null
+++ b/lib/assets/javascripts/home/index.js
@@ -0,0 +1,32 @@
+$(document).ready(function(){
+  $(".tab-panels div.tab-panel:not(.active)").hide();
+  
+  $(".tabs li a").click(function(e){
+    e.preventDefault();
+    
+    // Make the clicked tab the active tab
+    $(this).parent().addClass('active');
+    $(this).attr('aria-selected', 'true');
+    $.each($(this).parent().siblings(), function(i, sib){
+      $(sib).removeClass('active');
+      $(sib).find('> a').attr('aria-selected', 'false');
+    });
+    
+    // Make the corresponding panel visible and the others hidden
+    let panel = $($(this).attr("href"));
+    panel.show().attr("aria-hidden", 'false');
+    $.each($(panel).siblings(), function(i, p){
+      $(p).hide().attr("aria-hidden", 'true');
+    });
+  });
+  
+  // If the hidden valid-form field is set to true then enable the submit button
+  $("#valid-form").change(function(){
+    $(this).siblings(".form-submit").attr('aria-disabled', $(this).val() != "true");
+  });
+
+  $("#shibboleth-login").click(function(e){
+    e.preventDefault();
+    window.location.href = $(this).attr('href');
+  })
+});
\ No newline at end of file
diff --git a/lib/assets/javascripts/shared/login_form.js b/lib/assets/javascripts/shared/login_form.js
new file mode 100644
index 0000000..f7af526
--- /dev/null
+++ b/lib/assets/javascripts/shared/login_form.js
@@ -0,0 +1,17 @@
+$(document).ready(function(){
+  // If the hidden valid-form field is set to true then enable the submit button
+  $("form.login-form #valid-form").change(function(){
+    $(this).siblings(".form-submit").attr('aria-disabled', $(this).val() != "true");
+  });
+
+  $("form.login-form input[class*='required']").change(function(){
+    toggleLogInSubmit();
+  });
+  
+  function toggleLogInSubmit(){
+    let disabled = (validateEmail($("form.login-form #user_email").val()) != '' || 
+                    validatePassword($("form.login-form #user_password").val()) != '');
+    $("form.login-form #sign-in-button").attr('aria-disabled', disabled);
+  }
+});
+
diff --git a/lib/assets/javascripts/shared/register_form.js b/lib/assets/javascripts/shared/register_form.js
index 82b077d..4e197cb 100644
--- a/lib/assets/javascripts/shared/register_form.js
+++ b/lib/assets/javascripts/shared/register_form.js
@@ -58,4 +58,14 @@
             $("#sign_up_submit").attr('aria-disabled', true);
         }
     }
-});
\ No newline at end of file
+});
+
+function toggleRegisterSubmit(){
+  let disabled = ($("#user_firstname").val().trim().length <= 0 || 
+                  $("#user_surname").val().trim().length <= 0 || 
+                  $("#user_email").val().trim().length <= 0 || 
+                  $("#user_recovery_email").val().trim().length <= 0 || 
+                  $("#user_password").val().trim().length <= 0 ||
+                  $("#user_email").val() === $("#user_recovery_email").val());
+  $("#register-button").attr('aria-disabled', disabled);
+}
\ No newline at end of file
diff --git a/lib/assets/stylesheets/roadmap-form.scss b/lib/assets/stylesheets/roadmap-form.scss
index 8bf8725..a4bcbec 100644
--- a/lib/assets/stylesheets/roadmap-form.scss
+++ b/lib/assets/stylesheets/roadmap-form.scss
@@ -6,7 +6,6 @@
 /* the bottom contains page specific changes to the generic */
 /* ================================================ */
 
-
 /* Roadmap Form Styling */
 /* ------------------------------------------------ */
 form.roadmap-form {
@@ -165,14 +164,14 @@
     display: inline-block;
     width: 0;
     height: 0;
-    border-top: 12px solid transparent;
-    border-bottom: 12px solid transparent;
-    border-right: 12px solid $dark-grey;
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid transparent;
+    border-right: 6px solid $dark-grey;
   }
   .submit-tooltip {
     display: none;
     margin-left: 5px;
-
+    
     .arrow-left {
       vertical-align: middle;
       margin-right: -5px;
@@ -181,6 +180,7 @@
       color: $white;
       background-color: $dark-grey;
       padding: 5px 5px 8px 5px;
+      border-radius: 2px;
     }
   }
   input.small-input-button {
@@ -194,36 +194,35 @@
   /* Input validation errors */
   .red-border {
     border: 1px solid $error-color;
-  }
-  .error-tooltip {
-    display: none;
-    position: absolute;
-    vertical-align: middle;
-    right: 0;
-    z-index: 1;
-    
-    .arrow-left {
-      height: auto;
-      border-right: 12px solid $error-background;
-    }
-    .error-msg {
-      float: right;
-      background-color: $error-background;
-      color: $error-color;
-      padding: 5px;
-      width: 100px;
-      text-align: right;
-      
-      -webkit-border-radius: 2px;
-      -moz-border-radius: 2px;
-      border-radius: 2px;
-    }
-    
-  }
-  .error-tooltip[role='tooltip'] {
-    display: inline-block;
+    box-shadow: 0 0 6px $error-background;
   }
 
+  .error-tooltip {
+    display: none;
+    width: 397px;
+  }
+
+  .error-tooltip[role='tooltip'] {
+    background: $error-background;
+    border-radius: 3px;
+    top: 55px;
+    color: $error-color;
+    padding: 4px 6px;
+    display: inline;
+    left: 0;
+    position: absolute;
+    z-index: 9;
+  }
+  .error-tooltip[role='tooltip']:before {
+    display: inline;
+    position: absolute;
+    top: -5px;
+    width: 0;
+    height: 0;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+    border-bottom: 5px solid $error-background;
+  }
 }
 
 /* Accessible JQuery combobox */
@@ -315,11 +314,11 @@
 #new_user fieldset {
   input[type="password"],
   input[type="email"] {
-    width: 292px;
+    width: 395px;
   }
   
   .checkbox-right {
-    width: 320px;
+    width: 425px;
     position: relative;
     
     #user_remember_me, input[type='checkbox'], .checkbox-label {
diff --git a/lib/assets/stylesheets/roadmap-hacks.scss b/lib/assets/stylesheets/roadmap-hacks.scss
index 271b476..da98d5a 100644
--- a/lib/assets/stylesheets/roadmap-hacks.scss
+++ b/lib/assets/stylesheets/roadmap-hacks.scss
@@ -1,6 +1,13 @@
+@import "roadmap";
+
 /* ============================================================================================ */
 /* HACKS TO NULL OUT OLD BOOTSTRAP, BOOTSTRAP_AND_OVERRIDES.CSS.LESS and ADMIN.CSS.LESS STYLING */
 /* ============================================================================================ */
+
+.left_side_footer, .right_side_footer {
+  padding-top: 30px;
+}
+
 #new_user input {
   width: 350px;
 }
@@ -11,3 +18,36 @@
   width: 150px;
   margin-left: 15px;
 }
+
+/* Override generic handling of input fields */
+select, 
+textarea, 
+input[type="text"], 
+input[type="password"], 
+input[type="datetime"], 
+input[type="datetime-local"], 
+input[type="date"], 
+input[type="month"], 
+input[type="time"], 
+input[type="week"], 
+input[type="number"], 
+input[type="email"], 
+input[type="url"], 
+input[type="search"], 
+input[type="tel"], 
+input[type="color"], 
+.uneditable-input {
+  position: relative;
+  background-color: $white;
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: $black;
+  border-radius: 4px;
+  vertical-align: middle;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  transition: border linear .2s, box-shadow linear .2s;
+}
\ No newline at end of file
diff --git a/lib/assets/stylesheets/roadmap.scss b/lib/assets/stylesheets/roadmap.scss
index ae7b2f0..911021a 100644
--- a/lib/assets/stylesheets/roadmap.scss
+++ b/lib/assets/stylesheets/roadmap.scss
@@ -3,6 +3,7 @@
 $font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 $header-font: "GillSansLight";
 
+$black: #000;
 $white: #FFF;
 $error-color: #CC0000;
 $error-background: #FFE6E6;
@@ -25,6 +26,11 @@
   color: $primary-color;
 }
 
+/* Used to override standard h2,h3,h4,etc. sizing */
+.small-header {
+  font-size: 20px;
+}
+
 .main_header {
   margin-bottom: 20px;
 }