8 files changed, 12 insertions, 11 deletions
diff --git a/app/views/layouts/ci/_nav_admin.html.haml b/app/views/layouts/ci/_nav_admin.html.haml
index d0ca4c421ef..e9974c85733 100644
--- a/app/views/layouts/ci/_nav_admin.html.haml
+++ b/app/views/layouts/ci/_nav_admin.html.haml
@@ -1,9 +1,9 @@
 %ul.nav.nav-sidebar
   = nav_link do
-    = link_to admin_root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
+    = link_to admin_root_path, title: 'Back to admin', data: {placement: 'right'}, class: 'back-link' do
       = icon('caret-square-o-left fw')
       %span
-        Back to Admin
+        Back to admin
 
   %li.separate-item
   = nav_link path: 'projects#index' do
diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml
index fad7de69432..cb96bcc2cf4 100644
--- a/app/views/layouts/dashboard.html.haml
+++ b/app/views/layouts/dashboard.html.haml
@@ -1,6 +1,5 @@
 - page_title    "Dashboard"
-- unless @header_title
-  - header_title  "Dashboard", root_path
+- header_title  "Dashboard", root_path unless header_title
 - sidebar       "dashboard"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 4f00d01d4cd..31888c5580e 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -1,6 +1,5 @@
 - page_title    @group.name
-- unless @header_title
-  - header_title  @group.name, group_path(@group)
-- sidebar       "group" unless sidebar
+- header_title  group_title(@group) unless header_title
+- sidebar       "group"             unless sidebar
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/group_settings.html.haml b/app/views/layouts/group_settings.html.haml
index e303a561628..a1a1fc2f858 100644
--- a/app/views/layouts/group_settings.html.haml
+++ b/app/views/layouts/group_settings.html.haml
@@ -1,4 +1,5 @@
 - page_title    "Settings"
+- header_title group_title(@group, "Settings", edit_group_path(@group))
 - sidebar       "group_settings"
 
 = render template: "layouts/group"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index f172e9b4ae8..3bda7c46959 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -46,6 +46,8 @@
       = icon('question-circle fw')
       %span
         Help
+
+  %li.separate-item
   = nav_link(controller: :profile) do
     = link_to profile_path, title: 'Profile settings', data: {placement: 'bottom'} do
       = icon('user fw')
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index b80ce0dfc75..dfa6cc5702e 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -1,6 +1,5 @@
 - page_title    "Profile Settings"
-- unless @header_title
-  - header_title  "Profile Settings", profile_path
+- header_title  "Profile Settings", profile_path unless header_title
 - sidebar       "profile"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 5c4dd67f0ec..78dafcd8bfa 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -1,6 +1,6 @@
 - page_title    @project.name_with_namespace
-- header_title  detect_project_title(@project)
-- sidebar       "project" unless sidebar
+- header_title  project_title(@project) unless header_title
+- sidebar       "project"               unless sidebar
 
 - content_for :scripts_body_top do
   - if current_user
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
index 43401668334..59ce38f67bb 100644
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
@@ -1,4 +1,5 @@
 - page_title  "Settings"
+- header_title project_title(@project, "Settings", edit_project_path(@project))
 - sidebar     "project_settings"
 
 = render template: "layouts/project"