diff --git a/.gitignore b/.gitignore
index 980c2b664..dd8c626f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .pt
 .*.sw*
 *~
+*.DS_Store
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index bfc1d162c..bfc96283d 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,23 +1,24 @@
 - content_for :title, "Sign in"
 
-= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-  %div
-    = f.label :login
-    %br
-    = f.text_field :login
+= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => "form-horizontal"}) do |f|
+  = devise_error_messages!
 
-  %div
-    = f.label :password
-    %br
-    = f.password_field :password
+  .control-group
+    = f.label :login, :class => "control-label"
+    .controls= f.text_field :login
+
+  .control-group
+    = f.label :password, :class => "control-label"
+    .controls= f.password_field :password
 
   - if devise_mapping.rememberable?
-    %div
-      = f.check_box :remember_me
-      = f.label :remember_me
+    .control-group
+      .controls
+        = f.check_box :remember_me
+        Remember me
 
-  %div
-    = f.submit "Sign in"
+  .form-actions
+    = f.submit "Sign in", :class => 'btn'
 
 
 = render "devise/shared/links"