diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 51b5d5c7..06e5be19 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -7,44 +7,42 @@
- @admin_user.errors.full_messages.each do |msg|
%li= msg
- .span-24
- .span-11.colborder
- .field
- = f.label :name
- %br
- = f.text_field :name
- .field
- = f.label :email
- %br
- = f.text_field :email
- .field
- = f.label :password
- %br
- = f.password_field :password
- .field
- = f.label :password_confirmation
- %br
- = f.password_field :password_confirmation
- .field.prepend-top
- = f.check_box :admin
- = f.label :admin
- .span-11
- .field.prepend-top
- = f.text_field :projects_limit, :class => "small_input"
- = f.label :projects_limit
+ .form-row
+ = f.label :name
+ %br
+ = f.text_field :name
+ .form-row
+ = f.label :email
+ %br
+ = f.text_field :email
+ .form-row
+ = f.label :password
+ %br
+ = f.password_field :password
+ .form-row
+ = f.label :password_confirmation
+ %br
+ = f.password_field :password_confirmation
+ .form-row
+ = f.check_box :admin
+ = f.label :admin
- .field
- = f.label :skype
- %br
- = f.text_field :skype
- .field
- = f.label :linkedin
- %br
- = f.text_field :linkedin
- .field
- = f.label :twitter
- %br
- = f.text_field :twitter
+ .form-row
+ = f.text_field :projects_limit, :class => "small_input"
+ = f.label :projects_limit
+
+ .form-row
+ = f.label :skype
+ %br
+ = f.text_field :skype
+ .form-row
+ = f.label :linkedin
+ %br
+ = f.text_field :linkedin
+ .form-row
+ = f.label :twitter
+ %br
+ = f.text_field :twitter
.clear
%br
.actions
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index cbec1060..e12cfc77 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -21,4 +21,5 @@
%br
= paginate @admin_users
+
= link_to 'New User', new_admin_user_path
diff --git a/app/views/keys/_form.html.haml b/app/views/keys/_form.html.haml
index 7d3e14ef..a49164cf 100644
--- a/app/views/keys/_form.html.haml
+++ b/app/views/keys/_form.html.haml
@@ -5,12 +5,12 @@
- @key.errors.full_messages.each do |msg|
%li= msg
- .span-6
+ .form-row
= f.label :title
= f.text_field :title, :style => "width:300px"
- .span-6
+ .form-row
= f.label :key
= f.text_area :key, :style => "width:300px; height:130px"
- .span-6
+ .form-row
= f.submit 'Save', :class => "lbutton vm"
diff --git a/app/views/profile/password.html.haml b/app/views/profile/password.html.haml
index f77d3855..3e82143d 100644
--- a/app/views/profile/password.html.haml
+++ b/app/views/profile/password.html.haml
@@ -7,11 +7,11 @@
- @user.errors.full_messages.each do |msg|
%li= msg
- .div
+ .form-row
= f.label :password
%br
= f.password_field :password
- .div
+ .form-row
= f.label :password_confirmation
%br
= f.password_field :password_confirmation