diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 801c5a7..62725b2 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -25,17 +25,23 @@
   
   <div class="column-right">
     <div class="tabbed-area">
-      <ul class="tabs">
-        <li class="active"><a href="#sign-in-panel" aria-selected="true">Sign In</a></li>
-        <li><a href="#create-account-panel" aria-selected="false">Create Account</a></li>
+      <ul class="tabs" role="tablist">
+        <li id="sign-in-tab" class="active" role="tab" aria-controls="sign-in-panel">
+          <a href="#sign-in-panel" aria-selected="true">Sign In</a>
+        </li>
+        <li id="create-account-tab" role="tab" aria-controls="create-account-panel">
+          <a href="#create-account-panel" aria-selected="false">Create Account</a>
+        </li>
       </ul>
     
-      <div class="tab-panels">
-        <div id="sign-in-panel" class="tab-panel active centered" aria-hidden="false">
+      <div class="tab-panels" role="tabpanel">
+        <div id="sign-in-panel" class="tab-panel active centered" aria-hidden="false" 
+             aria-labelledby="sign-in-tab">
           <%= render :partial => 'shared/login_form' %>
         </div>
         
-        <div id="create-account-panel" aria-hidden="true" class="tab-panel">
+        <div id="create-account-panel" aria-hidden="true" class="tab-panel" role="tabpanel" 
+             aria-labelledby="create-account-tab">
           <%= render :partial => 'shared/register_form', locals: {extended: false} %>
         </div>
         </div>
diff --git a/app/views/shared/_login_form.html.erb b/app/views/shared/_login_form.html.erb
index 9f5db74..b97f05d 100644
--- a/app/views/shared/_login_form.html.erb
+++ b/app/views/shared/_login_form.html.erb
@@ -1,22 +1,26 @@
-<% 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%>
-      <% target = (Rails.application.config.shibboleth_use_filtered_discovery_service ? shibboleth_ds_path : user_shibboleth_omniauth_authorize_path) %>
-      <button id="shibboleth-login" href="<%= target %>" class="omniauth-login">
-        <%= _('Your Organisation') %>
-      </button>
-    <%else%>
-      <%= f.hidden_field :shibboleth_id, :value => session[:shibboleth_data][:uid] %>
-    <%end%> 
-  </span>
-
-  <h2 class="centered small-header">- <%= _('or') %> -</h2>
-<% end %>  
+<h2 aria-hidden="false" style="visibility: none"><%= _('Sign in') %></h2>
 
 <%= form_for resource, as: 'user', url: user_session_path, html: {class: "login-form roadmap-form"} do |f| %>
   <fieldset id="sign-in-form" class="standard padded">
+    <% if Rails.application.config.shibboleth_enabled %>
+      <h3 class="centered small-header"><%= _('Sign in with') %></h3>
+
+      <div class="form-input">
+        <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 Organisation') %>
+            </button>
+          <%else%>
+            <%= f.hidden_field :shibboleth_id, :value => session[:shibboleth_data][:uid] %>
+          <%end%> 
+        </span>
+      </div>
+      
+      <h3 class="centered small-header">- <%= _('or') %> -</h3>
+    <% end %>
+    
+    
     <!-- Login form email address -->
     <div class="form-input">
       <label for="user_email"><%= _('Email') %></label>
diff --git a/app/views/shared/_register_form.html.erb b/app/views/shared/_register_form.html.erb
index 6b8426e..4d72051 100644
--- a/app/views/shared/_register_form.html.erb
+++ b/app/views/shared/_register_form.html.erb
@@ -1,18 +1,20 @@
+<h2 aria-hidden="false" style="visibility: none"><%= _('Create account') %></h2>
+
 <%= form_for resource, as: 'user', url: registration_path("user"), html: {autocomplete: "off", class: "roadmap-form register-form"} do |f| %>
   <fieldset id="create-account-form" class="standard padded">
     <div class="inline">
-			<div class="form-input">
-	      <label for="user_firstname"><%= _('First Name') %></label>
-	      <input type="text" id="user_firstname" name="user[firstname]" 
-							 class="input-small required left-indent" />
-			</div>
+      <div class="form-input">
+        <label for="user_firstname"><%= _('First Name') %></label>
+        <input type="text" id="user_firstname" name="user[firstname]" 
+               class="input-small required left-indent" />
+      </div>
     </div>
     <div class="inline">
-			<div class="form-input">
-	      <label for="user_surname"><%= _('Last Name') %></label>
-	      <input type="text" id="user_surname" name="user[surname]" 
-							 class="input-small required left-indent" />
-			</div>
+      <div class="form-input">
+        <label for="user_surname"><%= _('Last Name') %></label>
+        <input type="text" id="user_surname" name="user[surname]" 
+               class="input-small required left-indent" />
+      </div>
     </div>
     
     <!-- Register form email address -->
diff --git a/lib/assets/javascripts/roadmap-utils.js b/lib/assets/javascripts/roadmap-utils.js
index e69de29..70da96a 100644
--- a/lib/assets/javascripts/roadmap-utils.js
+++ b/lib/assets/javascripts/roadmap-utils.js
@@ -0,0 +1,8 @@
+$(document).ready(function(){
+  // Allow for tabs to be selected if a user presses enter while on a tab
+  $("li[role='tab']").keydown(function(ev) {
+    if (ev.which ==13) {
+      $(this).click()
+    }
+  });
+});
diff --git a/lib/assets/stylesheets/roadmap-form.scss b/lib/assets/stylesheets/roadmap-form.scss
index b443462..c1ad078 100644
--- a/lib/assets/stylesheets/roadmap-form.scss
+++ b/lib/assets/stylesheets/roadmap-form.scss
@@ -317,14 +317,21 @@
 /* ------------------------------------------------ */
 /* ------------------------------------------------ */
 
-/* Login form */
+/* Home Page */
+/* ------------------------------------------------ */
+.main_page_content .content-two-column {
+  min-height: 400px;
+}
+
+
+/* Sign in/Create account forms */
 /* ------------------------------------------------ */
 .omniauth-options {
   display: block;
   width: 100%;
 
   .omniauth-login {
-    width: 410px;
+    width: 93%;
     padding: 4px 12px;
     background-color: $primary-color;
     color: $white;
@@ -335,19 +342,27 @@
     border-radius: 5px;
   }
 }
+#new_user {
+  margin-bottom: 10px;
+}
+
 #new_user fieldset {
   width: 90%;
+  padding-bottom: 15px;
+  margin-bottom: 5px;
   
   input[type="password"],
   #user_password,
   input[type="email"] {
     width: 90%;
   }
-}
 
-#new_user fieldset {
+  .small-header {
+    margin-top: 0;
+  }
+
   .checkbox-right {
-    width: 98%;
+    width: 97%;
     position: relative;
     
     #user_remember_me, input[type='checkbox'], .checkbox-label {
diff --git a/lib/assets/stylesheets/roadmap-tabs.scss b/lib/assets/stylesheets/roadmap-tabs.scss
index c9b55f1..9913fd5 100644
--- a/lib/assets/stylesheets/roadmap-tabs.scss
+++ b/lib/assets/stylesheets/roadmap-tabs.scss
@@ -43,8 +43,8 @@
 }
 .tabbed-area div.tab-panel {
   background: white;
-  padding: 20px;
-  min-height: 250px;
+  padding: 10px 20px;
+  min-height: 230px;
   position: absolute;
   top: -1px;
   left: 0;