diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 82617b1..3190441 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -6,7 +6,7 @@
   <%= devise_error_messages! %>
 
   <div><%= f.label :email %><br />
-  <%= f.email_field :emaill, :autofocus => true %></div>
+  <%= f.email_field :email, :autofocus => true %></div>
 
   <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions'), class: 'btn btn-default' %></div>
 <% end %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index f1a7d98..e7bc0db 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -7,12 +7,12 @@
   <%= f.hidden_field :reset_password_token %>
 
   <div><%= f.label :password, t('.new_password', :default => 'New password') %><br />
-  <%= f.password_field :password %></div>
+  <%= f.password_field :password, :autofocus => true %></div>
 
   <div><%= f.label :password_confirmation, t('.confirm_new_password', :default => 'Confirm new password') %><br />
   <%= f.password_field :password_confirmation %></div>
 
-  <div><%= f.submit t('.change_my_password', :default => 'Change my password') %></div>
+  <div><%= f.submit t('.change_my_password', :default => 'Change my password'), class: 'btn btn-warning' %></div>
 <% end %>
 
 <%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index b3697c5..92e774e 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,6 +1,6 @@
 <div class="page-header">
   <h1><%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %></h1>
-
+</div>
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form-inline" }) do |f| %>
   <%= devise_error_messages! %>
 
@@ -77,6 +77,7 @@
   </div>
 <% end %>
 
+<hr />
 <h2><%= t('.cancel_my_account', :default => 'Cancel my account') %></h2>
 
 <p><%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete, class: 'btn btn-warning' %>.</p>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 9589646..587b4af 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -33,7 +33,7 @@
         <div class="form-row">
           <div class="field-container">
             <label>
-              <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+              <%= f.check_box :remember_me, class: "checkbox" %> <%= f.label :remember_me %>
             </label>
           </div>
           <div class="help-container">
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index 6a1e05d..e243d98 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -7,7 +7,7 @@
 <% end -%>
 
 <!-- <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %>
+<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name), class: 'btn btn-info' %>
 <% end -%> -->
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index 55edb1f..25b6abc 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,10 +1,12 @@
-<h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
-
+<div class="page-header">
+	<h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
+</div>
+	
 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
   <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <%= f.email_field :email, :autofocus => true %></div>
 
   <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions"), class: 'btn btn-primary' %></div>
 <% end %>
--
libgit2 0.21.2