diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 5bd6de896ee..063a210cb2c 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -73,7 +73,7 @@ module TabHelper
   end
 
   def project_tab_class
-    [:show, :files, :edit, :update].each do |action|
+    [:files, :edit].each do |action|
       return "active" if current_page?(controller: "projects", action: action, id: @project)
     end
 
diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml
index 37d0f16fa20..46d06960723 100644
--- a/app/views/layouts/project_resource.html.haml
+++ b/app/views/layouts/project_resource.html.haml
@@ -9,7 +9,7 @@
 
     .container
       %ul.main_menu
-        = nav_link(html_options: {class: "home #{project_tab_class}"}) do
+        = nav_link(path: 'projects#show', html_options: {class: "home"}) do
           = link_to project_path(@project), title: "Project" do
             %i.icon-home
 
@@ -22,7 +22,7 @@
             = nav_link(controller: %w(graph)) do
               = link_to "Network", project_graph_path(@project, @ref || @repository.root_ref)
 
-        - if @project.issues_enabled 
+        - if @project.issues_enabled
           = nav_link(controller: %w(issues milestones labels)) do
             = link_to url_for_project_issues do
               Issues
@@ -43,4 +43,9 @@
           = nav_link(controller: :wikis) do
             = link_to 'Wiki', project_wiki_path(@project, :index)
 
+        - if can? current_user, :admin_project, @project
+          = nav_link(html_options: {class: "#{project_tab_class}"}) do
+            = link_to edit_project_path(@project), class: "stat-tab tab " do
+              Settings
+
       .content= yield
diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index b8c88853a62..bdea0269643 100644
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -1,31 +1,27 @@
 %ul.nav.nav-tabs
-  = nav_link(path: 'projects#show') do
-    = link_to project_path(@project), class: "activities-tab tab" do
-      %i.icon-home
-      Show
+  = nav_link(path: 'projects#edit') do
+    = link_to edit_project_path(@project), class: "stat-tab tab " do
+      %i.icon-edit
+      Edit
   = nav_link(controller: [:team_members, :teams]) do
     = link_to project_team_index_path(@project), class: "team-tab tab" do
       %i.icon-user
       Team
-  = nav_link(path: 'projects#files') do
-    = link_to 'Attachments', files_project_path(@project), class: "files-tab tab"
-  = nav_link(controller: :snippets) do
-    = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
+  = nav_link(controller: :deploy_keys) do
+    = link_to project_deploy_keys_path(@project) do
+      %span
+      Deploy Keys
+  = nav_link(controller: :hooks) do
+    = link_to project_hooks_path(@project) do
+      %span
+      Hooks
+  = nav_link(controller: :services) do
+    = link_to project_services_path(@project) do
+      %span
+      Services
+
+  -#= nav_link(path: 'projects#files') do
+    -#= link_to 'Attachments', files_project_path(@project), class: "files-tab tab"
+  -#= nav_link(controller: :snippets) do
+    -#= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
 
-  - if can? current_user, :admin_project, @project
-    = nav_link(controller: :deploy_keys, html_options: {class: 'pull-right'}) do
-      = link_to project_deploy_keys_path(@project) do
-        %span
-        Deploy Keys
-    = nav_link(controller: :hooks, html_options: {class: 'pull-right'}) do
-      = link_to project_hooks_path(@project) do
-        %span
-        Hooks
-    = nav_link(controller: :services, html_options: {class: 'pull-right'}) do
-      = link_to project_services_path(@project) do
-        %span
-        Services
-    = nav_link(path: 'projects#edit', html_options: {class: 'pull-right'}) do
-      = link_to edit_project_path(@project), class: "stat-tab tab " do
-        %i.icon-edit
-        Edit
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 861930cab35..824d4daf698 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,4 +1,3 @@
-= render "project_head"
 = render 'clone_panel'
 = render "events/event_last_push", event: @last_push