diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 358998f..4a19104 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,11 +1,11 @@
 <div class="row">
   <div class="col-md-8">
     <h1><%= _('Welcome.')%></h1>
-	</div>
+  </div>
 </div>
 
 <div class="row">
-  <div class="col-md-12">
+  <div class="col-md-8">
     <%= raw _('<p>%{application_name} has been jointly developed by the <strong>%{organisation_name}</strong> to help you write data management plans.</p>') % {:application_name => Rails.configuration.branding[:application][:name], :organisation_name => Rails.configuration.branding[:organisation][:name]} %>            
     <div class="screencast_home_page">
       <p><%= _('Screencast on how to use %{application_name}') % {:application_name => Rails.configuration.branding[:application][:name]} %></p>
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 7944147..6f91d01 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -1,4 +1,4 @@
-<nav id="app-navbar" class="navbar navbar-inverse" role="navigation">
+<nav id="app-navbar" class="navbar navbar-inverse">
   <div class="container-fluid" >
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
@@ -59,6 +59,10 @@
       <ul class="nav navbar-nav navbar-right">
           <%= render "layouts/signin_signout" %>
       </ul>
+
+      <% unless isActivePage(root_path) %>
+        <%= render partial: 'shared/access_controls', layout: 'shared/modal', locals: { id: "header-signin", title: _('Sign in')} %>
+      <% end %>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index be8cdca..a8b148e 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -19,20 +19,19 @@
 <!-- Sign in / out -->
 <% if user_signed_in? %>
   <li class="dropdown" id="signin-signout">
-      <a href="#" class="dropdown-toggle" role="button" id="user-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <i class="fa fa-user" aria-hidden="true">&nbsp;</i>
-        <%= current_user.name(false) %>
-        <span class="caret"></span>
-      </a>
-      <ul class="dropdown-menu inverse-dropdown" aria-labelledby="user-menu">
-        <li>
-          <%= link_to '<i class="fa fa-pencil-square-o" aria-hidden="true">&nbsp;</i>&nbsp;'.html_safe + _('Edit profile'), edit_user_registration_path %>
-        </li>
-        <li>
-          <%= link_to '<i class="fa fa-sign-in" aria-hidden="true">&nbsp;</i>&nbsp;'.html_safe + _('Logout'), destroy_user_session_path, method: :delete %>
-        </li>
-      </ul>
+    <a href="#" class="dropdown-toggle" role="button" id="user-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <i class="fa fa-user" aria-hidden="true">&nbsp;</i>
+      <%= current_user.name(false) %>
+      <span class="caret"></span>
     </a>
+    <ul class="dropdown-menu inverse-dropdown" aria-labelledby="user-menu">
+      <li>
+        <%= link_to '<i class="fa fa-pencil-square-o" aria-hidden="true">&nbsp;</i>&nbsp;'.html_safe + _('Edit profile'), edit_user_registration_path %>
+      </li>
+      <li>
+        <%= link_to '<i class="fa fa-sign-in" aria-hidden="true">&nbsp;</i>&nbsp;'.html_safe + _('Logout'), destroy_user_session_path, method: :delete %>
+      </li>
+    </ul>
   </li>
 <% else %>
   <% if !isActivePage(root_path) %>
@@ -42,7 +41,5 @@
         <%= _('Sign in') %>
       </a>
     </li>
-          <%= render partial: 'shared/access_controls', layout: 'shared/modal', locals: { id: "header-signin", title: _('Sign in')} %>
-
   <% end %>
 <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 922c179..588adec 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= FastGettext.locale %>">
+<html lang="en">
   <head>
     <title>
       <%= _('%{application_name}') % { :application_name => Rails.configuration.branding[:application][:name] } %>
diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index dd1b4bb..893d185 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -19,7 +19,7 @@
          value="<%= default_selection[attribute] unless default_selection.nil? %>" />
   <datalist id="<%= id %>_list">
     <% models.each do |model| %>
-      <option value="<%= model[attribute] %>" />
+      <option value="<%= model[attribute] %>"></option>
     <% end %>
   </datalist>