diff --git a/CHANGELOG b/CHANGELOG
index 80b68b0..3a91676 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,11 @@ v 2.8.0
   - Bulk issues update
   - Issues API
   - Cucumber coverage increased
+  - Post-receive files fixed
+  - UI improved
+  - Application cleanup
+  - more cucumber
+  - capybara-webkit + headless
 
 v 2.7.0
   - Issue Labels
diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index e3f3e7a..8bc63e2 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -330,16 +330,20 @@ img.avatar {
   float:left;
   margin-right:15px;
   width:40px;
-  border:2px solid #ddd;
+  border:1px solid #ddd;
+  padding:1px;
 
   &.s16 {
     width:16px;
+    height:16px;
   }
   &.s24 {
     width:24px;
+    height:24px;
   }
   &.s32 {
     width:32px;
+    height:32px;
   }
 }
 
diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss
index 2808ad3..c630f38 100644
--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -20,6 +20,10 @@
 
     .fbtn {
       .btn {
+        i {
+          position: relative;
+          top: 1px;
+        }
         margin-left:8px;
         background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595D63), to(#31363E));
         background-image: -webkit-linear-gradient(#595D63 6.6%, #31363E);
@@ -32,6 +36,10 @@
           background-image: -moz-linear-gradient(#595D63 6.6%, #202227);
           background-image: -o-linear-gradient(#595D63 6.6%, #202227);
           background-position:0 0;
+          color:#fff;
+          i { 
+            @extend .icon-white;
+          }
         }
 
         border: 1px solid #31363E;
diff --git a/app/models/project.rb b/app/models/project.rb
index 714953c..3fe1191 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2,7 +2,7 @@ require "grit"
 
 class Project < ActiveRecord::Base
   include Repository
-  include ProjectPush
+  include PushObserver
   include Authority
   include Team
 
diff --git a/app/roles/project_push.rb b/app/roles/project_push.rb
deleted file mode 100644
index 0202538..0000000
--- a/app/roles/project_push.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-module ProjectPush
-  def observe_push(oldrev, newrev, ref, user)
-    data = post_receive_data(oldrev, newrev, ref, user)
-
-    Event.create(
-      project: self,
-      action: Event::Pushed,
-      data: data,
-      author_id: data[:user_id]
-    )
-  end
-
-  def update_merge_requests(oldrev, newrev, ref, user)
-    return true unless ref =~ /heads/
-    branch_name = ref.gsub("refs/heads/", "")
-    c_ids = self.commits_between(oldrev, newrev).map(&:id)
-
-    # Update code for merge requests
-    mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
-    mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
-
-    # Close merge requests
-    mrs = self.merge_requests.opened.where(target_branch: branch_name).all
-    mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
-    mrs.each { |merge_request| merge_request.merge!(user.id) }
-
-    true
-  end
-
-  def execute_hooks(oldrev, newrev, ref, user)
-    ref_parts = ref.split('/')
-
-    # Return if this is not a push to a branch (e.g. new commits)
-    return if ref_parts[1] !~ /heads/ || oldrev == "00000000000000000000000000000000"
-
-    data = post_receive_data(oldrev, newrev, ref, user)
-
-    hooks.each { |hook| hook.execute(data) }
-  end
-
-  def post_receive_data(oldrev, newrev, ref, user)
-
-    push_commits = commits_between(oldrev, newrev)
-
-    # Total commits count
-    push_commits_count = push_commits.size
-
-    # Get latest 20 commits ASC
-    push_commits_limited = push_commits.last(20)
-
-    # Hash to be passed as post_receive_data
-    data = {
-      before: oldrev,
-      after: newrev,
-      ref: ref,
-      user_id: user.id,
-      user_name: user.name,
-      repository: {
-        name: name,
-        url: web_url,
-        description: description,
-        homepage: web_url,
-      },
-      commits: [],
-      total_commits_count: push_commits_count
-    }
-
-    # For perfomance purposes maximum 20 latest commits
-    # will be passed as post receive hook data.
-    #
-    push_commits_limited.each do |commit|
-      data[:commits] << {
-        id: commit.id,
-        message: commit.safe_message,
-        timestamp: commit.date.xmlschema,
-        url: "#{Gitlab.config.url}/#{code}/commits/#{commit.id}",
-        author: {
-          name: commit.author_name,
-          email: commit.author_email
-        }
-      }
-    end
-
-    data
-  end
-
-
-  # This method will be called after each post receive
-  # and only if user present in gitlab.
-  # All callbacks for post receive should be placed here
-  #
-  def trigger_post_receive(oldrev, newrev, ref, user)
-    # Create push event
-    self.observe_push(oldrev, newrev, ref, user)
-
-    # Close merged MR
-    self.update_merge_requests(oldrev, newrev, ref, user)
-
-    # Execute web hooks
-    self.execute_hooks(oldrev, newrev, ref, user)
-
-    # Create satellite
-    self.satellite.create unless self.satellite.exists?
-  end
-end
diff --git a/app/roles/push_observer.rb b/app/roles/push_observer.rb
new file mode 100644
index 0000000..1067404
--- /dev/null
+++ b/app/roles/push_observer.rb
@@ -0,0 +1,105 @@
+module PushObserver
+  def observe_push(oldrev, newrev, ref, user)
+    data = post_receive_data(oldrev, newrev, ref, user)
+
+    Event.create(
+      project: self,
+      action: Event::Pushed,
+      data: data,
+      author_id: data[:user_id]
+    )
+  end
+
+  def update_merge_requests(oldrev, newrev, ref, user)
+    return true unless ref =~ /heads/
+    branch_name = ref.gsub("refs/heads/", "")
+    c_ids = self.commits_between(oldrev, newrev).map(&:id)
+
+    # Update code for merge requests
+    mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
+    mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
+
+    # Close merge requests
+    mrs = self.merge_requests.opened.where(target_branch: branch_name).all
+    mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
+    mrs.each { |merge_request| merge_request.merge!(user.id) }
+
+    true
+  end
+
+  def execute_hooks(oldrev, newrev, ref, user)
+    ref_parts = ref.split('/')
+
+    # Return if this is not a push to a branch (e.g. new commits)
+    return if ref_parts[1] !~ /heads/ || oldrev == "00000000000000000000000000000000"
+
+    data = post_receive_data(oldrev, newrev, ref, user)
+
+    hooks.each { |hook| hook.execute(data) }
+  end
+
+  def post_receive_data(oldrev, newrev, ref, user)
+
+    push_commits = commits_between(oldrev, newrev)
+
+    # Total commits count
+    push_commits_count = push_commits.size
+
+    # Get latest 20 commits ASC
+    push_commits_limited = push_commits.last(20)
+
+    # Hash to be passed as post_receive_data
+    data = {
+      before: oldrev,
+      after: newrev,
+      ref: ref,
+      user_id: user.id,
+      user_name: user.name,
+      repository: {
+        name: name,
+        url: web_url,
+        description: description,
+        homepage: web_url,
+      },
+      commits: [],
+      total_commits_count: push_commits_count
+    }
+
+    # For perfomance purposes maximum 20 latest commits
+    # will be passed as post receive hook data.
+    #
+    push_commits_limited.each do |commit|
+      data[:commits] << {
+        id: commit.id,
+        message: commit.safe_message,
+        timestamp: commit.date.xmlschema,
+        url: "#{Gitlab.config.url}/#{code}/commits/#{commit.id}",
+        author: {
+          name: commit.author_name,
+          email: commit.author_email
+        }
+      }
+    end
+
+    data
+  end
+
+
+  # This method will be called after each post receive
+  # and only if user present in gitlab.
+  # All callbacks for post receive should be placed here
+  #
+  def trigger_post_receive(oldrev, newrev, ref, user)
+    # Create push event
+    self.observe_push(oldrev, newrev, ref, user)
+
+    # Close merged MR
+    self.update_merge_requests(oldrev, newrev, ref, user)
+
+    # Execute web hooks
+    self.execute_hooks(oldrev, newrev, ref, user)
+
+    # Create satellite
+    self.satellite.create unless self.satellite.exists?
+  end
+end
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index f47554c..2dc4fb6 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -9,7 +9,7 @@
         %span.label Blocked
 
     = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
-      = image_tag gravatar_icon(user.email, 40), class: "avatar"
+      = image_tag gravatar_icon(user.email, 40), class: "avatar s32"
     = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
       %strong= truncate(user.name, lenght: 40)
     %br
--
libgit2 0.21.2