diff --git a/app/views/profiles/edit.haml b/app/views/profiles/edit.haml
index 8e0cf9c96..2bd9b7c9c 100644
--- a/app/views/profiles/edit.haml
+++ b/app/views/profiles/edit.haml
@@ -14,11 +14,11 @@
 
 .container
   .row-fluid
-    .span8
+    .span7
       - content_for :submit_block do
         = link_to t('cancel'), local_or_remote_person_path(current_user.person), :class => "btn"
         = submit_tag t('.update_profile'), :class => "creation", :id => "update_profile", :class => "btn"
       = render :partial => 'edit', :locals => {:person => @person, 
         :profile => @profile, :aspect => @aspect, :step => @step}
-    .span4
+    .span5
 
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index ccb0c3bf3..65780fdcd 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -16,9 +16,9 @@
         = render 'shared/settings_nav'
 
   .row-fluid
-    .span8
+    .span7
       = render 'shared/add_remove_services'
 
-    .span4
+    .span5
       %p
         = t('.services_explanation')
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index a95f6a862..093e99414 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -16,7 +16,7 @@
         = render 'shared/settings_nav'
 
   .row-fluid
-    .span8
+    .span7
       .row-fluid
         .span6
           %h3
@@ -29,7 +29,7 @@
           = form_for 'user', :url => user_path, :html => { :method => :put } do |f|
             = f.error_messages
             .form-inline
-              = f.text_field :email, :value => @user.unconfirmed_email || @user.email
+              = f.text_field :email, :value => @user.unconfirmed_email || @user.email, :class => "span7"
               = f.submit t('.change_email'), :class => "btn"
           .small-horizontal-spacer
           - if @user.unconfirmed_email.present?
@@ -222,4 +222,4 @@
                     %p
                       = f.submit t('.close_account_text'), :class => "btn btn-danger", :id => "close_account_confirm", :data => { :confirm => t('are_you_sure_delete_account') }
 
-    .span4
+    .span5
diff --git a/app/views/users/privacy_settings.html.haml b/app/views/users/privacy_settings.html.haml
index c38dd3bf3..b163e3057 100644
--- a/app/views/users/privacy_settings.html.haml
+++ b/app/views/users/privacy_settings.html.haml
@@ -16,7 +16,7 @@
         = render 'shared/settings_nav'
 
   .row-fluid
-    .span8
+    .span7
       %h3
         = t('.ignored_users')
 
@@ -26,4 +26,4 @@
         = link_to t('.stop_ignoring'), block_path(block),
           :method => :delete
         %br
-    .span4
+    .span5