diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index da63f1c..fa417c9 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -24,29 +24,6 @@
   </div>
   
   <div class="column-right">
-    <div class="tabbed-area">
-      <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" 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" role="tabpanel" 
-             aria-labelledby="create-account-tab">
-          <%= render :partial => 'shared/register_form', locals: {extended: false} %>
-        </div>
-        </div>
-      </div>
-    </div>
-
-
+    <%= render partial: 'shared/signin' %>
+  </div>
 </div>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 919d4a4..0afb421 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -2,6 +2,8 @@
 <div class="footer-left">
   <div>
     <ul class="footer-links">  
+      <li><a href="<%= about_us_path %>"><%= _('About') %></a></li>
+      <li class="muted">|</li>
       <li><a href="<%= contact_us_path %>"><%= _('Contact us') %></a></li>
       <li class="muted">|</li>
       <li><a href="<%= terms_path %>"><%= _('Terms of use') %></a></li>
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 90e759f..00fecdc 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -1,74 +1,63 @@
 <ul class="nav">
-  <!-- Navigation for organisation admin -->
-  <% if (user_signed_in? && current_user.can_org_admin? && ( action_name.include? "admin_" ) ) %>
-    <% if current_user.can_modify_templates? %>
-        <li <%= 'class=active' if isActivePage(admin_index_template_path(current_user.org_id)) %>>
-          <%= link_to _('Templates'), admin_index_template_path(current_user.org_id) %>
-        </li>
-    <% end %>
-    <% if current_user.can_modify_guidance? %>
-        <li <%= 'class=active' if isActivePage(admin_index_guidance_path(current_user.org_id)) %>>
-          <%= link_to _('Guidance'), admin_index_guidance_path(current_user.org_id) %>
-        </li>
-    <% end %>
-    <% if current_user.can_modify_org_details? %>
-        <li <%= 'class=active' if isActivePage(admin_edit_org_path(current_user.org_id)) %>>
-          <%= link_to _('Organisation details'), admin_edit_org_path(current_user.org_id) %> 
-        </li>
-    <% end %>
-    <% if current_user.can_grant_permissions? %>
-        <li <%= 'class=active' if isActivePage(admin_index_users_path) %>>
-          <%= link_to _('Users'), admin_index_users_path, class: 'main_nav_last_li' %>
-        </li>
-    <% end %>
-  <% else %>
-    <% if user_signed_in? %>
-        <li <%= 'class=active' if isActivePage(plans_path) %>>
-          <%= link_to _('View plans'), plans_path %>
-        </li>
-        <li <%= 'class=active' if isActivePage(new_plan_path) || isActivePage("#{new_plan_path}?test=true") %>>
-          <%= link_to _('Create plan'), new_plan_path %>
-        </li>
-    <% else %>
-      <!-- Home page -->
-        <li <%= 'class=active' if isActivePage(root_path) %>>
+  
+  <li>
+    <a class="dropdown left-indent" id="explore" href="#"><%= _('Explore') %> <span class="fa fa-sort-desc" style="color: inherit;"><span></a>
+
+    <ul class="hidden dropdown-list" id="explore-dropdown">
+      <% if !user_signed_in? %>
+        <li <%= 'class=active' if isActivePage(root_path) || isActivePage(plans_path) %>>
           <%= link_to _('Home'), root_path %>
         </li>
-    <% end %>
-    <!-- help page -->
+      <% end %>
       <li <%= 'class=active' if isActivePage(public_plans_path) %>>
         <%= link_to _('Public DMPs'), public_plans_path %>
       </li>
