diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index f53e0e50..2ad1bf94 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -17,6 +17,8 @@ $baseLineHeight: 18px !default;
 @import "gitlab_bootstrap/variables.scss";
 @import "gitlab_bootstrap/fonts.scss";
 @import "gitlab_bootstrap/mixins.scss";
+@import "gitlab_bootstrap/avatar.scss";
+@import "gitlab_bootstrap/nav.scss";
 @import "gitlab_bootstrap/common.scss";
 @import "gitlab_bootstrap/typography.scss";
 @import "gitlab_bootstrap/buttons.scss";
diff --git a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
new file mode 100644
index 00000000..de1fb155
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
@@ -0,0 +1,8 @@
+/** AVATARS **/
+img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
+img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
+img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
+img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
+img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
+img.lil_av { padding-left: 4px; padding-right: 3px; }
+img.small { width: 80px; }
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 26681c65..4d1b6446 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -95,7 +95,7 @@
 
     form {
       margin-bottom: 0;
-      margin-top: 3px;
+      margin-top: 0;
     }
 
     .btn-tiny {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index a20c9b1b..03497e32 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -67,6 +67,7 @@
     @extend .btn-primary;
   }
 
+  &.btn-close,
   &.btn-remove {
     @extend .btn-danger;
     border-color: #BD362F;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index f6b48816..cb292bc7 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -9,7 +9,6 @@
 
 /** COMMON CLASSES **/
 .left { float:left }
-.right { float:right!important }
 .append-bottom-10 { margin-bottom:10px }
 .append-bottom-20 { margin-bottom:20px }
 .prepend-top-10 { margin-top:10px }
@@ -22,82 +21,13 @@
 .light { color: #888 }
 .tiny { font-weight: normal }
 
-/** PILLS & TABS**/
-.nav-pills {
-  .active a {
-    background: $primary_color;
-  }
-
-  > li > a {
-    @include border-radius(0);
-  }
-  &.nav-stacked {
-    > li > a {
-      border-left: 4px solid #EEE;
-      padding: 12px;
-    }
-    > .active > a {
-      border-color: #29B;
-      border-radius: 0;
-      background: #F1F1F1;
-      color: $style_color;
-      font-weight: bold;
-    }
-  }
-}
-
-.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
-
-
-
-/**
- * nav-tabs
- *
- */
-.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
-.nav.nav-tabs {
-  li {
-    > a {
-      padding: 8px 20px;
-      margin-right: 7px;
-      line-height: 20px;
-      border-color: #EEE;
-      color: #888;
-      border-bottom: 1px solid #ddd;
-      .badge {
-        background-color: #eee;
-        color: #888;
-        text-shadow: 0 1px 1px #fff;
-      }
-      i[class^="icon-"] {
-        line-height: 14px;
-      }
-    }
-    &.active {
-      > a {
-        border-color: #CCC;
-        border-bottom: 1px solid #fff;
-        color: #333;
-      }
-    }
-  }
-
-  &.nav-small-tabs > li > a { padding: 6px 9px; }
-}
 
 /** ALERT MESSAGES **/
-.alert-message { @extend .alert; }
-.alert-messag.success { @extend .alert-success; }
-.alert-message.error { @extend .alert-error; }
-
-/** AVATARS **/
-img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
-img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
-img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
-img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
-img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
-img.lil_av { padding-left: 4px; padding-right: 3px; }
-img.small { width: 80px; }
+.alert.alert-disabled {
+  background: #EEE;
+  color: #777;
+  border-color: #DDD;
+}
 
 /** HELPERS **/
 .nothing_here_message {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/nav.scss b/app/assets/stylesheets/gitlab_bootstrap/nav.scss
new file mode 100644
index 00000000..2eaef61c
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/nav.scss
@@ -0,0 +1,65 @@
+/**
+ * nav-pills
+ *
+ */
+.nav-pills {
+  .active a {
+    background: $primary_color;
+  }
+
+  > li > a {
+    @include border-radius(0);
+  }
+  &.nav-stacked {
+    > li > a {
+      border-left: 4px solid #EEE;
+      padding: 12px;
+    }
+    > .active > a {
+      border-color: #29B;
+      border-radius: 0;
+      background: #F1F1F1;
+      color: $style_color;
+      font-weight: bold;
+    }
+  }
+}
+
+.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
+
+
+
+/**
+ * nav-tabs
+ *
+ */
+.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
+.nav.nav-tabs {
+  li {
+    > a {
+      padding: 8px 20px;
+      margin-right: 7px;
+      line-height: 20px;
+      border-color: #EEE;
+      color: #888;
+      border-bottom: 1px solid #ddd;
+      .badge {
+        background-color: #eee;
+        color: #888;
+        text-shadow: 0 1px 1px #fff;
+      }
+      i[class^="icon-"] {
+        line-height: 14px;
+      }
+    }
+    &.active {
+      > a {
+        border-color: #CCC;
+        border-bottom: 1px solid #fff;
+        color: #333;
+      }
+    }
+  }
+
+  &.nav-small-tabs > li > a { padding: 6px 9px; }
+}
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 7472cb09..ff810147 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -127,7 +127,7 @@
   .btn-new-mr {
     @extend .btn-info;
     @extend .small;
-    @extend .right;
+    @extend .pull-right;
     margin: -3px;
   }
 }
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index b29d2991..895e9dfa 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -258,7 +258,7 @@ ul.notes {
     }
 
     .attachment {
-      @extend .right;
+      @extend .pull-right;
       position: relative;
       width: 350px;
       height: 50px;
@@ -274,7 +274,7 @@ ul.notes {
       }
     }
     .notify_options {
-      @extend .right;
+      @extend .pull-right;
     }
   }
   .note_text_and_preview {
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index b6db65ad..28df1b5a 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -4,7 +4,7 @@
   }
 
   .side {
-    @extend .right;
+    @extend .pull-right;
 
     .projects_box {
       > .title {
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 4f0a8071..05303e86 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -43,7 +43,7 @@ module ProjectsHelper
     tm = project.team_member_by_id(author)
 
     if tm
-      link_to author_html, project_team_member_path(project, tm), class: "author_link"
+      link_to author_html, project_team_member_path(project, tm.user_username), class: "author_link"
     else
       author_html
     end.html_safe
diff --git a/app/models/users_project.rb b/app/models/users_project.rb
index 183878cb..94edfd9e 100644
--- a/app/models/users_project.rb
+++ b/app/models/users_project.rb
@@ -33,7 +33,7 @@ class UsersProject < ActiveRecord::Base
   validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true
   validates :project, presence: true
 
-  delegate :name, :email, to: :user, prefix: true
+  delegate :name, :username, :email, to: :user, prefix: true
 
   scope :guests, where(project_access: GUEST)
   scope :reporters, where(project_access: REPORTER)
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3698778e..46a87629 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -31,7 +31,7 @@
     - @projects.each do |project|
       %p
         = link_to project.name_with_namespace, [:admin, project]
-        %span.light.right
+        %span.light.pull-right
           = time_ago_in_words project.created_at
           ago
 
@@ -42,7 +42,7 @@
       %p
         = link_to [:admin, user] do
           = user.name
-        %span.light.right
+        %span.light.pull-right
           = time_ago_in_words user.created_at
           ago
 
@@ -51,25 +51,25 @@
     %hr
     %p
       Issues
-      %span.light.right
+      %span.light.pull-right
         = Issue.count
     %p
       Merge Requests
-      %span.light.right
+      %span.light.pull-right
         = MergeRequest.count
     %p
       Notes
-      %span.light.right
+      %span.light.pull-right
         = Note.count
     %p
       Snippets
-      %span.light.right
+      %span.light.pull-right
         = Snippet.count
     %p
       SSH Keys
-      %span.light.right
+      %span.light.pull-right
         = Key.count
     %p
       Milestones
-      %span.light.right
+      %span.light.pull-right
         = Milestone.count
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index 6ec520e7..dce04495 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @group.errors.full_messages.first
   .clearfix.group_name_holder
     = f.label :name do
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index f1e857ec..25ce6657 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -4,7 +4,7 @@
     allows you to keep projects organized.
     Use groups for uniting related projects.
 
-  = link_to 'New Group', new_admin_group_path, class: "btn btn-small right"
+  = link_to 'New Group', new_admin_group_path, class: "btn btn-small pull-right"
 %br
 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
   = text_field_tag :name, params[:name], class: "xlarge"
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index f8d1dfcf..60c6fa5a 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @group.errors.full_messages.first
   .clearfix
     = f.label :name do
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index b5bdeeaa..6ae8a75d 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -14,7 +14,7 @@
     %td
       = @group.name
       &nbsp;
-      = link_to edit_admin_group_path(@group), class: "btn btn-small right" do
+      = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
         %i.icon-edit
         Rename
   %tr
@@ -29,7 +29,7 @@
         Owner:
     %td
       = @group.owner_name
-      .right
+      .pull-right
         = link_to "#", class: "btn btn-small change-owner-link" do
           %i.icon-edit
           Change owner
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 412a7ff2..acbf7a10 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -7,7 +7,7 @@
 
 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
   -if @hook.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       - @hook.errors.full_messages.each do |msg|
         %p= msg
   .clearfix
@@ -33,7 +33,7 @@
         %td
           = link_to admin_hook_path(hook) do
             %strong= hook.url
-          = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small right"
+          = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small pull-right"
         %td POST
         %td
-          = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small right"
+          = link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small pull-right"
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index c8be2ffa..9ddd781c 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -15,7 +15,7 @@
       .file_title
         %i.icon-file
         githost.log
-        .right
+        .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
@@ -29,7 +29,7 @@
       .file_title
         %i.icon-file
         application.log
-        .right
+        .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
@@ -43,7 +43,7 @@
       .file_title
         %i.icon-file
         production.log
-        .right
+        .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
@@ -57,7 +57,7 @@
       .file_title
         %i.icon-file
         sidekiq.log
-        .right
+        .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml
index 6342802c..ebf69924 100644
--- a/app/views/admin/projects/_form.html.haml
+++ b/app/views/admin/projects/_form.html.haml
@@ -1,6 +1,6 @@
 = form_for [:admin, project] do |f|
   -if project.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - project.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index f42e1f3a..15b27782 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   Projects
-  = link_to 'New Project', new_project_path, class: "btn btn-small right"
+  = link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
 
 %hr
 
@@ -51,7 +51,7 @@
             - else
               %i.icon-lock.cgreen
             = link_to project.name_with_namespace, [:admin, project]
-            .right
+            .pull-right
               = link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
               = link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
         - if @projects.blank?
diff --git a/app/views/admin/projects/members/_form.html.haml b/app/views/admin/projects/members/_form.html.haml
index bbd419be..80412029 100644
--- a/app/views/admin/projects/members/_form.html.haml
+++ b/app/views/admin/projects/members/_form.html.haml
@@ -1,6 +1,6 @@
 = form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member)  do |f|
   -if @team_member_relation.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @team_member_relation.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index fc3ed1e8..b9294bba 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   Project: #{@project.name_with_namespace}
-  = link_to edit_admin_project_path(@project), class: "btn right" do
+  = link_to edit_admin_project_path(@project), class: "btn pull-right" do
     %i.icon-edit
     Edit
 
diff --git a/app/views/admin/teams/edit.html.haml b/app/views/admin/teams/edit.html.haml
index d024d823..9282398c 100644
--- a/app/views/admin/teams/edit.html.haml
+++ b/app/views/admin/teams/edit.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for @team, url: admin_team_path(@team), method: :put do |f|
   - if @team.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @team.errors.full_messages.first
   .clearfix.team_name_holder
     = f.label :name do
diff --git a/app/views/admin/teams/index.html.haml b/app/views/admin/teams/index.html.haml
index 1d54a27f..1f2f4763 100644
--- a/app/views/admin/teams/index.html.haml
+++ b/app/views/admin/teams/index.html.haml
@@ -3,7 +3,7 @@
   %small
     simple Teams description
 
-  = link_to 'New Team', new_admin_team_path, class: "btn btn-small right"
+  = link_to 'New Team', new_admin_team_path, class: "btn btn-small pull-right"
   %br
 
 = form_tag admin_teams_path, method: :get, class: 'form-inline' do
diff --git a/app/views/admin/teams/members/_form.html.haml b/app/views/admin/teams/members/_form.html.haml
index 098118a6..f1388aab 100644
--- a/app/views/admin/teams/members/_form.html.haml
+++ b/app/views/admin/teams/members/_form.html.haml
@@ -1,6 +1,6 @@
 = form_tag admin_team_member_path(@team, @member), method: :put do
   -if @member.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @member.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/admin/teams/new.html.haml b/app/views/admin/teams/new.html.haml
index 7483f1bf..5d55a797 100644
--- a/app/views/admin/teams/new.html.haml
+++ b/app/views/admin/teams/new.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for @team, url: admin_teams_path do |f|
   - if @team.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @team.errors.full_messages.first
   .clearfix
     = f.label :name do
diff --git a/app/views/admin/teams/projects/_form.html.haml b/app/views/admin/teams/projects/_form.html.haml
index 9ba406ea..5b79d518 100644
--- a/app/views/admin/teams/projects/_form.html.haml
+++ b/app/views/admin/teams/projects/_form.html.haml
@@ -1,6 +1,6 @@
 = form_tag admin_team_project_path(@team, @project), method: :put do
   -if @project.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @project.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/admin/teams/show.html.haml b/app/views/admin/teams/show.html.haml
index 4d27f31b..e5d07998 100644
--- a/app/views/admin/teams/show.html.haml
+++ b/app/views/admin/teams/show.html.haml
@@ -14,7 +14,7 @@
     %td
       = @team.name
       &nbsp;
-      = link_to edit_admin_team_path(@team), class: "btn btn-small right" do
+      = link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do
         %i.icon-edit
         Rename
   %tr
@@ -23,7 +23,7 @@
         Owner:
     %td
       = @team.owner.name
-      .right
+      .pull-right
         = link_to "#", class: "btn btn-small change-owner-link" do
           %i.icon-edit
           Change owner
@@ -42,7 +42,7 @@
 %fieldset
   %legend
     Members (#{@team.members.count})
-    %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small right", id: :add_members_to_team
+    %span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small pull-right", id: :add_members_to_team
   - if @team.members.any?
     %table#members_list
       %thead
@@ -67,7 +67,7 @@
 %fieldset
   %legend
     Projects (#{@team.projects.count})
-    %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small right", id: :assign_projects_to_team
+    %span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small pull-right", id: :assign_projects_to_team
   - if @team.projects.any?
     %table#projects_list
       %thead
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index d8828183..87d6309a 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   Users
-  = link_to 'New User', new_admin_user_path, class: "btn btn-small right"
+  = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
 %br
 
 = form_tag admin_users_path, method: :get, class: 'form-inline' do
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 69062aa3..08201abd 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -4,7 +4,7 @@
     %small Blocked
   - if @admin_user.admin
     %small Administrator
-  = link_to edit_admin_user_path(@admin_user), class: "btn right" do
+  = link_to edit_admin_user_path(@admin_user), class: "btn pull-right" do
     %i.icon-edit
     Edit
 
diff --git a/app/views/blame/_head.html.haml b/app/views/blame/_head.html.haml
index 85da1805..ef9e6c9c 100644
--- a/app/views/blame/_head.html.haml
+++ b/app/views/blame/_head.html.haml
@@ -3,5 +3,5 @@
     = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
   = nav_link(controller: :refs) do
     = link_to 'Source', project_tree_path(@project, @ref)
-  %li.right
+  %li.pull-right
     = render "shared/clone_panel"
diff --git a/app/views/commit/huge_commit.html.haml b/app/views/commit/huge_commit.html.haml
index ba97a7c5..7f0bcf38 100644
--- a/app/views/commit/huge_commit.html.haml
+++ b/app/views/commit/huge_commit.html.haml
@@ -1,3 +1,3 @@
 = render "commits/commit_box"
-.alert-message.block-message.error
+.alert.alert-error
   %h4 Commit diffs are too big to be displayed
diff --git a/app/views/commit/show.html.haml b/app/views/commit/show.html.haml
index 6bee6493..485f2d1e 100644
--- a/app/views/commit/show.html.haml
+++ b/app/views/commit/show.html.haml
@@ -1,6 +1,6 @@
 = render "commits/commit_box"
 
-%p.right.cgray
+%p.pull-right.cgray
   This commit has
   %span.cgreen #{@commit.stats.additions} additions
   and
diff --git a/app/views/commits/_commit_box.html.haml b/app/views/commits/_commit_box.html.haml
index 4767c493..4c80c13c 100644
--- a/app/views/commits/_commit_box.html.haml
+++ b/app/views/commits/_commit_box.html.haml
@@ -1,6 +1,6 @@
 .ui-box.ui-box-show
   .ui-box-head
-    .right
+    .pull-right
       - if @notes_count > 0
         %span.btn.disabled.grouped
           %i.icon-comment
diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml
index 5294d196..76f9f267 100644
--- a/app/views/commits/_diffs.html.haml
+++ b/app/views/commits/_diffs.html.haml
@@ -1,5 +1,5 @@
 - if @suppress_diff
-  .alert-message.block-message
+  .alert.alert-block
     %p
       %strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed.
     %p To prevent performance issue we rejected diff information.
@@ -25,7 +25,7 @@
             %span= diff.old_path
 
             - if @commit.prev_commit
-              = link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn right view-file'} do
+              = link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn pull-right view-file'} do
                 View file @
                 %span.commit-short-id= @commit.short_id(6)
           - else
@@ -33,7 +33,7 @@
             - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
               %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
 
-            = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny right view-file'} do
+            = link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
               View file @
               %span.commit-short-id= @commit.short_id(6)
 
diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml
index a5f3fdf5..02debe42 100644
--- a/app/views/commits/_head.html.haml
+++ b/app/views/commits/_head.html.haml
@@ -22,7 +22,7 @@
 
 
   - if current_controller?(:commits) && current_user.private_token
-    %li.right
+    %li.pull-right
       %span.rss-icon
         = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
           = image_tag "rss_ui.png", title: "feed"
diff --git a/app/views/dashboard/_filter.html.haml b/app/views/dashboard/_filter.html.haml
index 4624af79..82e679d5 100644
--- a/app/views/dashboard/_filter.html.haml
+++ b/app/views/dashboard/_filter.html.haml
@@ -25,9 +25,9 @@
           %li{class: ("active" if params[:project_id] == project.id.to_s)}
             = link_to dashboard_filter_path(entity, project_id: project.id) do
               = project.name_with_namespace
-              %small.right= entities_per_project(project, entity)
+              %small.pull-right= entities_per_project(project, entity)
 
   %fieldset
     %hr
-    = link_to "Reset", dashboard_filter_path(entity), class: 'btn right'
+    = link_to "Reset", dashboard_filter_path(entity), class: 'btn pull-right'
 
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 535f0349..ba8d3029 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -4,7 +4,7 @@
     %small
       (#{groups.count})
     - if current_user.can_create_group?
-      %span.right
+      %span.pull-right
         = link_to new_group_path, class: "btn btn-tiny info" do
           %i.icon-plus
           New Group
@@ -13,6 +13,6 @@
       %li
         = link_to group_path(id: group.path), class: dom_class(group) do
           %strong.well-title= truncate(group.name, length: 35)
-        %span.right.light
+        %span.pull-right.light
           - if group.owner == current_user
             %i.icon-wrench
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index a5396a00..30fb7268 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -4,7 +4,7 @@
     %small
       (#{@projects_count})
     - if current_user.can_create_project?
-      %span.right
+      %span.pull-right
         = link_to new_project_path, class: "btn btn-tiny info" do
           %i.icon-plus
           New Project
diff --git a/app/views/dashboard/_teams.html.haml b/app/views/dashboard/_teams.html.haml
index 1be6e25c..f5611585 100644
--- a/app/views/dashboard/_teams.html.haml
+++ b/app/views/dashboard/_teams.html.haml
@@ -3,7 +3,7 @@
     Teams
     %small
       (#{@teams.count})
-    %span.right
+    %span.pull-right
       = link_to new_team_path, class: "btn btn-tiny info" do
         %i.icon-plus
         New Team
@@ -12,7 +12,7 @@
       %li
         = link_to team_path(id: team.path), class: dom_class(team) do
           %strong.well-title= truncate(team.name, length: 35)
-        %span.right.light
+        %span.pull-right.light
           - if team.owner == current_user
             %i.icon-wrench
           - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 307d0d85..affe01a7 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   Issues
   %small (assigned to you)
-  %small.right #{@issues.total_count} issues
+  %small.pull-right #{@issues.total_count} issues
 
 %hr
 
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 0c4d6e0a..a311729d 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   Merge Requests
   %small (authored by or assigned to you)
-  %small.right #{@merge_requests.total_count} merge requests
+  %small.pull-right #{@merge_requests.total_count} merge requests
 
 %hr
 .row
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 94b319fe..8e21b0c7 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -3,7 +3,7 @@
   %span
     (#{@projects.total_count})
   - if current_user.can_create_project?
-    %span.right
+    %span.pull-right
       = link_to new_project_path, class: "btn btn-tiny info" do
         %i.icon-plus
         New Project
@@ -42,7 +42,7 @@
             %small.light
               %strong Last activity:
               %span= project_last_activity(project)
-          .right.light
+          .pull-right.light
             - if project.owner == current_user
               %i.icon-wrench
             - tm = project.team.get_tm(current_user.id)
diff --git a/app/views/deploy_keys/_form.html.haml b/app/views/deploy_keys/_form.html.haml
index 4deeb0e8..5fb83021 100644
--- a/app/views/deploy_keys/_form.html.haml
+++ b/app/views/deploy_keys/_form.html.haml
@@ -1,7 +1,7 @@
 %div
   = form_for [@project, @key], url: project_deploy_keys_path do |f|
     -if @key.errors.any?
-      .alert-message.block-message.error
+      .alert.alert-error
         %ul
           - @key.errors.full_messages.each do |msg|
             %li= msg
diff --git a/app/views/deploy_keys/_show.html.haml b/app/views/deploy_keys/_show.html.haml
index 68b00568..63505435 100644
--- a/app/views/deploy_keys/_show.html.haml
+++ b/app/views/deploy_keys/_show.html.haml
@@ -8,5 +8,5 @@
       = time_ago_in_words(key.created_at)
       ago
   %td
-    = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small right"
+    = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
 
diff --git a/app/views/deploy_keys/show.html.haml b/app/views/deploy_keys/show.html.haml
index 4a864fae..227afecb 100644
--- a/app/views/deploy_keys/show.html.haml
+++ b/app/views/deploy_keys/show.html.haml
@@ -10,5 +10,5 @@
     &larr; To keys list
 %hr
 %pre= @key.key
-.right
+.pull-right
   = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index 6ca0c5d8..e5800025 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -9,4 +9,4 @@
     = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
   %div
     = f.submit "Change my password", class: "btn btn-primary"
-    .right= render partial: "devise/shared/links"
+    .pull-right= render partial: "devise/shared/links"
diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml
index a4060130..7968b0e9 100644
--- a/app/views/devise/sessions/_new_ldap.html.haml
+++ b/app/views/devise/sessions/_new_ldap.html.haml
@@ -25,5 +25,5 @@
         %span Remember me
   %br/
   = f.submit "Sign in", :class => "btn-primary btn"
-  .right
+  .pull-right
     = render :partial => "devise/shared/links"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 0a252e25..7ea41876 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -12,7 +12,7 @@
           %span Remember me
     %br/
     = f.submit "Sign in", :class => "btn-primary btn wide"
-    .right
+    .pull-right
       = link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
     %br/
     %br/
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 191aed07..719f6c37 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -1,6 +1,6 @@
 - if event.proper?
   %div.event-item
-    %span.cgray.right
+    %span.cgray.pull-right
       #{time_ago_in_words(event.created_at)} ago.
 
     = image_tag gravatar_icon(event.author_email), class: "avatar s24"
diff --git a/app/views/groups/_filter.html.haml b/app/views/groups/_filter.html.haml
index c8b0ad0f..c14fc8e5 100644
--- a/app/views/groups/_filter.html.haml
+++ b/app/views/groups/_filter.html.haml
@@ -25,9 +25,9 @@
           %li{class: ("active" if params[:project_id] == project.id.to_s)}
             = link_to group_filter_path(entity, project_id: project.id) do
               = project.name_with_namespace
-              %small.right= entities_per_project(project, entity)
+              %small.pull-right= entities_per_project(project, entity)
 
   %fieldset
     %hr
-    = link_to "Reset", group_filter_path(entity), class: 'btn right'
+    = link_to "Reset", group_filter_path(entity), class: 'btn pull-right'
 
diff --git a/app/views/groups/_people_filter.html.haml b/app/views/groups/_people_filter.html.haml
index 79a1b01a..901a037a 100644
--- a/app/views/groups/_people_filter.html.haml
+++ b/app/views/groups/_people_filter.html.haml
@@ -6,9 +6,9 @@
         %li{class: ("active" if params[:project_id] == project.id.to_s)}
           = link_to people_group_path(@group, project_id: project.id) do
             = project.name_with_namespace
-            %small.right= project.users.count
+            %small.pull-right= project.users.count
 
   %fieldset
     %hr
-    = link_to "Reset", people_group_path(@group), class: 'btn right'
+    = link_to "Reset", people_group_path(@group), class: 'btn pull-right'
 
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index b7732c50..4fa4a177 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -4,7 +4,7 @@
     %small
       (#{projects.count})
     - if can? current_user, :manage_group, @group
-      %span.right
+      %span.pull-right
         = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
           %i.icon-plus
           New Project
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 9e8642f3..94682bdd 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   Issues
   %small (assigned to you)
-  %small.right #{@issues.total_count} issues
+  %small.pull-right #{@issues.total_count} issues
 
 %hr
 .row
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 0c4d6e0a..a311729d 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   Merge Requests
   %small (authored by or assigned to you)
-  %small.right #{@merge_requests.total_count} merge requests
+  %small.pull-right #{@merge_requests.total_count} merge requests
 
 %hr
 .row
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 224962df..73be474e 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for @group do |f|
   - if @group.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @group.errors.full_messages.first
   .clearfix
     = f.label :name do
diff --git a/app/views/groups/people.html.haml b/app/views/groups/people.html.haml
index 0bceeaa3..3e4eb082 100644
--- a/app/views/groups/people.html.haml
+++ b/app/views/groups/people.html.haml
@@ -16,5 +16,5 @@
             %strong= user.name
             %span.cgray= user.email
             - if @group.owner == user
-              %span.btn.btn-small.disabled.right Group Owner
+              %span.btn.btn-small.disabled.pull-right Group Owner
 
diff --git a/app/views/help/_layout.html.haml b/app/views/help/_layout.html.haml
index 3839be27..fa5e3a30 100644
--- a/app/views/help/_layout.html.haml
+++ b/app/views/help/_layout.html.haml
@@ -30,5 +30,5 @@
         %li
           %strong= link_to "Public Access", help_public_access_path
 
-  .span9.right
+  .span9.pull-right
     = yield
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 28791b32..1a4411c8 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   GITLAB
-  .right
+  .pull-right
     %span= Gitlab::Version
     %small= Gitlab::Revision
 %hr
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index 3d814ab4..88a5a7dc 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -10,7 +10,7 @@
 
 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
   -if @hook.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       - @hook.errors.full_messages.each do |msg|
         %p= msg
   .clearfix
@@ -37,6 +37,6 @@
           &rarr;
           %span.monospace= hook.url
         %td
-          .right
+          .pull-right
             = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
             = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
diff --git a/app/views/issues/_filter.html.haml b/app/views/issues/_filter.html.haml
index 779e55bb..21efaa53 100644
--- a/app/views/issues/_filter.html.haml
+++ b/app/views/issues/_filter.html.haml
@@ -16,5 +16,5 @@
 
   %fieldset
     %hr
-    = link_to "Reset", project_issues_path(@project), class: 'btn right'
+    = link_to "Reset", project_issues_path(@project), class: 'btn pull-right'
 
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index 16d1b163..6d7613a7 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -2,7 +2,7 @@
   %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
   = form_for [@project, @issue] do |f|
     -if @issue.errors.any?
-      .alert-message.block-message.error
+      .alert.alert-error
         - @issue.errors.full_messages.each do |msg|
           %span= msg
           %br
diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml
index 4294503c..7e0b2cde 100644
--- a/app/views/issues/_head.html.haml
+++ b/app/views/issues/_head.html.haml
@@ -5,7 +5,7 @@
     = link_to 'Milestones', project_milestones_path(@project), class: "tab"
   = nav_link(controller: :labels) do
     = link_to 'Labels', project_labels_path(@project), class: "tab"
-  %li.right
+  %li.pull-right
     %span.rss-icon
       = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
         = image_tag "rss_ui.png", title: "feed"
diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml
index 8821dbb8..3bbd293d 100644
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
@@ -4,7 +4,7 @@
 - if @issues.present?
   %li.bottom
     .left= paginate @issues, remote: true, theme: "gitlab"
-    .right
+    .pull-right
       %span.issue_counter #{@issues.total_count}
       issues for this filter
 - else
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index 9f543ef9..fa888618 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -2,7 +2,7 @@
   - if controller.controller_name == 'issues'
     .issue_check
       = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
-  .right
+  .pull-right
     - if issue.notes.any?
       %span.btn.btn-small.disabled.grouped
         %i.icon-comment
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index a3fb0335..875f29e2 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -3,16 +3,16 @@
   %h3.page_title
     Issues
     %span (<span class=issue_counter>#{@issues.total_count}</span>)
-    .right
+    .pull-right
       .span5
         - if can? current_user, :write_issue, @project
-          = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "right btn btn-primary", title: "New Issue", id: "new_issue_link" do
+          = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-primary pull-right", title: "New Issue", id: "new_issue_link" do
             %i.icon-plus
             New Issue
-        = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right  do
+        = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right'  do
           = hidden_field_tag :project_id, @project.id, { id: 'project_id' }
           = hidden_field_tag :status, params[:status]
-          = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib search-text-input' }
+          = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 pull-right neib search-text-input' }
 
   .clearfix
 
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 6bf78929..474955cc 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -5,7 +5,7 @@
     created at
     = @issue.created_at.stamp("Aug 21, 2011")
 
-  %span.right
+  %span.pull-right
     - if can?(current_user, :admin_project, @project) || @issue.author == current_user
       - if @issue.closed
         = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put,  class: "btn grouped reopen_issue"
@@ -16,7 +16,7 @@
         %i.icon-edit
         Edit
 
-.right
+.pull-right
   .span3#votes= render 'votes/votes_block', votable: @issue
 
 .back_link
@@ -42,7 +42,7 @@
       %cite.cgray and attached to milestone
       %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
 
-    .right
+    .pull-right
       - @issue.labels.each do |label|
         %span.label
           %i.icon-tag
diff --git a/app/views/kaminari/admin/_paginator.html.haml b/app/views/kaminari/admin/_paginator.html.haml
index 6f9fb332..40b330fe 100644
--- a/app/views/kaminari/admin/_paginator.html.haml
+++ b/app/views/kaminari/admin/_paginator.html.haml
@@ -10,7 +10,7 @@
     %ul
       = prev_page_tag unless current_page.first?
       - each_page do |page|
-        - if page.left_outer? || page.right_outer? || page.inside_window?
+        - if page.left_outer? || page.pull-right_outer? || page.inside_window?
           = page_tag page
         - elsif !page.was_truncated?
           = gap_tag
diff --git a/app/views/kaminari/gitlab/_paginator.html.haml b/app/views/kaminari/gitlab/_paginator.html.haml
index 6dd5a578..2fe4c183 100644
--- a/app/views/kaminari/gitlab/_paginator.html.haml
+++ b/app/views/kaminari/gitlab/_paginator.html.haml
@@ -9,7 +9,7 @@
   %nav.gitlab_pagination
     = prev_page_tag
     - each_page do |page|
-      - if page.left_outer? || page.right_outer? || page.inside_window?
+      - if page.left_outer? || page.pull-right_outer? || page.inside_window?
         = page_tag page
       - elsif !page.was_truncated?
         = gap_tag
diff --git a/app/views/keys/_form.html.haml b/app/views/keys/_form.html.haml
index b60ad7df..fe26216b 100644
--- a/app/views/keys/_form.html.haml
+++ b/app/views/keys/_form.html.haml
@@ -1,7 +1,7 @@
 %div
   = form_for @key do |f|
     -if @key.errors.any?
-      .alert-message.block-message.error
+      .alert.alert-error
         %ul
           - @key.errors.full_messages.each do |msg|
             %li= msg
diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml
index 9e85e622..52bbea6f 100644
--- a/app/views/keys/_show.html.haml
+++ b/app/views/keys/_show.html.haml
@@ -8,5 +8,5 @@
       = time_ago_in_words(key.created_at)
       ago
   %td
-    = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key right"
+    = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
 
diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml
index f5a8283a..7730b344 100644
--- a/app/views/keys/index.html.haml
+++ b/app/views/keys/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   SSH Keys
-  = link_to "Add new", new_key_path, class: "btn right"
+  = link_to "Add new", new_key_path, class: "btn pull-right"
 
 %hr
 %p.slead
diff --git a/app/views/keys/show.html.haml b/app/views/keys/show.html.haml
index 089d0558..059fe5e5 100644
--- a/app/views/keys/show.html.haml
+++ b/app/views/keys/show.html.haml
@@ -10,5 +10,5 @@
 %hr
 
 %pre= @key.key
-.right
+.pull-right
   = link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"
diff --git a/app/views/labels/_label.html.haml b/app/views/labels/_label.html.haml
index 6e223e8e..027b041d 100644
--- a/app/views/labels/_label.html.haml
+++ b/app/views/labels/_label.html.haml
@@ -2,7 +2,7 @@
   %strong
     %i.icon-tag
     = label.name
-  .right
+  .pull-right
     = link_to project_issues_path(label_name: label.name) do
       %strong
         = pluralize(label.count, 'issue')
diff --git a/app/views/merge_requests/_filter.html.haml b/app/views/merge_requests/_filter.html.haml
index 86148fbc..4b48306e 100644
--- a/app/views/merge_requests/_filter.html.haml
+++ b/app/views/merge_requests/_filter.html.haml
@@ -16,5 +16,5 @@
 
   %fieldset
     %hr
-    = link_to "Reset", project_merge_requests_path(@project), class: 'btn right'
+    = link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'
 
diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml
index 603f3040..816c852d 100644
--- a/app/views/merge_requests/_form.html.haml
+++ b/app/views/merge_requests/_form.html.haml
@@ -1,6 +1,6 @@
 = form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
   -if @merge_request.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @merge_request.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index cdfc623d..09c55d98 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -1,5 +1,5 @@
 %li{ class: mr_css_classes(merge_request) }
-  .right
+  .pull-right
     .left
       - if merge_request.merged?
         %span.btn.btn-small.disabled.grouped
diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml
index 8c688e26..3073c8f6 100644
--- a/app/views/merge_requests/index.html.haml
+++ b/app/views/merge_requests/index.html.haml
@@ -1,5 +1,5 @@
 - if can? current_user, :write_merge_request, @project
-  = link_to new_project_merge_request_path(@project), class: "right btn btn-primary", title: "New Merge Request" do
+  = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
     %i.icon-plus
     New Merge Request
 %h3.page_title
@@ -28,8 +28,8 @@
         - if @merge_requests.present?
           %li.bottom
             .left= paginate @merge_requests, theme: "gitlab"
-            .right
-              %span.cgray.right #{@merge_requests.total_count} merge requests for this filter
+            .pull-right
+              %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
 
 :javascript
   $(merge_requestsPage);
diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml
index 27f1c2ab..c2c04b86 100644
--- a/app/views/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/merge_requests/show/_mr_accept.html.haml
@@ -1,5 +1,5 @@
 - unless can?(current_user, :accept_mr, @project)
-  .alert-message
+  .alert
     %strong Only masters can accept MR
 
 
@@ -29,14 +29,14 @@
         %strong This repository does not have satellite. Ask administrator to fix this issue
 
   .automerge_widget.cannot_be_merged{style: "display:none"}
-    .alert.alert-info
+    .alert.alert-disabled
       %span
         = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
         &nbsp;
         %strong This request can't be merged with GitLab. You should do it manually
 
   .automerge_widget.unchecked
-    .alert-message
+    .alert
       %strong
         %i.icon-refresh
         Checking for ability to automatically merge…
diff --git a/app/views/merge_requests/show/_mr_ci.html.haml b/app/views/merge_requests/show/_mr_ci.html.haml
index d46b606e..dd1e78a0 100644
--- a/app/views/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/merge_requests/show/_mr_ci.html.haml
@@ -23,7 +23,7 @@
         = link_to "Build page", ci_build_details_path(@merge_request)
 
   .ci_widget
-    .alert-message
+    .alert
       %strong
         %i.icon-refresh
         Checking for CI status for #{@merge_request.last_commit_short_sha}
diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml
index c2ffe8e3..8119728d 100644
--- a/app/views/merge_requests/show/_mr_title.html.haml
+++ b/app/views/merge_requests/show/_mr_title.html.haml
@@ -5,7 +5,7 @@
   &rarr;
   %span.label_branch= @merge_request.target_branch
 
-  %span.right
+  %span.pull-right
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
         .left.btn-group
@@ -17,13 +17,13 @@
             %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
             %li= link_to "Plain Diff",    project_merge_request_path(@project, @merge_request, format: :diff)
 
-        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request"
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request"
 
         = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
           %i.icon-edit
           Edit
 
-.right
+.pull-right
   .span3#votes= render 'votes/votes_block', votable: @merge_request
 
 .back_link
diff --git a/app/views/milestones/_form.html.haml b/app/views/milestones/_form.html.haml
index 2dc90bb8..fbaf64a3 100644
--- a/app/views/milestones/_form.html.haml
+++ b/app/views/milestones/_form.html.haml
@@ -7,7 +7,7 @@
 
 = form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"}  do |f|
   -if @milestone.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @milestone.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/milestones/_milestone.html.haml b/app/views/milestones/_milestone.html.haml
index 9111ff8b..00e20117 100644
--- a/app/views/milestones/_milestone.html.haml
+++ b/app/views/milestones/_milestone.html.haml
@@ -1,5 +1,5 @@
 %li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
-  .right
+  .pull-right
     - if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
       = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
         %i.icon-edit
diff --git a/app/views/milestones/index.html.haml b/app/views/milestones/index.html.haml
index c1dc6da9..b78f1705 100644
--- a/app/views/milestones/index.html.haml
+++ b/app/views/milestones/index.html.haml
@@ -3,7 +3,7 @@
   %h3.page_title
     Milestones
     - if can? current_user, :admin_milestone, @project
-      = link_to "New Milestone", new_project_milestone_path(@project), class: "right btn btn-small", title: "New Milestone"
+      = link_to "New Milestone", new_project_milestone_path(@project), class: "pull-right btn btn-small", title: "New Milestone"
   %br
   %div.ui-box
     .title
diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml
index eeefb70e..43d82a54 100644
--- a/app/views/milestones/show.html.haml
+++ b/app/views/milestones/show.html.haml
@@ -8,7 +8,7 @@
       = link_to project_milestones_path(@project) do
         &larr; To milestones list
   .span6
-    .right
+    .pull-right
       - unless  @milestone.closed
         = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
           %i.icon-plus
@@ -43,7 +43,7 @@
       #{@milestone.closed_items_count} closed
       &ndash;
       #{@milestone.open_items_count} open
-      %span.right= @milestone.expires_at
+      %span.pull-right= @milestone.expires_at
     .progress.progress-info
       .bar{style: "width: #{@milestone.percent_complete}%;"}
 
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index a063fb0a..f008712c 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -19,7 +19,7 @@
     = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
     %a.btn.grouped.js-close-discussion-note-form Cancel
   .hint
-    .right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+    .pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
   .clearfix
 
   .note_options
diff --git a/app/views/notes/_note.html.haml b/app/views/notes/_note.html.haml
index 9efeb563..9c51da29 100644
--- a/app/views/notes/_note.html.haml
+++ b/app/views/notes/_note.html.haml
@@ -30,7 +30,7 @@
   - if note.attachment.url
     - if note.attachment.image?
       = image_tag note.attachment.url, class: 'note-image-attach'
-    .attachment.right
+    .attachment.pull-right
       = link_to note.attachment.url, target: "_blank" do
         %i.icon-attachment
         = note.attachment_identifier
diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml
index 71eacd57..2ad000b8 100644
--- a/app/views/profiles/account.html.haml
+++ b/app/views/profiles/account.html.haml
@@ -12,7 +12,7 @@
 %fieldset
   %legend
     Private token
-    %span.cred.right
+    %span.cred.pull-right
       keep it secret!
   .padded
     = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
@@ -35,7 +35,7 @@
     .padded
       %p.slead After successful password update you will be redirected to login page where you should login with new password
       -if @user.errors.any?
-        .alert-message.block-message.error
+        .alert.alert-error
           %ul
             - @user.errors.full_messages.each do |msg|
               %li= msg
@@ -56,7 +56,7 @@
 %fieldset.update-username
   %legend
     Username
-    %small.cred.right
+    %small.cred.pull-right
       Changing your username can have unintended side effects!
   = form_for @user, url: update_username_profile_path,  method: :put, remote: true do |f|
     .padded
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 65b5a5d2..3cf6330c 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -6,7 +6,7 @@
   %small
     = @user.email
 
-  .right
+  .pull-right
     = link_to destroy_user_session_path, class: "logout", method: :delete do
       %small
         %i.icon-signout
@@ -15,7 +15,7 @@
 
 = form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" }  do |f|
   -if @user.errors.any?
-    %div.alert-message.block-message.error
+    %div.alert.alert-error
       %ul
         - @user.errors.full_messages.each do |msg|
           %li= msg
@@ -46,7 +46,7 @@
           = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
           %span.help-block Tell us about yourself in fewer than 250 characters.
 
-    .span5.right
+    .span5.pull-right
       %fieldset.tips
         %legend Tips:
         %ul
@@ -76,7 +76,7 @@
       %fieldset
         %legend
           Personal projects:
-          %small.right
+          %small.pull-right
             %span= current_user.personal_projects.count
             of
             %span= current_user.projects_limit
@@ -87,7 +87,7 @@
       %fieldset
         %legend
           SSH public keys:
-          %span.right
+          %span.pull-right
             = link_to pluralize(current_user.keys.count, 'key'), keys_path
         .padded
           = link_to "Add Public Key", new_key_path, class: "btn btn-small"
diff --git a/app/views/projects/_clone_panel.html.haml b/app/views/projects/_clone_panel.html.haml
index 2962ad98..e52df19b 100644
--- a/app/views/projects/_clone_panel.html.haml
+++ b/app/views/projects/_clone_panel.html.haml
@@ -2,8 +2,8 @@
   .row
     .span7
       .form-horizontal= render "shared/clone_panel"
-    .span4.right
-      .right
+    .span4.pull-right
+      .pull-right
         - unless @project.empty_repo?
           - if can? current_user, :download_code, @project
             = link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index a3e97fe9..8d3b1ade 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -1,6 +1,6 @@
 = form_for(@project, remote: true) do |f|
   - if @project.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @project.errors.full_messages.each do |msg|
           %li= msg
@@ -81,5 +81,5 @@
     = link_to 'Cancel', @project, class: "btn"
     - unless @project.new_record?
       - if can?(current_user, :remove_project, @project)
-        .right
+        .pull-right
           = link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"
diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml
index b3f2b82e..18516495 100644
--- a/app/views/projects/_new_form.html.haml
+++ b/app/views/projects/_new_form.html.haml
@@ -1,6 +1,6 @@
 = form_for(@project, remote: true) do |f|
   - if @project.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @project.errors.full_messages.first
   .clearfix.project_name_holder
     = f.label :name do
diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index cc215502..b8c88853 100644
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -13,19 +13,19 @@
     = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
 
   - if can? current_user, :admin_project, @project
-    = nav_link(controller: :deploy_keys, html_options: {class: 'right'}) do
+    = nav_link(controller: :deploy_keys, html_options: {class: 'pull-right'}) do
       = link_to project_deploy_keys_path(@project) do
         %span
         Deploy Keys
-    = nav_link(controller: :hooks, html_options: {class: 'right'}) do
+    = nav_link(controller: :hooks, html_options: {class: 'pull-right'}) do
       = link_to project_hooks_path(@project) do
         %span
         Hooks
-    = nav_link(controller: :services, html_options: {class: 'right'}) do
+    = nav_link(controller: :services, html_options: {class: 'pull-right'}) do
       = link_to project_services_path(@project) do
         %span
         Services
-    = nav_link(path: 'projects#edit', html_options: {class: 'right'}) do
+    = nav_link(path: 'projects#edit', html_options: {class: 'pull-right'}) do
       = link_to edit_project_path(@project), class: "stat-tab tab " do
         %i.icon-edit
         Edit
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index e7ee8bbb..94265178 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -31,4 +31,4 @@
 
   - if can? current_user, :remove_project, @project
     .prepend-top-20
-      = link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove right"
+      = link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"
diff --git a/app/views/protected_branches/index.html.haml b/app/views/protected_branches/index.html.haml
index 6e7c638e..15644de5 100644
--- a/app/views/protected_branches/index.html.haml
+++ b/app/views/protected_branches/index.html.haml
@@ -14,7 +14,7 @@
     - if can? current_user, :admin_project, @project
       = form_for [@project, @protected_branch] do |f|
         -if @protected_branch.errors.any?
-          .alert-message.block-message.error
+          .alert.alert-error
             %ul
               - @protected_branch.errors.full_messages.each do |msg|
                 %li= msg
diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml
index afdd4c5f..21e9d2e6 100644
--- a/app/views/public/projects/index.html.haml
+++ b/app/views/public/projects/index.html.haml
@@ -9,7 +9,7 @@
       %h5
         %i.icon-share
         = project.name_with_namespace
-        .right
+        .pull-right
           %pre.dark.tiny git clone #{project.http_url_to_repo}
 
 
diff --git a/app/views/repositories/_feed.html.haml b/app/views/repositories/_feed.html.haml
index 44380133..eaf15ca7 100644
--- a/app/views/repositories/_feed.html.haml
+++ b/app/views/repositories/_feed.html.haml
@@ -15,6 +15,6 @@
       = image_tag gravatar_icon(commit.author_email), class: "", width: 16
       = gfm escape_once(truncate(commit.title, length: 40))
   %td
-    %span.right.cgray
+    %span.pull-right.cgray
       = time_ago_in_words(commit.committed_date)
       ago
diff --git a/app/views/repositories/stats.html.haml b/app/views/repositories/stats.html.haml
index bdf047f1..dde35ea3 100644
--- a/app/views/repositories/stats.html.haml
+++ b/app/views/repositories/stats.html.haml
@@ -23,7 +23,7 @@
           = image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
           = author.name
           %small.light= author.email
-          .right
+          .pull-right
             = author.commits
 
 
diff --git a/app/views/services/_gitlab_ci.html.haml b/app/views/services/_gitlab_ci.html.haml
index 822892c8..dfde6438 100644
--- a/app/views/services/_gitlab_ci.html.haml
+++ b/app/views/services/_gitlab_ci.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   GitLab CI
   %small Continuous integration server from GitLab
-  .right
+  .pull-right
     - if @service.active
       %small.cgreen Enabled
     - else
@@ -16,7 +16,7 @@
 %hr
 = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
   - if @service.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @service.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 2c94f965..27dbf502 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -8,7 +8,7 @@
       = link_to edit_project_service_path(@project, :gitlab_ci) do
         GitLab CI
         %small Continuous integration server from GitLab
-      .right
+      .pull-right
         - if @gitlab_ci_service.try(:active)
           %small.cgreen
             %i.icon-ok
@@ -21,11 +21,11 @@
     %h4
       Jenkins CI
       %small An extendable open source continuous integration server
-      .right
+      .pull-right
         %small Not implemented yet
   %li.disabled
     %h4
       Campfire
       %small Web-based group chat tool
-      .right
+      .pull-right
         %small Not implemented yet
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 1405bd11..77162cdc 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -4,7 +4,7 @@
 .snippet-form-holder
   = form_for [@project, @snippet] do |f|
     -if @snippet.errors.any?
-      .alert-message.block-message.error
+      .alert.alert-error
         %ul
           - @snippet.errors.full_messages.each do |msg|
             %li= msg
@@ -30,7 +30,7 @@
       = f.submit 'Save', class: "btn-save btn"
       = link_to "Cancel", project_snippets_path(@project), class: " btn"
       - unless @snippet.new_record?
-        .right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
+        .pull-right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
 
 
 :javascript
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index db218574..28a533d2 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -5,7 +5,7 @@
   %small share code pastes with others out of git repository
 
   - if can? current_user, :write_snippet, @project
-    = link_to new_project_snippet_path(@project), class: "btn btn-small add_new right", title: "New Snippet" do
+    = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
       Add new snippet
 %br
 %table
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 767b9736..e6bcd88f 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -4,7 +4,7 @@
   = @snippet.title
   %small= @snippet.file_name
   - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
-    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small right"
+    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right"
 
 %br
 %div= render 'blob'
diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml
index 1616ea3c..05bea2db 100644
--- a/app/views/team_members/_form.html.haml
+++ b/app/views/team_members/_form.html.haml
@@ -3,7 +3,7 @@
 %hr
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
   -if @user_project_relation.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @user_project_relation.errors.full_messages.each do |msg|
           %li= msg
@@ -19,5 +19,5 @@
     .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
 
   .actions
-    = f.submit 'Save', class: "btn btn-save"
+    = f.submit 'Add users', class: "btn btn-create"
     = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index c85ec981..3df2caed 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -10,16 +10,16 @@
         %br
         %small.cgray= user.email
 
-    .span5.right
+    .span5.pull-right
       - if allow_admin
         .left
           = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
             = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
-      .right
+      .pull-right
         - if current_user == user
           %span.btn.disabled This is you!
         - if @project.namespace_owner == user
-          %span.btn.disabled.btn-success Owner
+          %span.btn.disabled Owner
         - elsif user.blocked
           %span.btn.disabled.blocked Blocked
         - elsif allow_admin
diff --git a/app/views/team_members/_show_team.html.haml b/app/views/team_members/_show_team.html.haml
index ebe6f633..f1555f0b 100644
--- a/app/views/team_members/_show_team.html.haml
+++ b/app/views/team_members/_show_team.html.haml
@@ -7,8 +7,8 @@
       %br
       %small.cgray Members: #{team.members.count}
 
-    .span5.right
-      .right
+    .span5.pull-right
+      .pull-right
         - if allow_admin
           .left
             = link_to resign_project_team_path(@project, team), method: :delete, confirm: "Are you shure?", class: "btn btn-remove small" do
diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml
index 6e5090c7..3264f58c 100644
--- a/app/views/team_members/index.html.haml
+++ b/app/views/team_members/index.html.haml
@@ -7,7 +7,7 @@
     %strong= link_to "here", help_permissions_path, class: "vlink"
 
   - if can? current_user, :admin_team_member, @project
-    %span.right
+    %span.pull-right
       = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
         Import team from another project
       = link_to available_project_teams_path(@project), class: "btn btn-small grouped", title: "Assign project to team of users" do
diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml
index 99564f8e..192948ef 100644
--- a/app/views/team_members/show.html.haml
+++ b/app/views/team_members/show.html.haml
@@ -2,7 +2,7 @@
 
 .team_member_show
   - if can? current_user, :admin_project, @project
-    = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove"
+    = link_to 'Remove from team', project_team_member_path(@project, @member), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"
   .profile_avatar_holder
     = image_tag gravatar_icon(@member.email, 60), class: "borders"
   %h3.page_title
diff --git a/app/views/teams/_filter.html.haml b/app/views/teams/_filter.html.haml
index 8e358319..f461fcad 100644
--- a/app/views/teams/_filter.html.haml
+++ b/app/views/teams/_filter.html.haml
@@ -25,9 +25,9 @@
           %li{class: ("active" if params[:project_id] == project.id.to_s)}
             = link_to team_filter_path(entity, project_id: project.id) do
               = project.name_with_namespace
-              %small.right= entities_per_project(project, entity)
+              %small.pull-right= entities_per_project(project, entity)
 
   %fieldset
     %hr
-    = link_to "Reset", team_filter_path(entity), class: 'btn right'
+    = link_to "Reset", team_filter_path(entity), class: 'btn pull-right'
 
diff --git a/app/views/teams/_projects.html.haml b/app/views/teams/_projects.html.haml
index e7212591..5677255b 100644
--- a/app/views/teams/_projects.html.haml
+++ b/app/views/teams/_projects.html.haml
@@ -4,7 +4,7 @@
     %small
       (#{projects.count})
     - if can? current_user, :manage_user_team, @team
-      %span.right
+      %span.pull-right
         = link_to new_team_project_path(@team), class: "btn btn-tiny info" do
           %i.icon-plus
           Assign Project
diff --git a/app/views/teams/edit.html.haml b/app/views/teams/edit.html.haml
index 2c565230..a3b1c734 100644
--- a/app/views/teams/edit.html.haml
+++ b/app/views/teams/edit.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for @team, url: teams_path do |f|
   - if @team.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @team.errors.full_messages.first
   .clearfix
     = f.label :name do
diff --git a/app/views/teams/issues.html.haml b/app/views/teams/issues.html.haml
index 4481e2ea..c6a68c37 100644
--- a/app/views/teams/issues.html.haml
+++ b/app/views/teams/issues.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   Issues
   %small (in Team projects assigned to Team members)
-  %small.right #{@issues.total_count} issues
+  %small.pull-right #{@issues.total_count} issues
 
 %hr
 .row
diff --git a/app/views/teams/members/_form.html.haml b/app/views/teams/members/_form.html.haml
index 701eb4f2..c22ee783 100644
--- a/app/views/teams/members/_form.html.haml
+++ b/app/views/teams/members/_form.html.haml
@@ -1,6 +1,6 @@
 = form_tag admin_team_member_path(@team, @member), method: :put do
   -if @member.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @member.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/teams/members/_show.html.haml b/app/views/teams/members/_show.html.haml
index e2b702ab..6cddb8e4 100644
--- a/app/views/teams/members/_show.html.haml
+++ b/app/views/teams/members/_show.html.haml
@@ -10,7 +10,7 @@
         %br
         %small.cgray= user.email
 
-    .span6.right
+    .span6.pull-right
       - if allow_admin
         .left.span2
           = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
@@ -19,7 +19,7 @@
           %span
             = check_box_tag :group_admin, true, @team.admin?(user)
             Admin access
-      .right
+      .pull-right
         - if current_user == user
           %span.btn.disabled This is you!
         - if @team.owner == user
diff --git a/app/views/teams/members/index.html.haml b/app/views/teams/members/index.html.haml
index 8ce6e5d8..87438266 100644
--- a/app/views/teams/members/index.html.haml
+++ b/app/views/teams/members/index.html.haml
@@ -6,7 +6,7 @@
     %strong= link_to "here", help_permissions_path, class: "vlink"
 
   - if can? current_user, :manage_user_team, @team
-    %span.right
+    %span.pull-right
       = link_to new_team_member_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
         New Team Member
 %hr
diff --git a/app/views/teams/members/show.html.haml b/app/views/teams/members/show.html.haml
index 6e655cee..f760c2da 100644
--- a/app/views/teams/members/show.html.haml
+++ b/app/views/teams/members/show.html.haml
@@ -3,7 +3,7 @@
 
 .team_member_show
   - if can? current_user, :admin_project, @project
-    = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn btn-remove"
+    = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "pull-right btn btn-remove"
   .profile_avatar_holder
     = image_tag gravatar_icon(user.email, 60), class: "borders"
   %h3.page_title
diff --git a/app/views/teams/merge_requests.html.haml b/app/views/teams/merge_requests.html.haml
index c9af529e..417d1aa6 100644
--- a/app/views/teams/merge_requests.html.haml
+++ b/app/views/teams/merge_requests.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   Merge Requests
   %small (authored by or assigned to Team members)
-  %small.right #{@merge_requests.total_count} merge requests
+  %small.pull-right #{@merge_requests.total_count} merge requests
 
 %hr
 .row
diff --git a/app/views/teams/new.html.haml b/app/views/teams/new.html.haml
index c0363fe3..38f61c11 100644
--- a/app/views/teams/new.html.haml
+++ b/app/views/teams/new.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for @team, url: teams_path do |f|
   - if @team.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %span= @team.errors.full_messages.first
   .clearfix
     = f.label :name do
diff --git a/app/views/teams/projects/_form.html.haml b/app/views/teams/projects/_form.html.haml
index 763d07a1..d2c89b0c 100644
--- a/app/views/teams/projects/_form.html.haml
+++ b/app/views/teams/projects/_form.html.haml
@@ -1,6 +1,6 @@
 = form_tag team_project_path(@team, @project), method: :put do
   -if @project.errors.any?
-    .alert-message.block-message.error
+    .alert.alert-error
       %ul
         - @project.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/teams/projects/index.html.haml b/app/views/teams/projects/index.html.haml
index de2bee09..696ee29c 100644
--- a/app/views/teams/projects/index.html.haml
+++ b/app/views/teams/projects/index.html.haml
@@ -5,7 +5,7 @@
     %strong= link_to "here", help_permissions_path, class: "vlink"
 
   - if current_user.can?(:manage_user_team, @team) && @avaliable_projects.any?
-    %span.right
+    %span.pull-right
       = link_to new_team_project_path(@team), class: "btn btn-primary small grouped", title: "New Team Member" do
         Assign project to Team
 
diff --git a/app/views/tree/_head.html.haml b/app/views/tree/_head.html.haml
index f14526cf..32c38824 100644
--- a/app/views/tree/_head.html.haml
+++ b/app/views/tree/_head.html.haml
@@ -3,5 +3,5 @@
     = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: @path}
   = nav_link(controller: :tree) do
     = link_to 'Source', project_tree_path(@project, @ref)
-  %li.right
+  %li.pull-right
     = render "shared/clone_panel"
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index b0f77567..29a2ed02 100644
--- a/app/views/tree/_tree.html.haml
+++ b/app/views/tree/_tree.html.haml
@@ -24,7 +24,7 @@
           %th Name
           %th Last Update
           %th Last Commit
-          %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny right"
+          %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
 
       - if tree.up_dir?
         %tr.tree-item
diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml
index ab6538f0..4981aaba 100644
--- a/app/views/users/_profile.html.haml
+++ b/app/views/users/_profile.html.haml
@@ -4,20 +4,20 @@
   %ul.well-list
     %li
       %strong Email
-      %span.right= mail_to @user.email
+      %span.pull-right= mail_to @user.email
     - unless @user.skype.blank?
       %li
         %strong Skype
-        %span.right= @user.skype
+        %span.pull-right= @user.skype
     - unless @user.linkedin.blank?
       %li
         %strong LinkedIn
-        %span.right= @user.linkedin
+        %span.pull-right= @user.linkedin
     - unless @user.twitter.blank?
       %li
         %strong Twitter
-        %span.right= @user.twitter
+        %span.pull-right= @user.twitter
     - unless @user.bio.blank?
       %li
         %strong Bio
-        %span.right= @user.bio
+        %span.pull-right= @user.bio
diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml
index f46a0ed1..73f635f3 100644
--- a/app/views/users/_projects.html.haml
+++ b/app/views/users/_projects.html.haml
@@ -9,7 +9,7 @@
             \/
           %strong.well-title
             = truncate(project.name, length: 45)
-          %span.right.light
+          %span.pull-right.light
             - if project.owner == @user
               %i.icon-wrench
             - tm = project.team.get_tm(@user.id)
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 3977de24..969fed9c 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -4,7 +4,7 @@
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
       = @user.name
       - if @user == current_user
-        .right
+        .pull-right
           = link_to profile_path, class: 'btn btn-small' do
             %i.icon-edit
             Edit Profile
diff --git a/app/views/wikis/edit.html.haml b/app/views/wikis/edit.html.haml
index 71f8d6a9..9e221aba 100644
--- a/app/views/wikis/edit.html.haml
+++ b/app/views/wikis/edit.html.haml
@@ -2,7 +2,7 @@
 %hr
 = render 'form'
 
-.right
+.pull-right
   - if can? current_user, :admin_wiki, @project
     = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
       Delete this page
\ No newline at end of file
diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml
index 245d192e..7ff8b5cc 100644
--- a/app/views/wikis/show.html.haml
+++ b/app/views/wikis/show.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   = @wiki.title
-  %span.right
+  %span.pull-right
     = link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
       Pages
     - if can? current_user, :write_wiki, @project
diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/project_team_management.rb
index 91b3ffee..19352fe0 100644
--- a/features/steps/project/project_team_management.rb
+++ b/features/steps/project/project_team_management.rb
@@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
       select user.name, :from => "user_ids"
       select "Reporter", :from => "project_access"
     end
-    click_button "Save"
+    click_button "Add users"
   end
 
   Then 'I should see "Mike" in team list as "Reporter"' do