diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 9cd0db6..3077619 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,6 +1,4 @@
-<div class="page-header">
-  <h1>Resend confirmation instructions</h1>
-</div>
+<%= render :partial => "devise/shared/links" %>
 
 <%= simple_form_for(resource, 
     as: resource_name,
@@ -18,5 +16,3 @@
     <%= f.submit "Resend confirmation instructions", class: 'btn btn-primary' %>
   </div>
 <% end %>
-
-<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 2033862..faaa4b4 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,6 +1,4 @@
-<div class="page-header">
-  <h1>Forgot your password?</h1>
-</div>
+<%= render :partial => "devise/shared/links" %>
 
 <%= simple_form_for(resource, 
     as: resource_name,
@@ -18,5 +16,3 @@
     <%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
   </div>
 <% end %>
-
-<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 797d5f4..5c96662 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,6 +1,4 @@
-<div class="page-header">
-  <h1>Sign up</h1>
-</div>
+<%= render :partial => "devise/shared/links" %>
 
 <%= simple_form_for(resource, 
     as: resource_name, 
@@ -23,5 +21,3 @@
     <%= f.submit "Sign up", class: 'btn btn-primary' %>
   </div>
 <% end %>
-
-<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 2f1724e..0999d53 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,6 +1,4 @@
-<div class="page-header">
-  <h1>Sign in</h1>
-</div>
+<%= render :partial => "devise/shared/links" %>
 
 <%= simple_form_for(resource,
     as: resource_name,
@@ -20,5 +18,3 @@
     <%= f.submit "Sign in", class: 'btn btn-primary' %>
   </div>
 <% end %>
-
-<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index a9cd664..99e3e65 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -1,4 +1,5 @@
-<% semantic_navigation :devise_nav, html: { class: 'nav nav-pills pjax-nav' } do |n| %>
+<br />
+<% semantic_navigation :devise_nav, html: { class: 'nav nav-tabs pjax-nav' } do |n| %>
   <%= n.item "Sign in", link: new_session_path(resource_name) %>
   <%= n.item "Sign up", link: new_registration_path(resource_name) %>
   <%= n.item "Forgot your password?", link: new_password_path(resource_name) %>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index 6421c90..010d3d1 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,6 +1,4 @@
-<div class="page-header">
-  <h1>Resend unlock instructions</h1>
-</div>
+<%= render :partial => "devise/shared/links" %>
 
 <%= simple_form_for(resource,
     as: resource_name,
@@ -18,5 +16,3 @@
     <%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %>
   </div>
 <% end %>
-
-<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/shared/_bottom.html.erb b/app/views/shared/_bottom.html.erb
index 0e75dfe..fc92b33 100644
--- a/app/views/shared/_bottom.html.erb
+++ b/app/views/shared/_bottom.html.erb
@@ -2,7 +2,6 @@
   <div class="block">
     <p class="pull-right">
       <%= switch_user_select %>
-      <a href="#">Back to top</a>
     </p>
     
     <% semantic_navigation :footer_nav, html: { class: 'nav nav-pills pjax-nav' } do |n| %>