-    <!-- about_us page -->
-      <li <%= 'class=active' if isActivePage(about_us_path) %>>
-        <%= link_to _('About'), about_us_path %>
+    </ul>
+  </li>
+  
+  <% if user_signed_in? %>
+  
+    <!-- Navigation for organisation admin -->
+    <% if (user_signed_in? && current_user.can_org_admin? && ( action_name.include? "admin_" ) ) %>
+      <% if current_user.can_modify_templates? %>
+          <li <%= 'class=active' if isActivePage(admin_index_template_path(current_user.org_id)) %>>
+            <%= link_to _('Templates'), admin_index_template_path(current_user.org_id) %>
+          </li>
+      <% end %>
+      <% if current_user.can_modify_guidance? %>
+          <li <%= 'class=active' if isActivePage(admin_index_guidance_path(current_user.org_id)) %>>
+            <%= link_to _('Guidance'), admin_index_guidance_path(current_user.org_id) %>
+          </li>
+      <% end %>
+      <% if current_user.can_modify_org_details? %>
+          <li <%= 'class=active' if isActivePage(admin_edit_org_path(current_user.org_id)) %>>
+            <%= link_to _('Organisation details'), admin_edit_org_path(current_user.org_id) %> 
+          </li>
+      <% end %>
+      <% if current_user.can_grant_permissions? %>
+          <li <%= 'class=active' if isActivePage(admin_index_users_path) %>>
+            <%= link_to _('Users'), admin_index_users_path, class: 'main_nav_last_li' %>
+          </li>
+      <% end %>
+    <% else %>
+      <li <%= 'class=active' if isActivePage(new_plan_path) %>>
+        <%= link_to _('Create plans'), new_plan_path %>
       </li>
-    <!-- roadmap page -->
-      <li <%= 'class=active' if isActivePage(roadmap_path) %>>
-        <%= link_to _('Future plans'), roadmap_path %>
-      </li>
-    <!-- help page -->
-      <li <%= 'class=active' if isActivePage(help_path) %>>
-        <%= link_to _('Help'), help_path %>
-      </li>
-    
-      <% if !user_signed_in? %>
-        <% if MANY_LANGUAGES %>
-            <!-- language dropdown -->
-            <li class="language-switcher">
-              <a class="dropdown" id="change-language" href="#">
-                <%= _('Change language') %> <span class="caret"><span>
-              </a>
-              
-              <ul class="hidden dropdown-list" id="change-language-dropdown">
-                <% LANGUAGES.each do |l| %>
-                  <li <%= 'class=active' if FastGettext.locale == l.abbreviation %>>
-                    <%= link_to l.name, locale_path(l.abbreviation), method: :patch, class: 'main_nav lang-dropdown-link'%>
-                  </li>
-                <% end %>
-              </ul>
-            </li>
-        <% end %>
+      <!-- roadmap page -->
+        <!-- <li <%= 'class=active' if isActivePage(roadmap_path) %>> -->
+          <!-- <%= link_to _('Future plans'), roadmap_path %> -->
+        <!-- </li> -->
+      <!-- help page -->
+        <!-- <li <%= 'class=active' if isActivePage(help_path) %>> -->
+          <!-- <%= link_to _('Help'), help_path %> -->
+        <!-- </li> -->
+    <% end %>
+
+
+    <li class="highlight-color-button left-indent"><%= link_to _('My Dashboard'), plans_path %></li>
+
+    <% if current_user.can_org_admin? %>
+      <li class="highlight-color-button"><%= link_to _('Admin'), plans_path %></li>
     <% end %>
   <% end %>
 </ul>
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index 79cae62..d6a08ae 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -1,44 +1,61 @@
 <!-- Sign in / out -->
 <% if user_signed_in? %>
-  <a href="#" class="dropdown" id="signin-signout">
-    <%= _('Signed in as') %> <%= current_user.name(false) %> <span class="caret"><span>
+  <a href="#" class="dropdown right-indent" id="signin-signout">
+    <%= _('Signed in as') %> <%= current_user.name(false) %> <span class="fa fa-user" style="color: inherit;"><span>
   </a>
