diff --git a/Gemfile b/Gemfile
index 842cfdc12494141f81a407c1e8c894f8b90d0c13..43b0893012904a3b92adcfbb14d8287503cb5975 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,6 @@ gem "omniauth-ldap"
 gem 'bootstrap-sass', "2.0.3.1"
 gem "colored"
 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
-gem 'modularity'
 gem 'resque_mailer'
 gem 'chosen-rails'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b0581398cf32063f3c1cb856f2bf6fe518e1da59..aca7ab5e022a107f7a71d3d4f48b040e6dd6429c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,7 +187,6 @@ GEM
     mime-types (1.18)
     modernizr (2.5.3)
       sprockets (~> 2.0)
-    modularity (0.6.1)
     multi_json (1.3.6)
     multi_xml (0.5.1)
     mysql2 (0.3.11)
@@ -368,7 +367,6 @@ DEPENDENCIES
   letter_opener
   linguist (~> 1.0.0)!
   modernizr (= 2.5.3)
-  modularity
   mysql2
   omniauth-ldap
   pry
diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index a8a38290765e5d4f344eb377155e677be27d488e..af319b5140535dba59bf237fd5f28267bd1b685c 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -403,7 +403,7 @@ form {
   margin-bottom: 40px;
   @include round-borders-all(4px);
   @include shade;
-  border-color:#ddd;
+  border-color:#CCC;
 
   ul { 
     margin:0;
@@ -522,3 +522,8 @@ ul.breadcrumb {
   }
 }
 
+.nothing_here_message { 
+  text-align:center;
+  padding:20px;
+  color:#777;
+}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 35938167d4e4c1bcc2e84ec11d173650177344f9..2da97098719d119000a56627b101080e2f8b86b6 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -29,17 +29,7 @@ class ProjectsController < ApplicationController
   end
 
   def create
-    @project = Project.new(params[:project])
-    @project.owner = current_user
-
-    Project.transaction do
-      @project.save!
-      @project.users_projects.create!(:project_access => UsersProject::MASTER, :user => current_user)
-
-      # when project saved no team member exist so
-      # project repository should be updated after first user add
-      @project.update_repository
-    end
+    @project = Project.create_by_user(params[:project], current_user)
 
     respond_to do |format|
       if @project.valid?
diff --git a/app/decorators/milestone_decorator.rb b/app/decorators/milestone_decorator.rb
deleted file mode 100644
index c881da0e9ad01e90192df3891b4d0bdfdf2f3674..0000000000000000000000000000000000000000
--- a/app/decorators/milestone_decorator.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class MilestoneDecorator < ApplicationDecorator
-  decorates :milestone
-
-end
diff --git a/app/models/project.rb b/app/models/project.rb
index 12556d35202ebc9c9ce62cc954be6364539a1741..2e4b12e999061c9154f70232a877f76de8cb4316 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -42,6 +42,25 @@ class Project < ActiveRecord::Base
     where("name like :query or code like :query or path like :query", :query => "%#{query}%")
   end
 
+  def self.create_by_user(params, user)
+    project = Project.new params
+
+    Project.transaction do
+      project.owner = user
+
+      project.save!
+
+      # Add user as project master
+      project.users_projects.create!(:project_access => UsersProject::MASTER, :user => user)
+
+      # when project saved no team member exist so
+      # project repository should be updated after first user add
+      project.update_repository
+    end
+
+    project
+  end
+
   #
   # Validations
   #
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 9516578d12d82cf145336020f00a866a127e4e79..b794e634bf85e8ba8a166d0171d6f6d6a09c2f12 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -15,5 +15,4 @@
   %hr
   = paginate @issues, :theme => "gitlab"
 - else
-  %h4.padded
-    %center Nothing to show here
+  %h3.nothing_here_message Nothing to show here
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index a7c9ed201a11079907a45da036dc15089a503bd5..a7a78f519be7e81940bab4bea4516b615a5b6479 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -15,5 +15,4 @@
   = paginate @merge_requests, :theme => "gitlab"
 
 - else
-  %h4.padded
-    %center Nothing to show here
+  %h3.nothing_here_message Nothing to show here
diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml
index 2db69bd76d9d805ff29455b107b0d680e03a87cc..0e63237b8cb8a9c07cb657d27be7b8491a493dc7 100644
--- a/app/views/help/web_hooks.html.haml
+++ b/app/views/help/web_hooks.html.haml
@@ -3,5 +3,5 @@
 
 %p Application will send POST request with some data like example below:
 %h5 Hooks request example:
-.borders= render "hooks/data_ex"
+= render "hooks/data_ex"
 
diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml
index 565cc800a8f4f53e569120067c8fd9e660cf5b99..56ca4e818ea2f37acb85d168902361492aa6b2d0 100644
--- a/app/views/keys/index.html.haml
+++ b/app/views/keys/index.html.haml
@@ -12,3 +12,8 @@
       %th
   - @keys.each do |key|
     = render(:partial => 'show', :locals => {:key => key})
+  - if @keys.blank? 
+    %tr
+      %td{:colspan => 3}
+        %h3.nothing_here_message There are no SSH keys with access to your account.
+
diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml
index 6b050e0c86dacc83bff7e798307b1ad72cdddf48..4a47e126043edeb3727acb2c167a48d9d5f82ff7 100644
--- a/app/views/projects/index.html.haml
+++ b/app/views/projects/index.html.haml
@@ -35,15 +35,15 @@
         .bottom= paginate @projects, :theme => "gitlab"
 
 - else
-  %h3 Nothing here
+  %h3.nothing_here_message There are no projects you have access to.
   %br
-  - if current_user.can_create_project?
-    .alert-message.block-message.warning
+  %h4.nothing_here_message
+    - if current_user.can_create_project?
       You can create up to
       = current_user.projects_limit
-      projects. Click on link below to add a new one
+      projects. Click on button below to add a new one
       .link_holder
-        = link_to new_project_path, :class => "" do
+        = link_to new_project_path, :class => "btn primary" do
           New Project »
-  - else
-    If you will be added to project - it will be displayed here
+    - else
+      If you will be added to project - it will be displayed here