diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee
index da0077ea77b0007c0961e2da12bc5bf95a37fee5..f75008e2b603dc61cbd11e10e6229f12c8331d04 100644
--- a/app/assets/javascripts/admin.js.coffee
+++ b/app/assets/javascripts/admin.js.coffee
@@ -14,7 +14,7 @@ class Admin
 
     $('.log-bottom').click (e) ->
       e.preventDefault()
-      visible_log = $(".file_content:visible")
+      visible_log = $(".file-content:visible")
       visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast")
 
     modal = $('.change-owner-holder')
diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index 8db53039e982902d64dd380716bf7a76b5890f67..4871936d5b2a43de3f1a6962c60fad5f15af5135 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -15,7 +15,7 @@ class Dashboard
         uiBox.find(".dash-list li").show()
       else
         uiBox.find(".dash-list li").each (index) ->
-          name = $(this).find(".well-title").text()
+          name = $(this).find(".filter-title").text()
 
           if name.toLowerCase().search(terms.toLowerCase()) == -1
             $(this).hide()
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d6386dbb6fc3eada546e95b9245b37dc811773a2..20c772d8e949c9e989508065fba671074d7e2bd9 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -23,12 +23,8 @@ body {
 
 .help li { color:$style_color; }
 
-.back_link {
-  text-decoration: underline;
+.back-link {
   font-size: 14px;
-  font-weight: bold;
-  padding: 10px 0;
-  padding-bottom: 0;
 }
 
 table a code {
@@ -412,7 +408,7 @@ img.emoji {
 }
 
 .navless-container {
-  margin-top: 30px;
+  margin-top: 20px;
 }
 
 .description-block {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
index 0b147faf59e9940c64fe4337d3222ce976c8e172..c23970c13eb9005e780d1b784afad3ef02259953 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
@@ -17,9 +17,6 @@
   &.s24 { width: 24px; height: 24px; margin-right: 8px; }
   &.s26 { width: 26px; height: 26px; margin-right: 8px; }
   &.s32 { width: 32px; height: 32px; margin-right: 10px; }
+  &.s60 { width: 60px; height: 60px; margin-right: 12px; }
   &.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 867920ad08f497292769e976b5dc6d6b79f9e7ee..c5bbb9b73899b3269517c56e7630be22ea687494 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -11,7 +11,7 @@
  */
 .ui-box {
   background: #F9F9F9;
-  margin-bottom: 25px;
+  margin-bottom: 20px;
   border: 1px solid #CCC;
   word-wrap: break-word;
   @include solid-shade;
@@ -86,10 +86,11 @@
     color: #456;
     font-size: 16px;
     text-shadow: 0 1px 1px #fff;
-    padding: 0px 10px;
-    line-height: 36px;
+    padding: 0 10px;
     font-size: 14px;
+    line-height: 40px;
     font-weight: normal;
+    margin: 0;
 
     > a {
       text-shadow: 0 1px 1px #fff;
@@ -101,8 +102,7 @@
     }
 
     .btn {
-      position: relative;
-      top: -2px;
+      vertical-align: middle;
     }
 
     .nav-pills {
@@ -132,15 +132,6 @@
       margin-bottom: 0;
       padding: 5px 20px;
     }
-    .middle_title {
-      background: #f5f5f5;
-      margin:20px -20px;
-      padding: 0 20px;
-      border-top: 1px solid #eee;
-      border-bottom: 1px solid #eee;
-      font-size: 14px;
-      color: #777;
-    }
   }
 
   .row_title {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index e9b85686fada0f074b293274a1b6b55fab255257..90b041b29dbd4b4595e5935650c73a686c3847e4 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -43,11 +43,8 @@
     }
   }
 
-  &.success {
-    @extend .btn-success;
-
+  &.btn-success {
     &:hover {
-      @extend .btn-success;
       background: #51a351;
     }
 
@@ -59,7 +56,7 @@
 
   &.btn-create {
     @extend .wide;
-    @extend .success;
+    @extend .btn-success;
   }
 
   &.btn-save {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index 4a77e166e6799a47e59c23c9c6a33229be36eeda..1d958a05b80b260ff5eacce732369eda12a1756b 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -68,10 +68,6 @@ input[type='text'].danger {
 
 fieldset legend { font-size: 17px; }
 
-/** PAGINATION **/
-.gitlab_pagination {
-}
-
 .tab-content {
   overflow: visible;
 }
diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
index 78a3f0b810dc44e3f95a2710306a4dbd31c81d86..ec03fd0d844d444dff847a2e40a457a874e7c337 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/files.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -2,12 +2,12 @@
  * File content holder
  *
  */
-.file_holder {
+.file-holder {
   border: 1px solid #BBB;
   margin-bottom: 1em;
   @include solid-shade;
 
-  .file_title {
+  .file-title {
     border-bottom: 1px solid #bbb;
     @include bg-dark-gray-gradient;
     margin: 0;
@@ -33,7 +33,7 @@
       }
     }
   }
-  .file_content {
+  .file-content {
     background: #fff;
     font-size: 11px;
 
@@ -48,7 +48,8 @@
 
     &.wiki {
       padding: 20px;
-      font-size: 13px;
+      font-size: 14px;
+      line-height: 1.6;
 
       .highlight {
         margin-bottom: 9px;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index 2f83ca0c0344cb54da26d4c7d55964777f6701bd..71e73b40b44e0a07a0f97990f3c78ee8eb72280e 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -70,19 +70,24 @@
 @mixin header-font {
   color: $style_color;
   text-shadow: 0 1px 1px #FFF;
-  font-size: 18px;
+  font-size: 16px;
   line-height: 40px;
   font-weight: normal;
-  letter-spacing: -1px;
 }
 
 @mixin md-typography {
   code { padding: 0 4px; }
-  p { font-size: 13px; }
-  h1 { font-size: 26px; line-height: 40px; margin: 10px 0;}
-  h2 { font-size: 22px; line-height: 40px; margin: 10px 0;}
-  h3 { font-size: 18px; line-height: 40px; margin: 10px 0;}
-  h4 { font-size: 16px; line-height: 20px; margin: 10px 0;}
-  h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
-  h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
+  h1 { margin-top: 30px;}
+  h2 { margin-top: 25px;}
+  h3 { margin-top: 20px;}
+  h4 { margin-top: 15px;}
+}
+
+@mixin page-title {
+  color: #456;
+  font-size: 20px;
+  font-weight: normal;
+  line-height: 1.5;
+  margin-top: 0px;
+  margin-bottom: 15px;
 }
diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
index ab14624186d0927cf50c5dc3527b84bb839e6b67..07df7f546d6eae0bb53bdc8a0ae5650bb7e8a222 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -3,15 +3,18 @@
  *
  */
 
-h1, h2, h3, h4, h5, h6 { margin: 0; }
-h3, h4, h5, h6 { line-height: 36px; }
-h5 { font-size: 14px; }
-
-h3.page_title {
-  color: #456;
-  font-size: 20px;
-  font-weight: normal;
-  line-height: 28px;
+h1.page-title {
+  @include page-title;
+  font-size: 28px;
+}
+
+h2.page-title {
+  @include page-title;
+  font-size: 24px;
+}
+
+h3.page-title {
+  @include page-title;
 }
 
 h6 {
@@ -91,11 +94,10 @@ a:focus {
  *
  */
 .wiki {
+  font-size: 14px;
+  line-height: 1.6;
   @include md-typography;
 
-  font-size: 13px;
-  line-height: 20px;
-
   .white .highlight pre { background: #f5f5f5; }
   ul { margin: 0 0 9px 25px !important; }
 }
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index ff78af3396739f4a23079e786b7e313f22a45d56..15bfad96f6c85de4abc83f60cf5cc0293f01c726 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -10,9 +10,6 @@
       margin: 0px;
       box-shadow: none;
 
-      > .title {
-        padding: 2px 15px;
-      }
       .nav-projects-tabs li { padding: 0; }
     }
   }
@@ -33,12 +30,10 @@
 
 .dashboard {
   .dash-filter {
-    margin: 0;
+    margin: 7px 0;
     padding: 4px 6px;
     width: 202px;
     float: left;
-    margin-top: 3px;
-    margin-left: -2px;
   }
 }
 
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 253347d5c67996fd9f00c847a432a8ae046aed4c..2e658a32b381662fcdf3fef1b2076e1e869b3f21 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -31,6 +31,10 @@
  *
  */
 .event-item {
+  &:first-child {
+    padding-top: 0;
+  }
+
   border-bottom: 1px solid #eee;
   .event-title {
     color: #333;
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 98c010ed72dfee241cbc2c7f03ee1a54cefec3d2..bd72d08295a3646773f570cf8ec4f257cd860e96 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -13,7 +13,7 @@ header {
       .nav > li > a {
         color: $style_color;
         text-shadow: 0 1px 0 #fff;
-        font-size: 16px;
+        font-size: 14px;
         padding: 10px;
       }
 
@@ -45,6 +45,7 @@ header {
       margin: 0 6px;
 
       h1 {
+        margin: 0;
         background: url('logo-black.png') no-repeat center 1px;
         background-size: 38px;
         float: left;
@@ -68,7 +69,7 @@ header {
     position: relative;
     float: left;
     margin: 0;
-    margin-left: 10px;
+    margin-left: 5px;
     @include header-font;
   }
 
@@ -92,7 +93,7 @@ header {
     margin-left: 10px;
 
     .search-input {
-      @extend .span2;
+      @extend .span3;
       background-image: url("icon-search.png");
       background-repeat: no-repeat;
       background-position: 10px;
@@ -103,7 +104,7 @@ header {
       box-shadow: none;
       @include transition(all 0.15s ease-in 0s);
       &:focus {
-        @extend .span3;
+        @extend .span4;
       }
     }
   }
@@ -160,7 +161,7 @@ header {
     }
     .project_name {
       a {
-        color: #DDD;
+        color: #BBB;
         &:hover {
           color: #FFF;
         }
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index 7d09f548589910074c51e2fa08ca66ee3aae6211..77ed57a6cfc3e706a9bb72f12d5680069ddd184f 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -1,13 +1,13 @@
 .main-nav {
   background: #f5f5f5;
-  margin: 30px 0;
+  margin: 20px 0;
   margin-top: 0;
   padding-top: 4px;
   border-bottom: 1px solid #E1E1E1;
 
   ul {
     margin: auto;
-    height: 40px;
+    height: 42px;
     overflow: hidden;
     .count {
       font-weight: normal;
@@ -74,7 +74,7 @@
       text-align: center;
       font-weight: normal;
       height: 38px;
-      line-height: 34px;
+      line-height: 36px;
       color: #777;
       text-shadow: 0 1px 1px white;
       padding: 0 10px;
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss
index c34cd23a9c98c8388a4d2dda18270747cd44f76e..06a4046f91671bb841ea6cb56d2adac876f30d2c 100644
--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -1,26 +1,3 @@
-.profile_history {
-  .event_feed {
-    min-height: 20px;
-    .avatar {
-      width: 20px;
-    }
-  }
-}
-
-.profile_avatar_holder {
-  float: left;
-  width: 60px;
-  height: 60px;
-  margin-right: 20px;
-  img {
-    width: 60px;
-    height: 60px;
-    background: #fff;
-    padding: 1px;
-    border: 1px solid #ddd;
-  }
-}
-
 .save-status-fixed {
   position: fixed;
   left: 20px;
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 22618765eaae030b7e51daa5b6b470b296e898dd..3430e7cdbc3d6ee8e535fd7239ef222e0cef96f5 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -48,7 +48,7 @@
     margin-bottom: 50px;
   }
   h3 {
-    @extend .page_title;
+    @extend .page-title;
   }
 
 }
diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/sections/snippets.scss
index 3944814fc3e5bf5d5ec1dcbe86ad2dfd8c3ac63e..feeca655cb18053df12ffc92f92aa503629f2ee9 100644
--- a/app/assets/stylesheets/sections/snippets.scss
+++ b/app/assets/stylesheets/sections/snippets.scss
@@ -1,5 +1,5 @@
-.snippet.file_holder {
-  .file_title {
+.snippet.file-holder {
+  .file-title {
     .snippet-file-name {
       position: relative;
       top: -4px;
diff --git a/app/assets/stylesheets/sections/votes.scss b/app/assets/stylesheets/sections/votes.scss
index 6c81d9a81b8dd2c705291f6d978608dbb67a20d2..49489babab71465ed7bdf842a7a2b3b5570a7d73 100644
--- a/app/assets/stylesheets/sections/votes.scss
+++ b/app/assets/stylesheets/sections/votes.scss
@@ -27,7 +27,7 @@
   }
 }
 .votes-block {
-  margin: 14px 6px 6px 0;
+  margin: 6px;
   .downvotes {
     float: right;
   }
diff --git a/app/assets/stylesheets/sections/wiki.scss b/app/assets/stylesheets/sections/wiki.scss
index 175911d731202e188b37e5ed83eb402a7ba19e21..ed3a432ded04421159b62d1f11965f74bb639335 100644
--- a/app/assets/stylesheets/sections/wiki.scss
+++ b/app/assets/stylesheets/sections/wiki.scss
@@ -1,4 +1,4 @@
-h3.page_title .edit-wiki-header {
+h3.page-title .edit-wiki-header {
   width: 780px;
   margin-left: auto;
   margin-right: auto;
diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss
index a2b8c21ea11df88a8e0f97514806bd8273cf9481..44649ea037c6691ea4ed55a480c550aedc56d5ef 100644
--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -31,4 +31,8 @@
       border-left: 1px solid #666;
     }
   }
+
+  .main-nav {
+    box-shadow: 0 -1px 0 white inset;
+  }
 }
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 2bc618941935f6fae5ae3151cfe4bd8f35d12cf8..86979156d94ce15fb66ab3e258b24df493a082bf 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -134,7 +134,7 @@ module CommitsHelper
       parts = @path.split('/')
 
       parts.each_with_index do |part, i|
-        crumbs += content_tag(:span, '/', class: 'divider')
+        crumbs += content_tag(:span, ' / ', class: 'divider')
         crumbs += content_tag(:li) do
           # The text is just the individual part, but the link needs all the parts before it
           link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index 499738f9a0645d6c60259ae32f95905dae6bd507..2d4ffc10d5fb7d7b9c6b303f8fe66af81a6fb117 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Background Jobs
+%h3.page-title Background Jobs
 %br
 .ui-box
   %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 2774ccb85fed21f7a96be8a934ae21f63457b41c..9ed788d0d9dc658bae06f89bc355805013db31cc 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,7 +1,7 @@
 .admin_dash.row
   .span4
     .ui-box
-      %h5.title Projects
+      .title Projects
       .data.padded
         = link_to admin_projects_path do
           %h1= Project.count
@@ -9,7 +9,7 @@
         = link_to 'New Project', new_project_path, class: "btn btn-small"
   .span4
     .ui-box
-      %h5.title Users
+      .title Users
       .data.padded
         = link_to admin_users_path do
           %h1= User.count
@@ -17,7 +17,7 @@
         = link_to 'New User', new_admin_user_path, class: "btn btn-small"
   .span4
     .ui-box
-      %h5.title Groups
+      .title Groups
       .data.padded
         = link_to admin_groups_path do
           %h1= Group.count
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index af87503128e9e1c9ce91e1577f1222caac1137b6..f4d931f480f2b4d28649d5147dc35f07bf90d71b 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Edit Group
+%h3.page-title Edit Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index d880ff61c9be3470e526c07e88fad563a91944b0..cff0251cd5abd52edc3c628e520eb97ee6c86255 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Groups (#{@groups.total_count})
   %small
     allows you to keep projects organized.
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index 2da654ec764a388d6ee0e089dad06d723c9d22e9..483c40b179188fe26338a93ef419cc7d09b54d2f 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title New Group
+%h3.page-title New Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 977fac291f38eb806b80dd3e15047b329988c480..5509811bae5e1b1b88692699f43728bc449d1c3e 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Group: #{@group.name}
 
   = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
@@ -8,7 +8,7 @@
 .row
   .span6
     .ui-box
-      %h5.title
+      .title
         Group info:
       %ul.well-list
         %li
@@ -50,7 +50,7 @@
             = @group.created_at.stamp("March 1, 1999")
 
     .ui-box
-      %h5.title
+      .title
         Projects
         %small
           (#{@group.projects.count})
@@ -64,7 +64,7 @@
 
   .span6
     .ui-box
-      %h5.title
+      .title
         Add user(s) to the group:
       .ui-box-body.form-holder
         %p.light
@@ -79,7 +79,7 @@
           %hr
           = submit_tag 'Add users into group', class: "btn btn-create"
     .ui-box
-      %h5.title
+      .title
         %strong #{@group.name}
         Group Members
         %small
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index fef72186b2f37135181f114ee0fe150a24165cbe..cce8aeb02c73ed89a66988c584e286bb7aa3e80f 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -11,57 +11,57 @@
 %p.light To prevent performance issues admin logs output the last 2000 lines
 .tab-content
   .tab-pane.active#githost
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         githost.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::GitLogger.read_latest.each do |line|
             %li
               %p= line
   .tab-pane#application
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         application.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::AppLogger.read_latest.each do |line|
             %li
               %p= line
   .tab-pane#production
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         production.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::Logger.read_latest_for('production.log').each do |line|
             %li
               %p= line
   .tab-pane#sidekiq
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         sidekiq.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::Logger.read_latest_for('sidekiq.log').each do |line|
             %li
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 70ea460a06f3d8a8a76628eef691221b1e1a9f7e..f8800612b87bb0aa7292d34d515279bea99c8e69 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Projects
   = link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
 
@@ -41,7 +41,7 @@
           = link_to "Reset", admin_projects_path, class: "btn"
   .span8
     .ui-box
-      %h5.title
+      .title
         Projects (#{@projects.total_count})
       %ul.well-list
         - @projects.each do |project|
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 8779ec08870f1414dc457fbd45859f8f5b336d8a..70f0c193c01f74a33bf7155e8521f6a25cb15c75 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Project: #{@project.name_with_namespace}
   = link_to edit_project_path(@project), class: "btn pull-right" do
     %i.icon-edit
@@ -7,7 +7,7 @@
 .row
   .span6
     .ui-box
-      %h5.title
+      .title
         Project info:
       %ul.well-list
         %li
@@ -76,7 +76,7 @@
   .span6
     - if @group
       .ui-box
-        %h5.title
+        .title
           %strong #{@group.name} Group
           members (#{@group.users_groups.count})
           .pull-right
@@ -87,7 +87,7 @@
             = render 'users_groups/users_group', member: member, show_controls: false
 
     .ui-box
-      %h5.title
+      .title
         Team
         %small
           (#{@project.users.count})
diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
index 0e31a0ba332fd8adf311b5fd9b3d02db27fa673a..2a4f8c60546e97e5b4af55e56e6136152fd41b88 100644
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   #{@user.name} →
   %i.icon-edit
   Edit user
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 0f74e8f68f4b3076713cd7ca579324df60d9dfc3..a285eff138d3bc8776dd14bda9bb90806cf80956 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Users
   = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
 %br
@@ -32,7 +32,7 @@
 
   .span9
     .ui-box
-      %h5.title
+      .title
         Users (#{@users.total_count})
       %ul.well-list
         - @users.each do |user|
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
index 1e82b249cf1f8566492d4b2246f115b18ce95e72..a1c90c48946ce4992dcf6cdbc27a84b1bb8d408c 100644
--- a/app/views/admin/users/new.html.haml
+++ b/app/views/admin/users/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   %i.icon-plus
   New user
 %hr
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index eaa7ebc3f49724e0337f3b1fa62ed22b433df8eb..d48660f0a9e34267f05107f89cb89cb2a252b352 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   User:
   = @user.name
   - if @user.blocked?
@@ -21,7 +21,7 @@
 .row
   .span6
     .ui-box
-      %h5.title
+      .title
         Account:
         .pull-right
           = image_tag gravatar_icon(@user.email, 32), class: "avatar s32"
@@ -65,7 +65,7 @@
 
     - if @user.users_groups.present?
       .ui-box
-        %h5.title Groups:
+        .title Groups:
         %ul.well-list
           - @user.users_groups.each do |user_group|
             - group = user_group.group
@@ -76,7 +76,7 @@
 
   .span6
     .ui-box
-      %h5.title Projects (#{@projects.count})
+      .title Projects (#{@projects.count})
       %ul.well-list
         - @projects.sort_by(&:name_with_namespace).each do |project|
           - tm = project.team.find_tm(@user.id)
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index a072641a07477c559c07be9e1eac53c8e368b63c..9aca7b353f3d16b9d6bdbabdb71ba9462e51157f 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title.clearfix
+  .title.clearfix
     = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
     - if current_user.can_create_group?
       %span.pull-right
@@ -10,7 +10,7 @@
     - groups.each do |group|
       %li.group-row
         = link_to group_path(id: group.path), class: dom_class(group) do
-          %span.group-name
+          %span.group-name.filter-title
             = truncate(group.name, length: 35)
           %span.arrow
             %i.icon-angle-right
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index d52f10fa759795b9249e79b5d24a7803ce61b902..305b83771a106dd9aca6178dc5e99aaf9b44d432 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title.clearfix
+  .title.clearfix
     = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
     - if current_user.can_create_project?
       %span.pull-right
@@ -15,7 +15,7 @@
             - if project.namespace
               = project.namespace.human_name
               \/
-          %span.project-name
+          %span.project-name.filter-title
             = truncate(project.name, length: 25)
           %span.arrow
             %i.icon-angle-right
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index ad104657fea831463f42fdeaa87bdfc330bc9af0..63003c2859b1ff841a7125226dc411cf4c74dd72 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,12 +1,10 @@
-%h3.page_title
+%h3.page-title
   Issues
   %span.light
     –
     Assigned to you
   %span.pull-right #{@issues.total_count} issues
 
-%br
-
 .row
   .span3
     = render 'filter', entity: 'issue'
@@ -15,7 +13,7 @@
       - @issues.group_by(&:project).each do |group|
         %div.ui-box
           - project = group[0]
-          %h5.title
+          .title
             = link_to_project project
              
             %i.icon-angle-right
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index de1c457c3183c2666d34c66c44dad84c850a7070..de5d8018757fde06f8e250d7e5a61c424bf373bc 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,11 +1,10 @@
-%h3.page_title
+%h3.page-title
   Merge Requests
   %span.light
     –
     Authored by or assigned to you
   %span.pull-right #{@merge_requests.total_count} merge requests
 
-%br
 .row
   .span3
     = render 'filter', entity: 'merge_request'
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 5c5fa528fabb32ea6216d1cf5fafacb09f0ec194..b66117fc3c5e1248e11c72d6c13bfcf1af6de1b0 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -22,7 +22,7 @@
 
   .span9
     .ui-box
-      %h5.title
+      .title
         Projects (#{@projects.total_count})
         .pull-right.light
           %small Last activity
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 5d47cbc3b834b0820f25bf49bff99007addabf49..76e164456ec23eac842d988d88a178bd459a681d 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
-  %h3.page_title Reset password
+  %h3.page-title Reset password
   %br
   = devise_error_messages!
   = f.email_field :email, placeholder: "Email",  class: "text"
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 17a0c8fd79aa3c72d89d08632c8e35dbcb900ba7..d749d7bac093ce5526af9a9a3eac0ec9580aff46 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
-  %h3.page_title Sign Up
+  %h3.page-title Sign Up
   %br
   = devise_error_messages!
   %div
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 504522558600951409658d7942c9db7f03917f8b..caaa51f11000b647fc2165667433c2249f006708 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,5 +1,5 @@
 .login-box
-  %h3.page_title Sign in
+  %h3.page-title Sign in
   %br
   - if ldap_enabled?
     %ul.nav.nav-tabs
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index f2d082cb77defd275ead59eba0b1ac71cd9e5905..6aa78f0c2a81de07f4e10e9caf4719ff502efa2d 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -1,5 +1,5 @@
 %h1.http_status_code 403
-%h3.page_title Access Denied
+%h3.page-title Access Denied
 %hr
 %p You are not allowed to access this page.
 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml
index a0aa63064896171ef874e73c7bb3561379a49456..7021f06dd7f9a7d2e1927b0bfa957a769b61e04f 100644
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@@ -1,4 +1,4 @@
 %h1.http_status_code 500
-%h3.page_title Encoding Error
+%h3.page-title Encoding Error
 %hr
 %p Page can't be loaded because of an encoding error.
diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml
index 5c9c4953284f1dc7db2291b4e0985d673baee9ca..d8ed77732076253a8cabc9ae34dd3767880c152c 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -1,5 +1,5 @@
 %h1.http_status_code 404
-%h3.page_title Git Resource Not found
+%h3.page-title Git Resource Not found
 %hr
 %p
   Application can't get access to some branch or commit in your repository. It
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
index ee23d2197b4760d7589f48c50dbac54d49be9a37..4b97ddefc720a7f4e446522192cc0b6fcb58535c 100644
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@@ -1,4 +1,4 @@
 %h1.http_status_code 404
-%h3.page_title The resource you were looking for doesn't exist.
+%h3.page-title The resource you were looking for doesn't exist.
 %hr
 %p You may have mistyped the address or the page may have moved.
diff --git a/app/views/groups/_filter.html.haml b/app/views/groups/_filter.html.haml
index 5c66f97753137c89b32fb5e1901dfa3b7daca96f..9fbc6c190cc16b867c15a7c365e0f071f35fbe13 100644
--- a/app/views/groups/_filter.html.haml
+++ b/app/views/groups/_filter.html.haml
@@ -1,11 +1,5 @@
 = form_tag group_filter_path(entity), method: 'get' do
-  %fieldset.dashboard-search-filter
-    = search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' }
-    = button_tag type: 'submit', class: 'btn' do
-      %i.icon-search
-
   %fieldset
-    %legend Status:
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if !params[:status])}
         = link_to group_filter_path(entity, status: nil) do
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index ff6b71b9ec05d8dc9cfa58eac5ee945fe761c293..cbad2e3e522495e1ede3ed08cecf3024b6ca80c2 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title
+  .title
     Projects (#{projects.count})
     - if can? current_user, :manage_group, @group
       %span.pull-right
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index eeaa4767cf9f0c58bebd26a3ec048087811e148a..ba3333832ea9fac43178c35620f23ec7c69e09a0 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -18,7 +18,7 @@
     .tab-content
       .tab-pane.active#tab-edit
         .ui-box
-          %h5.title
+          .title
             %strong= @group.name
             Group Settings:
           %div.form-holder
@@ -42,7 +42,7 @@
 
       .tab-pane#tab-projects
         .ui-box
-          %h5.title
+          .title
             %strong= @group.name
             Projects:
             - if can? current_user, :manage_group, @group
@@ -67,7 +67,7 @@
 
       .tab-pane#tab-transfer
         .ui-box.ui-box-danger
-          %h5.title Transfer group
+          .title Transfer group
           .ui-box-body
             %p
               Transferring group will cause loss of admin control over group and all child projects
@@ -78,7 +78,7 @@
 
       .tab-pane#tab-remove
         .ui-box.ui-box-danger
-          %h5.title Remove group
+          .title Remove group
           .ui-box-body
             %p
               Remove of group will cause removing all child projects and resources.
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 38dac634bf934c49cc5cb003bbba51d9ba0162ed..5c76f1c22edcdb6d0506bf54500a0abcfa66dcc0 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Issues
   %small (assigned to you)
   %small.pull-right #{@issues.total_count} issues
@@ -12,7 +12,7 @@
       - @issues.group_by(&:project).each do |group|
         %div.ui-box
           - project = group[0]
-          %h5.title
+          .title
             = link_to_project project
           %ul.well-list.issues-list
             - group[1].each do |issue|
diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml
index bd84a5e7cf9082d7d4a2ee140fc7c1d206f03bee..82a16e53c6e09267865934e2e0905e466dd7b17b 100644
--- a/app/views/groups/members.html.haml
+++ b/app/views/groups/members.html.haml
@@ -9,7 +9,7 @@
           Only group owners can manage group members
   .span6
     .ui-box
-      %h5.title
+      .title
         %strong #{@group.name}
         Group Members
         %small
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index a311729dd4d3386c3afa4f17e26729a98f3292c4..eb8497c03f1905c406c47c5af9544a77d08d0b2a 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Merge Requests
   %small (authored by or assigned to you)
   %small.pull-right #{@merge_requests.total_count} merge requests
diff --git a/app/views/help/api.html.haml b/app/views/help/api.html.haml
index b6ad5e14fc3910736c23ce549b63f9c2f2736c75..8897865192f317b7f262ec8fc53bb699eca4a808 100644
--- a/app/views/help/api.html.haml
+++ b/app/views/help/api.html.haml
@@ -1,15 +1,15 @@
 = render layout: 'help/api_layout' do
-  %h3.page_title
+  %h3.page-title
     %span.light API
     %span
       \/
     = @category.titleize
   %br
 
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       %i.icon-file
       = @category
-    .file_content.wiki
+    .file-content.wiki
       = preserve do
         = markdown File.read(Rails.root.join("doc", "api", "#{@category}.md"))
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 6529da7ddd5ee07e60ef5b1d31ee54b620394277..e5c3b577f919609821692122b12e42ff723129bc 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -1,10 +1,9 @@
-%h3.page_title
-  GITLAB
+%h2.page-title
+  GitLab
   .pull-right
     %span= Gitlab::VERSION
     %small= Gitlab::REVISION
-%hr
-%p.lead
+%p.slead
   Self Hosted Git Management
   %br
   Fast, secure and stable solution based on Ruby on Rails.
@@ -15,7 +14,7 @@
   .span4
     .ui-box
       .title
-        %h5 Quick help
+        Quick help
       %ul.well-list
         %li
           Email your
@@ -39,7 +38,7 @@
   .span4
     .ui-box
       .title
-        %h5 User documentation
+        User documentation
       %ul.well-list
         %li
           %strong= link_to "Workflow", help_workflow_path
@@ -68,7 +67,7 @@
   .span4
     .ui-box
       .title
-        %h5 Admin documentation
+        Admin documentation
       %ul.well-list
 
         %li
diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml
index b4ff88c7f93dcd7469f200891237937e1084ae52..6ba67bf050b6e62da9094420dd99fd0318d7825b 100644
--- a/app/views/help/markdown.html.haml
+++ b/app/views/help/markdown.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title GitLab Flavored Markdown
+  %h3.page-title GitLab Flavored Markdown
   %br
 
   .help_body
diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml
index 4748b296960d4ffbd158cbbca7c0f9151abb76dc..2c093ba4cd711154595663792c66061d01c54bfa 100644
--- a/app/views/help/permissions.html.haml
+++ b/app/views/help/permissions.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Permissions
+  %h3.page-title Permissions
   %br
 
   %fieldset
diff --git a/app/views/help/public_access.html.haml b/app/views/help/public_access.html.haml
index 66de17a34edc62819e82702005f0c5f8c3738e06..13bf90bc02ff8c25187c9820e519b693ac2f4875 100644
--- a/app/views/help/public_access.html.haml
+++ b/app/views/help/public_access.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Public Access
+  %h3.page-title Public Access
   %br
 
   %p
diff --git a/app/views/help/raketasks.html.haml b/app/views/help/raketasks.html.haml
index bcc874fc3902618778903d604e9e0706b812106b..d92efd4d85a3a34065ad2aa461f0b7eac4eb754c 100644
--- a/app/views/help/raketasks.html.haml
+++ b/app/views/help/raketasks.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title GitLab Rake Tasks
+  %h3.page-title GitLab Rake Tasks
   %br
 
   %p.slead
@@ -19,46 +19,46 @@
 
   .tab-content
     .tab-pane.active#features
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Features
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "features.md"))
 
     .tab-pane#maintenance
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Maintenance
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "maintenance.md"))
 
     .tab-pane#user_management
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           User Management
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "user_management.md"))
 
     .tab-pane#cleanup
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Cleanup
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "cleanup.md"))
 
     .tab-pane#backup_restore
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Backup & Restore
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md"))
diff --git a/app/views/help/ssh.html.haml b/app/views/help/ssh.html.haml
index 114415977b4e14a04b45a48957b66384550e9371..f35d578f14493c91433cdb835ed130b41d8f226d 100644
--- a/app/views/help/ssh.html.haml
+++ b/app/views/help/ssh.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title SSH Keys
+  %h3.page-title SSH Keys
   %br
 
   %p.slead
diff --git a/app/views/help/system_hooks.html.haml b/app/views/help/system_hooks.html.haml
index c49011a22698c89c23a81b10234fce1537660247..59b714dd839ccc42bc648ce90082d0a627fc52a2 100644
--- a/app/views/help/system_hooks.html.haml
+++ b/app/views/help/system_hooks.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title System hooks
+  %h3.page-title System hooks
   %br
 
   %p.slead
diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml
index 272b4c4302c714b12d01e6cebd5bc28372f50d41..d3527697631babf402580d2bc717c459d594f78f 100644
--- a/app/views/help/web_hooks.html.haml
+++ b/app/views/help/web_hooks.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Web hooks
+  %h3.page-title Web hooks
   %br
 
   %p.slead
diff --git a/app/views/help/workflow.html.haml b/app/views/help/workflow.html.haml
index 495b7c6e6fc0955fa4bb966f2911640618378aee..4143d60f889747a1e28ef2ec59e9794d714ad5a1 100644
--- a/app/views/help/workflow.html.haml
+++ b/app/views/help/workflow.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Workflow
+  %h3.page-title Workflow
   %br
 
   %ol.help
diff --git a/app/views/layouts/_page_title.html.haml b/app/views/layouts/_page_title.html.haml
index ea72b25add91a61eaadffb967ae7aa131f01ffd2..54da507476388cd697beb27ad2e7dca6bb5b68df 100644
--- a/app/views/layouts/_page_title.html.haml
+++ b/app/views/layouts/_page_title.html.haml
@@ -1,2 +1,2 @@
-- if content_for?(:page_title)
-  = yield :page_title
+- if content_for?(:page-title)
+  = yield :page-title
diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml
index 892f42124aa77fc3d5a9c52f4a14ea78a7d15c0d..01f73a24f94ba7c22587a40b6d4a7582e985898f 100644
--- a/app/views/profiles/groups/index.html.haml
+++ b/app/views/profiles/groups/index.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title
+  .title
     %strong Groups
     (#{@groups.count})
     - if current_user.can_create_group?
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 05c481ded23438c31e927862450fa3dac3872eef..03413764be4157c4799ebe8e2f792fa8df3b51f3 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,8 +1,3 @@
-%h3.page_title
-  SSH Keys
-  = link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary"
-
-%br
 %p.light
   SSH key allows you to establish a secure connection between your computer and GitLab
 %p.light
@@ -12,9 +7,10 @@
 
 
 .ui-box
-  %h5.title
+  .title
     SSH Keys (#{@keys.count})
     .pull-right
+      = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
   %ul.well-list#keys-table
     = render @keys
     - if @keys.blank?
diff --git a/app/views/profiles/keys/new.html.haml b/app/views/profiles/keys/new.html.haml
index fff3805890e173556d9adc91cb248993a93b1519..f1b8fe08d5c42d55b4782c0bf173fc87175bac69 100644
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Add an SSH Key
+%h3.page-title Add an SSH Key
 %hr
 = render 'form'
 
diff --git a/app/views/profiles/keys/show.html.haml b/app/views/profiles/keys/show.html.haml
index 735e9d1f9362880d790405683e0909e652ce161c..b736ab17087a9712cb70ee7be7c7114f27f7cd11 100644
--- a/app/views/profiles/keys/show.html.haml
+++ b/app/views/profiles/keys/show.html.haml
@@ -1,7 +1,7 @@
 .row
   .span4
     .ui-box
-      %h5.title
+      .title
         SSH Key
       %ul.well-list
         %li
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 069747097c508462c9fc38d5ff3426ec79c7beca..43b1cf6f8dfe7d96c426691b39cc17260b15ffaa 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,6 +1,4 @@
-%h3.page_title Setup your notification level
-
-%br
+%h3.page-title Setup your notification level
 
 %p.light
   %strong Disabled
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 0bcf03bae8aadfe836f48c54e65ff2d97913ff4d..dd1186fd37c8675bda2b9eb3545c5ea889c02b13 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,6 +1,5 @@
-.profile_avatar_holder
-  = image_tag gravatar_icon(@user.email, 90), alt: ''
-%h3.page_title
+= image_tag gravatar_icon(@user.email, 60), alt: '', class: 'avatar s60'
+%h3.page-title
   = @user.name
   %br
   %small
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 3f68db659fca5fca86fcd1e937a8d2585960f258..e9a6939057743ec5a1631c58fe611e86c2067185 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -11,14 +11,14 @@
       %li= link
   .clear
 
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       %i.icon-file
       %span.file_name
         = @blob.name
         %small= number_to_human_size @blob.size
       %span.options= render "projects/blob/actions"
-    .file_content.blame
+    .file-content.blame
       %table
         - current_line = 1
         - @blame.each do |commit, lines|
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml
index 68d6c06065c64847f33a741a224f427d790d86d5..6524aaeef4c418c8449c4da4d14fe83fe6b0d2b0 100644
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@@ -17,8 +17,8 @@
         = link_to title, '#'
 
 %div#tree-content-holder.tree-content-holder
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       %i.icon-file
       %span.file_name
         = blob.name
diff --git a/app/views/projects/blob/_download.html.haml b/app/views/projects/blob/_download.html.haml
index 864c209db76aa401958a21ab384f05253b023a59..951393b710460c500cd6574b9d642759194951b2 100644
--- a/app/views/projects/blob/_download.html.haml
+++ b/app/views/projects/blob/_download.html.haml
@@ -1,4 +1,4 @@
-.file_content.blob_file
+.file-content.blob_file
   %center
     = link_to project_blob_path(@project, @id) do
       %div.padded
diff --git a/app/views/projects/blob/_image.html.haml b/app/views/projects/blob/_image.html.haml
index 7b23f0c810ca41bb5def025c3b41920383005d29..c090f690d1d7d90602112e28447a736f1ea5f8f6 100644
--- a/app/views/projects/blob/_image.html.haml
+++ b/app/views/projects/blob/_image.html.haml
@@ -1,2 +1,2 @@
-.file_content.image_file
+.file-content.image_file
   %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml
index 122e275219d2f10a1c41ec6ff65851d6bf3e2d0e..bed493d6d8c8e882a892efdd58a57481cb11d191 100644
--- a/app/views/projects/blob/_text.html.haml
+++ b/app/views/projects/blob/_text.html.haml
@@ -1,12 +1,12 @@
 - if gitlab_markdown?(blob.name)
-  .file_content.wiki
+  .file-content.wiki
     = preserve do
       = markdown(blob.data)
 - elsif markup?(blob.name)
-  .file_content.wiki
+  .file-content.wiki
     = raw GitHub::Markup.render(blob.name, blob.data)
 - else
-  .file_content.code
+  .file-content.code
     - unless blob.empty?
       %div{class: user_color_scheme_class}
         = raw blob.colorize(formatter: :gitlab)
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 62ef2871096bd703d0998460291436550c95aa22..a592823a070756e8d4d17458936201bebf81e737 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -15,7 +15,7 @@
           %li= link_to "Plain Diff",    project_commit_path(@project, @commit, format: :diff)
       = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
         %span Browse Code 禄
-    %h3.commit-title.page_title
+    %h3.commit-title.page-title
       = gfm escape_once(@commit.title)
     - if @commit.description.present?
       %pre.commit-description
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 933780e453419e6c2429c317c1b5f7dc039da76a..acdb88913441936f88d77353b091d3578d7d0e3b 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -1,6 +1,6 @@
 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
   %div.ui-box
-    %h5.title
+    .title
       %i.icon-calendar
       %span= day.stamp("28 Aug, 2010")
 
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index cb9ef820d3e8cd9c522d8311ebe5f0e7e93f3276..d56923fdca4c6e4ada3610e83ca1e6cedeffd738 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -2,6 +2,8 @@
 
 - if @path.present?
   %ul.breadcrumb
+    %li.light
+      History for
     = commits_breadcrumbs
 
 %div{id: dom_id(@project)}
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 95cfb60d88567473ee2db4a196387e47b068fc95..8f108ed0b08932898859200945c0075536b31f29 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,7 +1,6 @@
 = render "projects/commits/head"
 
-%h3.page_title
+%h3.page-title
   Compare View
-%hr
 
 = render "form"
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 51e88d1c47d78916a46f4834b30e21ee2afcf376..5e6b5b71753874f37a0a6a30ad812db2a89724a8 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,8 +1,7 @@
 = render "projects/commits/head"
 
-%h3.page_title
+%h3.page-title
   Compare View
-%hr
 
 = render "form"
 
@@ -14,7 +13,7 @@
 
 - if @commits.present?
   %div.ui-box
-    %h5.title
+    .title
       Commits (#{@commits.count})
     %ul.well-list= render Commit.decorate(@commits)
 
diff --git a/app/views/projects/deploy_keys/new.html.haml b/app/views/projects/deploy_keys/new.html.haml
index b0e2a8b29490c31aaf9a9df944f861db5da7e488..186d6b58972f256ea8719302eb4f109e8a3748ca 100644
--- a/app/views/projects/deploy_keys/new.html.haml
+++ b/app/views/projects/deploy_keys/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title New Deploy key
+%h3.page-title New Deploy key
 %hr
 
 = render 'form'
diff --git a/app/views/projects/deploy_keys/show.html.haml b/app/views/projects/deploy_keys/show.html.haml
index 26fd7428b7e8516e02ab7a27c53f7c4a10f4624e..49566f83d20620dcd35d3fc340348f107da87446 100644
--- a/app/views/projects/deploy_keys/show.html.haml
+++ b/app/views/projects/deploy_keys/show.html.haml
@@ -1,10 +1,10 @@
-%h3.page_title
+%h3.page-title
   Deploy key:
   = @key.title
   %small
     created at
     = @key.created_at.stamp("Aug 21, 2011")
-.back_link
+.back-link
   = link_to project_deploy_keys_path(@project) do
     ← To keys list
 %hr
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 5d399da661d430b22aba4e4aa4553799a65b659f..2f4eba988e05f68a389ac875e489d3fd78a5f417 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -2,7 +2,7 @@
   .project-edit-errors
   .project-edit-content
     .ui-box.white
-      %h5.title
+      .title
         %strong= @project.name
         Project Settings:
       .form-holder
@@ -102,7 +102,7 @@
 
     - if can?(current_user, :change_namespace, @project)
       .ui-box.ui-box-danger
-        %h5.title Transfer project
+        .title Transfer project
         .errors-holder
         .form-holder
           = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
@@ -122,7 +122,7 @@
       %p.nothing_here_message Only project owner can transfer a project
 
     .ui-box.ui-box-danger
-      %h5.title Rename repository
+      .title Rename repository
       .errors-holder
       .form-holder
         = form_for(@project) do |f|
@@ -140,7 +140,7 @@
 
     - if can?(current_user, :remove_project, @project)
       .ui-box.ui-box-danger
-        %h5.title Remove project
+        .title Remove project
         .ui-box-body
           %p
             Remove of project will cause removing repository and all related resources like issues, merge requests etc.
diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml
index 101b479afedbb89042dc55cf107c5add15a06c0f..65b6e994884cb187c375d4333776ea8ff35dd0e6 100644
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
@@ -1,7 +1,7 @@
 .file-editor
   = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
-    .file_holder
-      .file_title
+    .file-holder
+      .file-title
         %i.icon-file
         %span.file_name
           = @path
@@ -11,7 +11,7 @@
         %span.options
           .btn-group.tree-btn-group
             = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: leave_edit_message
-      .file_content.code
+      .file-content.code
         %pre#editor= @blob.data
 
     .control-group.commit_message-group
@@ -21,7 +21,7 @@
         = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
     .form-actions
       = hidden_field_tag 'last_commit', @last_commit
-      = hidden_field_tag 'content', '', id: :file_content
+      = hidden_field_tag 'content', '', id: "file-content"
       .commit-button-annotation
         = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
         .message
@@ -40,6 +40,6 @@
   disableButtonIfEmptyField("#commit_message", ".js-commit-button");
 
   $(".js-commit-button").click(function(){
-    $("#file_content").val(editor.getValue());
+    $("#file-content").val(editor.getValue());
     $(".file-editor form").submit();
   });
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 6593319af27c62f26c5851e0cf254c8c8bab8190..6f9a161a13c95c9428a6bc89e0a69f699eb9d890 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -1,7 +1,7 @@
 .loading-graph
   %center
     .loading
-    %h3.page_title Building repository graph. Please wait a moment.
+    %h3.page-title Building repository graph. Please wait a moment.
 
 .stat-graph
   .header.clearfix
@@ -10,7 +10,7 @@
         %option{:value => "commits"} Commits
         %option{:value => "additions"} Additions
         %option{:value => "deletions"} Deletions
-    %h3#date_header.page_title
+    %h3#date_header.page-title
     %input#brush_change{:type => "hidden"}
   .graphs
     #contributors-master
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 641ab082d8d97511bb337753284a066733f5a70d..c4b51d09335f138f194571fa3b6f13b0c3361347 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -21,7 +21,7 @@
 
 -if @hooks.any?
   .ui-box
-    %h5.title
+    .title
       Hooks (#{@hooks.count})
     %ul.well-list
       - @hooks.each do |hook|
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 38aea6f06dc384c968887c3d6673b249eda2746d..153a477fdc84e92599b86d29b031390b9dd50169 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,5 +1,5 @@
 %div.issue-form-holder
-  %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
+  %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
   = form_for [@project, @issue] do |f|
     -if @issue.errors.any?
       .alert.alert-error
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index d3fd9886d45dba977783b48513aedcda4025c3e1..ebe124d89068374857c24897e56049bdbc3f6c61 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,6 +1,6 @@
 = render "head"
 .issues_content
-  %h3.page_title
+  %h3.page-title
     Issues
     %span (<span class=issue_counter>#{@issues.total_count}</span>)
     .pull-right
@@ -16,8 +16,6 @@
           = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
           = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
 
-  .clearfix
-
 .row
   .span3
     = render 'filter', entity: 'issue'
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 2c72d550b3c8fc1b983162e6ab0918eadf8a67e2..fc6faa9c19d175be36dc6c8e33e4ac2f0e5c381a 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Issue ##{@issue.id}
 
   %small
@@ -22,7 +22,7 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @issue
 
-.back_link
+.back-link
   = link_to project_issues_path(@project) do
     &larr; To issues list
 
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index b6a4b07b9ae9783645d57324036711cfd6023ac9..b0aa72783b484e5d5682e2cb97208006649edfe7 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -1,6 +1,6 @@
 = render "projects/issues/head"
 
-%h3.page_title
+%h3.page-title
   Labels
 %br
 
diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml
index eee148994d71716689fcad21a1b211d1206407fb..348ebee46e4046e35e84a02a7688fe591c39959a 100644
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = "Edit merge request #{@merge_request.id}"
 %hr
 = render 'form'
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index b9e9096e3ae1330a75eb8e167ce260a79521c277..f54a213a3f32640aa2f17d0d5de53736309fdecf 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -2,11 +2,9 @@
   = 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
+%h3.page-title
   Merge Requests
 
-%br
-
 
 .row
   .span3
diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml
index 594089995eaae7315be46e608495470b20cf8c02..8ee0e1a8d46a2d7feddf750889d03a9af9feefdf 100644
--- a/app/views/projects/merge_requests/new.html.haml
+++ b/app/views/projects/merge_requests/new.html.haml
@@ -1,3 +1,3 @@
-%h3.page_title New Merge Request
+%h3.page-title New Merge Request
 %hr
 = render 'form'
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index 8630f02d5d907b709b8592defda6b7871e7d5186..40876d16ddd64f766d7eb55174e97e8480737bd3 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1,6 +1,6 @@
 - if @commits.present?
   .ui-box
-    %h5.title
+    .title
       %i.icon-list
       Commits (#{@commits.count})
     .commits
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index ac97f6327c048096dd77863243b9d07325c75e28..0750057c762533abccf9059c5ed78c3ad2f920bc 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -14,7 +14,7 @@
             %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
             for instructions
           .accept_group
-            = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
+            = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request"
             - unless @project.root_ref? @merge_request.source_branch
               .remove_branch_holder
                 = label_tag :should_remove_source_branch, class: "checkbox" do
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 24285c272a827d79ea30c79d331286332d5eb149..5a07258f91c1974e1758f8014f402729cd7cba1b 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = "Merge Request ##{@merge_request.id}:"
   &nbsp;
   %span.label-branch= @merge_request.source_branch
@@ -26,6 +26,6 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @merge_request
 
-.back_link
+.back-link
   = link_to project_merge_requests_path(@project) do
     &larr; To merge requests
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 50e3e71b2c3b1b609ce212deb15d7323d357afe7..0dc9dab872f7cdb594ce2ab4b9630a5dfc8f29de 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,5 +1,5 @@
-%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
-.back_link
+%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
+.back-link
   = link_to project_milestones_path(@project) do
     &larr; To milestones
 
diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml
index 67a7bf819fea52f26f949fe29bc7bb9f3b573331..983692399cac39c40a504d7e7db65e89d66d5a3a 100644
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title= title
+  .title= title
   %ul.well-list
     - issues.each do |issue|
       %li
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index 1bc359398abbf3768bdea484943daaa3fd46e960..76cd16c4000df133b7d16ed7ee2f9be47db70d33 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,6 +1,6 @@
 = render "projects/issues/head"
 .milestones_content
-  %h3.page_title
+  %h3.page-title
     Milestones
     - if can? current_user, :admin_milestone, @project
       = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index d16de0da390ee4b378f469b0efe7885bd8ca5227..7be3ba2f75881ba60cac9f65bafe76b0595daa94 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -1,11 +1,11 @@
 = render "projects/issues/head"
 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Milestone ##{@milestone.id}
       %small
         = @milestone.expires_at
-    .back_link
+    .back-link
       = link_to project_milestones_path(@project) do
         &larr; To milestones list
   .span6
@@ -84,13 +84,13 @@
     .row
       .span6
         .ui-box
-          %h5.title Open
+          .title Open
           %ul.well-list
             - @merge_requests.opened.each do |merge_request|
               = render 'merge_request', merge_request: merge_request
       .span6
         .ui-box
-          %h5.title Closed
+          .title Closed
           %ul.well-list
             - @merge_requests.closed.each do |merge_request|
               = render 'merge_request', merge_request: merge_request
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index 62ab8b049ac4a989596405586b3d824fdb301da3..e75b85c7ade6a0ff7368dafadbc0a334995b831d 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Project Network Graph
+%h3.page-title Project Network Graph
 %hr
 
 .clearfix
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index ff6769531c407a6816870ce5ec71516423cb1886..b3cbf17809f7618330f335a61e991ab623e186b7 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   - if @service.activated?
     %span.cgreen
       %i.icon-circle
@@ -9,7 +9,7 @@
 
 %p= @service.description
 
-.back_link
+.back-link
   = link_to project_services_path(@project) do
     &larr; to services
 
diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml
index 6d254f66f1c3a6e622ccd2f344b97fb71d788bb3..80d17880f2eb85f3b1b933c1f9fe193a0eccf2ac 100644
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -1,5 +1,4 @@
-%h3.page_title Services
-%br
+%h3.page-title Services
 
 %ul.bordered-list
   - @services.each do |service|
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index b36b56415aa2b5b2745e136b79d8f21897517f24..38cd4c408758f18b98eef0b52023e03a6776a9b4 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -7,7 +7,7 @@
     .loading.hide
   .span3
     .light-well
-      %h3.page_title
+      %h3.page-title
         = @project.name
       - if @project.description.present?
         %p.light= @project.description
diff --git a/app/views/projects/snippets/_blob.html.haml b/app/views/projects/snippets/_blob.html.haml
index e0d1669acbe080204e8def10788fd0c676507df8..f14a2bd4ec004b034f9193dae47016a4135f90ab 100644
--- a/app/views/projects/snippets/_blob.html.haml
+++ b/app/views/projects/snippets/_blob.html.haml
@@ -1,5 +1,5 @@
-.file_holder
-  .file_title
+.file-holder
+  .file-title
     %i.icon-file
     %strong= @snippet.file_name
     %span.options
@@ -7,7 +7,7 @@
         - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
           = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-tiny", title: 'Edit Snippet'
         = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
-  .file_content.code
+  .file-content.code
     - unless @snippet.content.empty?
       %div{class: user_color_scheme_class}
         = raw @snippet.colorize(formatter: :gitlab)
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml
index 99a8761daef573d3017b9134b7ffe05967654415..a8aa5460f2eff4730bdfa40ba5a057df6940a065 100644
--- a/app/views/projects/snippets/_form.html.haml
+++ b/app/views/projects/snippets/_form.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
@@ -19,10 +19,10 @@
       .file-editor
         = f.label :file_name, "File"
         .input
-          .file_holder.snippet
-            .file_title
+          .file-holder.snippet
+            .file-title
               = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
-            .file_content.code
+            .file-content.code
               %pre#editor= @snippet.content
               = f.hidden_field :content, class: 'snippet-file-content'
 
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index ce36bed1e0d6b0348d3fe2f141d00e965c91dc9a..2e8dddefffcd7fe52c6427238420b03610d8491f 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Snippets
   %small share code pastes with others out of git repository
 
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 36161c5706ca9222122f936ed028e96a3d5541de..564c2e8b72ca175e3bd44c03eeec9b3655f6663b 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   %i.icon-lock.cgreen
   = @snippet.title
 
@@ -8,6 +8,5 @@
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
-%br
 %div= render 'projects/snippets/blob'
 %div#notes= render "projects/notes/notes_with_form"
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index 4e8f67702cf6f9557b9988ca09a68b06f61dcdcf..0eb106ee93fd8ddb0a0da2e5d550c3d188eb08bb 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -1,6 +1,6 @@
-%h3.page_title
+%h3.page-title
   = "New Team member(s)"
-%hr
+
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
   -if @user_project_relation.errors.any?
     .alert.alert-error
diff --git a/app/views/projects/team_members/_group_members.html.haml b/app/views/projects/team_members/_group_members.html.haml
index e01072d99adb7a8dd1eef6a1868fbc51cf85b528..5c3f813bb204714f9d9a05b52a7be4900a0704bb 100644
--- a/app/views/projects/team_members/_group_members.html.haml
+++ b/app/views/projects/team_members/_group_members.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title
+  .title
     %strong #{@group.name} Group
     members (#{@group.users_groups.count})
     .pull-right
diff --git a/app/views/projects/team_members/_team.html.haml b/app/views/projects/team_members/_team.html.haml
index 99231e92152990ef293e64b37878ccb432966c6e..ee660482f3fd8bf247309b6cc5954173d50657a5 100644
--- a/app/views/projects/team_members/_team.html.haml
+++ b/app/views/projects/team_members/_team.html.haml
@@ -1,7 +1,7 @@
 .team-table
   - can_admin_project = (can? current_user, :admin_project, @project)
   .ui-box
-    %h5.title
+    .title
       %strong #{@project.name} Project
       members (#{members.count})
     %ul.well-list
diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml
index 2b22c917a1604efeb365043e4911551ef20a256a..c293cb4beefc468ec7bdccbe26ed66e0d1b450f6 100644
--- a/app/views/projects/team_members/import.html.haml
+++ b/app/views/projects/team_members/import.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = "Import team from another project"
 %hr
 %p.slead
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index 8f81390ca130b0f709036934ae5441fec31ba4e9..e8ae84bb8f5c0108e7d705596acbc54d8d1d8606 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Users with access to this project
 
   - if can? current_user, :admin_team_member, @project
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index e9bb112745b3e40dfb23e07e75eb58a521ed0b4b..98bacb495628429388842d90c79ee4d335b92c8b 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,8 +1,8 @@
-.file_holder#README
-  .file_title
+.file-holder#README
+  .file-title
     %i.icon-file
     = readme.name
-  .file_content.wiki
+  .file-content.wiki
     - if gitlab_markdown?(readme.name)
       = preserve do
         = markdown(readme.data)
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 7cf08815f7861b801c9988a49af752a1f876bc1f..464b1508a7ec11a857f4a2658c948b900ef9c834 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -8,7 +8,7 @@
 
   .ui-box.ui-box-show
     .ui-box-head
-      %h3.page_title
+      %h3.page-title
         .edit-wiki-header
           = @wiki.title.titleize
           = f.hidden_field :title, value: @wiki.title
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index ca8e7c1b4b4597c5de6c9173ba700324d4570a98..66f28b8b804dd13dade996eabb913be5844a61e6 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -1,7 +1,7 @@
 %div#modal-new-wiki.modal.hide
   .modal-header
     %a.close{href: "#"} 脳
-    %h3.page_title New Wiki Page
+    %h3.page-title New Wiki Page
   .modal-body
     = label_tag :new_wiki_path do
       %span Page slug
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 4e318c92db3a37245941b5840a1a307d37662ea4..66be82777c9b832e535cd0c117a2009a65b0161a 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   Editing page
   = render 'main_links'
 = render 'form'
diff --git a/app/views/projects/wikis/empty.html.haml b/app/views/projects/wikis/empty.html.haml
index 08b59f0328ba550e167463208bc77831dc38c6e0..48058124f97fc28154ae2f46ea4b6fdb4a258c8e 100644
--- a/app/views/projects/wikis/empty.html.haml
+++ b/app/views/projects/wikis/empty.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Empty page
+%h3.page-title Empty page
 %hr
 .error_message
   You are not allowed to create wiki pages
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index 71e2b48d37070fefbf7840c9b535654d8717d9bf..e783a982ddbbf9f7f2de784f95209eac92a42396 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   Git Access
   %strong= @gollum_wiki.path_with_namespace
   = render 'main_links'
diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml
index 138c384353d144772fb110dd5fe7d09254b54efe..6544102b83f9d3faca24654c0a73de75b52a4e97 100644
--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   %span.light History for
   = @wiki.title.titleize
   = render 'main_links'
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 07e942ec62f16ce5f26865e1347d3d75fb2c1aae..829617d77cd0c850cfbb294271684e2976cc2afe 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   All Pages
   = render 'main_links'
 %br
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index d9d57e2d8be49ee9d19843bd5af7c0d4f6b5e217..f1cd782412520a24233bb7443d34266a20f32efa 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   = @wiki.title.titleize
   = render 'main_links'
 %br
@@ -8,8 +8,8 @@
     This is an old version of this page.
     You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
 
-.file_holder
-  .file_content.wiki
+.file-holder
+  .file-content.wiki
     = preserve do
       = render_wiki_content(@wiki)
 
diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml
index e2b19d0d824951b4ff54f91e06e562c7d5ce8ea1..69d86e18f3fbeede3e5d0cd777c366dcbebc0ed4 100644
--- a/app/views/public/projects/index.html.haml
+++ b/app/views/public/projects/index.html.haml
@@ -1,6 +1,6 @@
 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Projects (#{@projects.total_count})
       %small with read-only access
   .span6
diff --git a/app/views/search/_blob.html.haml b/app/views/search/_blob.html.haml
index 39e711707066660dbea83af3896df464d4b8b683..559fdd794fc9b8ec2d7be5942c7781f8764c56e9 100644
--- a/app/views/search/_blob.html.haml
+++ b/app/views/search/_blob.html.haml
@@ -1,10 +1,10 @@
 %li
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
         %i.icon-file
         %strong
           = blob.filename
-    .file_content.code.term
+    .file-content.code.term
       %div{class: user_color_scheme_class}
         = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index a7037d5987aab27b17bb2373c5b78bfa61b524c6..935a7a7f7c082ea95a9566663054840562046ee1 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -2,7 +2,7 @@
   - @merge_requests.group_by(&:project).each do |group|
     .ui-box
       - project = group[0]
-      %h5.title
+      .title
         = link_to_project project
       %ul.well-list.mr-list
         - group[1].each do |merge_request|
diff --git a/app/views/snippets/_blob.html.haml b/app/views/snippets/_blob.html.haml
index c538da0bee57f56d71cc0da13a932af0b8505371..c2e0d97a1179171accdb47929741891e53d8de2e 100644
--- a/app/views/snippets/_blob.html.haml
+++ b/app/views/snippets/_blob.html.haml
@@ -1,5 +1,5 @@
-.file_holder
-  .file_title
+.file-holder
+  .file-title
     %i.icon-file
     %strong= @snippet.file_name
     %span.options
@@ -8,7 +8,7 @@
           = link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-tiny", title: 'Edit Snippet'
           = link_to "Delete", snippet_path(@snippet), method: :delete, confirm: "Are you sure?", class: "btn btn-tiny", title: 'Delete Snippet'
         = link_to "Raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank"
-  .file_content.code
+  .file-content.code
     - unless @snippet.content.empty?
       %div{class: user_color_scheme_class}
         = raw @snippet.colorize(formatter: :gitlab)
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 95e9e0357bc9c233630a8762e43f6f6c6e3d7a1f..05502503bee0361c04d8f0e92fc56daf5f892bfd 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
@@ -22,10 +22,10 @@
       .file-editor
         = f.label :file_name, "File"
         .input
-          .file_holder.snippet
-            .file_title
+          .file-holder.snippet
+            .file-title
               = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
-            .file_content.code
+            .file-content.code
               %pre#editor= @snippet.content
               = f.hidden_field :content, class: 'snippet-file-content'
 
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index cf5c3084dc460f60503405758e1fdf01d665a992..1d9b60f73314d4a58f6d71472c57a4af8b46232b 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   My Snippets
   %small share code pastes with others out of git repository
   .pull-right
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 4301f90f9d6a2bd801d60ac59bb8b3e033cc789d..1502a6698fe1a160c3b43fdbfe510d5d5d8c74fa 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Public snippets
   %small share code pastes with others out of git repository
 
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index ac6daed56b63d68d0800bbee15d67fa1528528ea..b112511a880d518bdbc2e4d52d1e23347fbc844b 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   - if @snippet.private?
     %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"}
   - else
@@ -12,5 +12,4 @@
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
-%br
 %div= render 'blob'
diff --git a/app/views/snippets/user_index.html.haml b/app/views/snippets/user_index.html.haml
index 79e3ddf96fdce1e2c883503b545b8a0b05cf7878..a9563b75e796bb97c4c75a3e2a5a68fd1f7b95ae 100644
--- a/app/views/snippets/user_index.html.haml
+++ b/app/views/snippets/user_index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = image_tag gravatar_icon(@user.email), class: "avatar s24"
   = @user.name
   %span
diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml
index fba3660bfd33b80fef84d6501530151f6a89ca8b..4cd1eebdf91e67121e5565e1c3420212e7216dc1 100644
--- a/app/views/users/_profile.html.haml
+++ b/app/views/users/_profile.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title
+  .title
     Profile
   %ul.well-list
     %li
diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml
index 9f1446c03171f740d21713b194b6a84495977dbb..f1b2c8dd7f76a3f367e51e62ece95a3a67ac906d 100644
--- a/app/views/users/_projects.html.haml
+++ b/app/views/users/_projects.html.haml
@@ -1,5 +1,5 @@
 .ui-box
-  %h5.title Projects
+  .title Projects
   %ul.well-list
     - @projects.each do |project|
       %li
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index b70f41932094333e2de94215559f106b6f0dd6a2..284098b9b1993622dc70eba192194abe9f01b599 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,6 +1,6 @@
 .row
   .span8
-    %h3.page_title
+    %h3.page-title
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: ''
       = @user.name
       - if @user == current_user
diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/project_browse_commits.rb
index 95d3072740526b79155b73ae3df295bbb02ba7c8..71f4bd79f7eaa112bff4e85733384219be38f58b 100644
--- a/features/steps/project/project_browse_commits.rb
+++ b/features/steps/project/project_browse_commits.rb
@@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
     page.should have_selector('ul.breadcrumb span.divider', count: 3)
     page.should have_selector('ul.breadcrumb a', count: 4)
 
-    find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
+    find('ul.breadcrumb li:nth-child(2) a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
     find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z})
   end
 
diff --git a/features/steps/project/project_snippets.rb b/features/steps/project/project_snippets.rb
index 2634ea192bff52dfb478ffeb7b3d7c2f0360ee2c..d3904599ce1d7266e8a0324d55d9c65249e84e99 100644
--- a/features/steps/project/project_snippets.rb
+++ b/features/steps/project/project_snippets.rb
@@ -42,7 +42,7 @@ class ProjectSnippets < Spinach::FeatureSteps
   end
 
   And 'I click link "Edit"' do
-    within ".file_title" do
+    within ".file-title" do
       click_link "Edit"
     end
   end
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
index 1fac8d0f98818f0125077a914d0e9479add69884..d21ce9334e77dcc173b9b14d041f82c845d8d9b0 100644
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
@@ -13,7 +13,7 @@ class SnippetsFeature < Spinach::FeatureSteps
   end
 
   And 'I click link "Edit"' do
-    within ".file_title" do
+    within ".file-title" do
       click_link "Edit"
     end
   end