-  
-  <ul class="hidden dropdown-list" id="signin-signout-dropdown">
-    <li><%= link_to _('Edit profile'), edit_user_registration_path, class: "signIn_dropdown_link" %></li>
-    <% if current_user.can_super_admin? %>
-      <li><%= link_to _('Super admin area'), "/admin", class: "signIn_dropdown_link" %></li>
-    <% end %>
-    <% if current_user.can_org_admin? && !current_user.org_id.nil? %>
-      <% if current_user.can_modify_org_details? && current_user.org.abbreviation.blank? %>
-        <li><%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %></li>
-      <% elsif  current_user.can_modify_templates?%>
-        <li><%= link_to _("Admin area"), admin_index_template_path(current_user.org_id), class: "signIn_dropdown_link" %></li>
-      <% elsif current_user.can_modify_guidance? %>
-        <li><%= link_to _("Admin area"), admin_index_guidance_path(current_user.org_id), class: "signIn_dropdown_link" %></li>
-      <% elsif current_user.can_modify_org_details? %>
-        <li><%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %></li>
-      <% elsif current_user.can_grant_permissions? %>
-        <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>
-  </ul>
+  <span class="muted">|</span>
+
+  <!-- <ul class="hidden dropdown-list" id="signin-signout-dropdown"> -->
+    <!-- <li><%= link_to _('Edit profile'), edit_user_registration_path, class: "signIn_dropdown_link" %></li> -->
+    <!-- <% if current_user.can_super_admin? %> -->
+      <!-- <li><%= link_to _('Super admin area'), "/admin", class: "signIn_dropdown_link" %></li> -->
+    <!-- <% end %> -->
+    <!-- <% if current_user.can_org_admin? && !current_user.org_id.nil? %> -->
+      <!-- <% if current_user.can_modify_org_details? && current_user.org.abbreviation.blank? %> -->
+        <!-- <li><%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %></li> -->
+      <!-- <% elsif  current_user.can_modify_templates?%> -->
+        <!-- <li><%= link_to _("Admin area"), admin_index_template_path(current_user.org_id), class: "signIn_dropdown_link" %></li> -->
+      <!-- <% elsif current_user.can_modify_guidance? %> -->
+        <!-- <li><%= link_to _("Admin area"), admin_index_guidance_path(current_user.org_id), class: "signIn_dropdown_link" %></li> -->
+      <!-- <% elsif current_user.can_modify_org_details? %> -->
+        <!-- <li><%= link_to _("Admin area"), admin_edit_org_path(current_user.org_id), class: "signIn_dropdown_link" %></li> -->
+      <!-- <% elsif current_user.can_grant_permissions? %> -->
+        <!-- <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> -->
+  <!-- </ul> -->
+
+  <%= link_to _('Logout'), destroy_user_session_path, method: :delete, class: "left-indent right-indent" %>
+  <span class="muted">|</span>
 
 <% else %>
   <% if !isActivePage(root_path) %>
-    <a href="#header-login-form" data-toggle="modal" dialog-width="450px"><%= _('Sign in')%></a> /
-    <a href="#header-register-form" data-toggle="modal" dialog-width="450px"><%= _('Create account')%></a>
+    <a href="#header-signin" data-toggle="modal" dialog-width="700px" class="link-as-button no-header right-indent">
+      <%= _('Sign in')%>
+    </a>
+    <span class="muted">|</span>
   <% end %>
 <% end %>
 
+<% if MANY_LANGUAGES %>
+  <!-- language dropdown -->
+  <a class="dropdown left-indent" id="change-language" href="#">
+    <%= _('Choose your language') %> <span class="fa fa-sort-desc" style="color: inherit;"><span>
+  </a>
+  <ul class="hidden dropdown-list" id="change-language-dropdown">
+    <% LANGUAGES.each do |l| %>
+      <li <%= 'class=active' if FastGettext.locale == l.abbreviation %>>
+        <%= link_to l.name, locale_path(l.abbreviation), method: :patch, class: "main_nav lang-dropdown-link" %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
 <% if !user_signed_in? && !isActivePage(root_path) then %>
-  <div id="header-login-form" class="modal" style="display:none">
-    <%= render :partial => "shared/login_form" %>
-  </div>
-  <div id="header-register-form" class="modal" style="display:none">
-    <%= render :partial => "shared/register_form", locals: {extended: false} %>
+  <div id="header-signin" class="modal" style="display:none">
+    <%= render partial: 'shared/signin' %>
   </div>
 <% end %>
