diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index e0e1b71..973c8ab 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -6,7 +6,7 @@
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
-  <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div>
+  <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions'), class: 'btn btn-default' %></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 990d8a6..b3697c5 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
   <h1><%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %></h1>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form-inline" }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="row margin-left-none">
@@ -79,6 +79,6 @@
 
 <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 %>.</p>
+<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>
 
-<%= link_to t('devise.shared.links.back', :default => "Back"), :back %>
+<%= link_to t('devise.shared.links.back', :default => "Back"), :back, class: 'btn btn-default' %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 3ab42d7..a089f9a 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -2,7 +2,7 @@
   <h1><%= t('.sign_up', :default => "Sign up") %></h1>
 </div>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "form-inline" }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="row margin-left-none">
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 57539e2..9589646 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -2,13 +2,13 @@
   <h1><%= t('.sign_in', :default => "Sign in") %></h1>
 </div>
 
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "form-inline" }) do |f| %>
   <div class="row margin-left-none">
     <div class="form-table col-md-9">
       <div class="form-row">
         <div class="field-container">
-          <%= f.label :email %><br />
-          <%= f.email_field :email %>
+          <%= f.label :email, class: 'control-label' %><br />
+          <%= f.email_field :email, :autofocus => true, class: 'text-field form-control' %>
         </div>
         <div class="help-container">
           <p>
@@ -19,8 +19,8 @@
 
       <div class="form-row">
         <div class="field-container">
-          <%= f.label :password %><br />
-          <%= f.password_field :password %>
+          <%= f.label :password, class: 'control-label' %><br />
+          <%= f.password_field :password, class: 'text-field form-control' %>
         </div>
         <div class="help-container">
           <p>
@@ -32,7 +32,9 @@
       <% if devise_mapping.rememberable? -%>
         <div class="form-row">
           <div class="field-container">
-            <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+            <label>
+              <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+            </label>
           </div>
           <div class="help-container">
             <p>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index 02d0578..55edb1f 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -6,7 +6,7 @@
   <div><%= f.label :email %><br />
   <%= f.email_field :email %></div>
 
-  <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></div>
+  <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions"), class: 'btn btn-primary' %></div>
 <% end %>
 
 <%= render "devise/shared/links" %>
--
libgit2 0.21.2