diff --git a/app/views/shared/_signin.html.erb b/app/views/shared/_signin.html.erb
new file mode 100644
index 0000000..c482f92
--- /dev/null
+++ b/app/views/shared/_signin.html.erb
@@ -0,0 +1,22 @@
+<div class="tabbed-area">
+  <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" 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" role="tabpanel" 
+         aria-labelledby="create-account-tab">
+      <%= render :partial => 'shared/register_form', locals: {extended: false} %>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/lib/assets/javascripts/dmproadmap/modals.js b/lib/assets/javascripts/dmproadmap/modals.js
index 97fee14..2397348 100644
--- a/lib/assets/javascripts/dmproadmap/modals.js
+++ b/lib/assets/javascripts/dmproadmap/modals.js
@@ -17,7 +17,13 @@
       
       open: function(e, ui){
         $("button.ui-dialog-titlebar-close").remove();
-        $(".ui-dialog-titlebar").append('<span class="fa fa-close modal-close"></span>');
+        $(".ui-dialog-titlebar").append('<span class="fa fa-close modal-close" aria-hidden="true">' +
+                                        '</span><span class="aria-only">' + __('Close') + '</span>');
+        
+        if($(self).is(".no-header")){
+          $('.ui-dialog-title').remove();
+          $('.ui-dialog-titlebar').css('border', 'none').css('height', '45px').css('padding-bottom', '0');
+        }
         
         $("span.modal-close").click(function(e){
           e.preventDefault();
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
index 7aa8004..2e9d86c 100644
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ b/lib/assets/stylesheets/dmproadmap.scss
@@ -16,6 +16,9 @@
 
 $primary-color: #4f5253;
 
+$highlight-color: $black;
+$highlight-background-color: #F36F24;
+
 $error-color: #FFF;
 $error-background: #827D7E;
 $disabled-button-color: #CCC;
diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss
index 2b3660f..0258fee 100644
--- a/lib/assets/stylesheets/dmproadmap/base.scss
+++ b/lib/assets/stylesheets/dmproadmap/base.scss
@@ -37,8 +37,14 @@
 .inline { display: inline-block; }
 .centered { text-align: center; }
 .left-indent { margin-left: 15px; }
+.right-indent { margin-right: 15px; }
 .top-indent { margin-top: 25px; }
 
+.highlight-color-button {
+  background-color: $highlight-background-color;
+  color: $highlight-color;
+}
+
 .right {
   position: absolute;
   top: 15px;
@@ -97,16 +103,22 @@
   text-align: left;
   z-index: 2;
   top: 0;
+  right: 5px;
   margin-top: -5px;
   
   li {
     list-style: none;
     margin-bottom: 10px;
+    padding: 6px 15px;
     
     a {
       color: $white;
     }
   }
+  li.active, li:hover, li:focus {
+    background-color: $dark-grey;
+    border-radius: 3px;
+  }
 }
 .dropdown-large { width: 200px; }
 .dropdown-medium { width: 150px; }
@@ -251,6 +263,7 @@
           margin: 0;
           
           li {
+            position: relative;
             display: inline-block;
             color: $white;
             background-color: $primary-color;
@@ -278,20 +291,32 @@
               line-height: 20px;
             }
           }
-          .language-switcher {
+          #explore {
+            padding-right: 15px;
+            
             .caret {
               border-top: 4px solid $white;
               border-bottom: $white;
             }
+          }
+          #explore-dropdown {
+            position: absolute;
+            top: 12px;
+            left: 5px;
+            width: 150px;
             
-            #change-language-dropdown {
-              position: absolute;
-              top: 32px;
+            li {
+              display: block;
+              background-color: $medium-grey;
+              border: none;
+            }
+            li.active, li:hover, li:focus {
+              background-color: $dark-grey;
+              border-radius: 3px;
               
-              li {
-                display: block;
-                background-color: $medium-grey;
-                border: none;
+              a {
+                width: 100%;
+                color: $white;
               }
             }
           }
@@ -303,6 +328,7 @@
       top: 5px;
       right: 10px;
       color: white;
+      margin-top: 5px;
       
       a {
         color: white;