diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 3769a2cde33d67767e71b543e12ac6e5d3499ba5..590ef63e862ef94ee79e41b01e14595d7bf2b843 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -134,8 +134,6 @@ class GroupsController < Groups::ApplicationController
   def determine_layout
     if [:new, :create].include?(action_name.to_sym)
       'application'
-    elsif [:edit, :update, :projects].include?(action_name.to_sym)
-      'group_settings'
     else
       'group'
     end
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb
index 1ff08cce8cba675a6e8603aa836060f74c75a377..542ff6412c6bf3b6d6c08113cca4ca3e6f87b21e 100644
--- a/app/controllers/projects/settings/integrations_controller.rb
+++ b/app/controllers/projects/settings/integrations_controller.rb
@@ -4,7 +4,6 @@ module Projects
       include ServiceParams
 
       before_action :authorize_admin_project!
-      layout "project_settings"
 
       def show
         @hooks = @project.hooks
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a738ca9f3618471e0bcdde912d25e9ed35d7149e..f0223c15646b864f8058870c20f0f238d7fadb8e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -297,8 +297,6 @@ class ProjectsController < Projects::ApplicationController
   def determine_layout
     if [:new, :create].include?(action_name.to_sym)
       'application'
-    elsif [:edit, :update].include?(action_name.to_sym)
-      'project_settings'
     else
       'project'
     end
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 15606dd30fd733998f77f047b04bf90870e654d3..9be5967da4110f47faa8e71f830d470172106e8d 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -1,4 +1,6 @@
 - breadcrumb_title "General Settings"
+- page_title "General Settings"
+
 .panel.panel-default.prepend-top-default
   .panel-heading
     Group settings
diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index 8d2bc810a7dfee66b540496967aaaa83a73f2fc5..da0c2fd6531abef17adce5a896db7adb5b7ddc7a 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -1,4 +1,5 @@
-- breadcrumb_title "Projects"
+- breadcrumb_title "Projects Settings"
+- page_title "Projects Settings"
 
 .panel.panel-default.prepend-top-default
   .panel-heading
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml
index 472da2a6a720008acea3822ee5d8f4dc003f8ef8..2749f42ef05f91ec69cfafe074acf2d3457c516c 100644
--- a/app/views/groups/settings/ci_cd/show.html.haml
+++ b/app/views/groups/settings/ci_cd/show.html.haml
@@ -1,4 +1,4 @@
 - breadcrumb_title "CI / CD Settings"
-- page_title "CI / CD"
+- page_title "CI / CD Settings"
 
 = render 'ci/variables/index'
diff --git a/app/views/layouts/group_settings.html.haml b/app/views/layouts/group_settings.html.haml
deleted file mode 100644
index 66b115e36de69e0d332051f3965bfbeb9a3b53fa..0000000000000000000000000000000000000000
--- a/app/views/layouts/group_settings.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- page_title    "Settings"
-- nav           "group"
-
-= render template: "layouts/group"
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index 8765b81440563359ae7935e684d780afaf234830..1470af78daa0e4100e138f80d8f74096d6e29803 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -215,57 +215,49 @@
                 %strong.fly-out-top-item-name
                   #{ _('Snippets') }
 
+      = nav_link(controller: :project_members) do
+        = link_to project_settings_members_path(@project), title: 'Members' do
+          .nav-icon-container
+            = sprite_icon('users')
+          %span.nav-item-name
+            Members
+
       - if project_nav_tab? :settings
-        = nav_link(path: %w[projects#edit project_members#index integrations#show services#edit repository#show ci_cd#show pages#show]) do
-          = link_to edit_project_path(@project), class: 'shortcuts-tree' do
+        = nav_link(path: %w[projects#edit integrations#show services#edit repository#show ci_cd#show pages#show]) do
+          = link_to edit_project_path(@project) do
             .nav-icon-container
               = sprite_icon('settings')
             %span.nav-item-name
               Settings
 
           %ul.sidebar-sub-level-items
-            - can_edit = can?(current_user, :admin_project, @project)
-            - if can_edit
-              = nav_link(path: %w[projects#edit project_members#index integrations#show services#edit repository#show ci_cd#show pages#show], html_options: { class: "fly-out-top-item" } ) do
-                = link_to edit_project_path(@project) do
-                  %strong.fly-out-top-item-name
-                    #{ _('Settings') }
-              %li.divider.fly-out-top-item
-              = nav_link(path: %w[projects#edit]) do
-                = link_to edit_project_path(@project), title: 'General' do
-                  %span
-                    General
-            = nav_link(controller: :project_members) do
-              = link_to project_project_members_path(@project), title: 'Members' do
+            = nav_link(path: %w[projects#edit integrations#show services#edit repository#show ci_cd#show pages#show], html_options: { class: "fly-out-top-item" } ) do
+              = link_to edit_project_path(@project) do
+                %strong.fly-out-top-item-name
+                  #{ _('Settings') }
+            %li.divider.fly-out-top-item
+            = nav_link(path: %w[projects#edit]) do
+              = link_to edit_project_path(@project), title: 'General' do
+                %span
+                  General
+            = nav_link(controller: [:integrations, :services, :hooks, :hook_logs]) do
+              = link_to project_settings_integrations_path(@project), title: 'Integrations' do
+                %span
+                  Integrations
+            = nav_link(controller: :repository) do
+              = link_to project_settings_repository_path(@project), title: 'Repository' do
                 %span
-                  Members
-            - if can_edit
-              = nav_link(controller: [:integrations, :services, :hooks, :hook_logs]) do
-                = link_to project_settings_integrations_path(@project), title: 'Integrations' do
+                  Repository
+            - if @project.feature_available?(:builds, current_user)
+              = nav_link(controller: :ci_cd) do
+                = link_to project_settings_ci_cd_path(@project), title: 'CI / CD' do
                   %span
-                    Integrations
-              = nav_link(controller: :repository) do
-                = link_to project_settings_repository_path(@project), title: 'Repository' do
+                    CI / CD
+            - if @project.pages_available?
+              = nav_link(controller: :pages) do
+                = link_to project_pages_path(@project), title: 'Pages' do
                   %span
-                    Repository
-              - if @project.feature_available?(:builds, current_user)
-                = nav_link(controller: :ci_cd) do
-                  = link_to project_settings_ci_cd_path(@project), title: 'CI / CD' do
-                    %span
-                      CI / CD
-              - if @project.pages_available?
-                = nav_link(controller: :pages) do
-                  = link_to project_pages_path(@project), title: 'Pages' do
-                    %span
-                      Pages
-
-      - else
-        = nav_link(path: %w[members#show]) do
-          = link_to project_settings_members_path(@project), title: 'Members', class: 'shortcuts-tree' do
-            .nav-icon-container
-              = sprite_icon('users')
-            %span.nav-item-name
-              Members
+                    Pages
 
       = render 'shared/sidebar_toggle_button'
 
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
deleted file mode 100644
index 4bc94bd132daa3cc911c961a5c000163e3f28559..0000000000000000000000000000000000000000
--- a/app/views/layouts/project_settings.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- page_title  "Settings"
-- nav         "project"
-
-= render template: "layouts/project"
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index e45861ac08d899efbfde6c0d2ce58b9798abd9c7..ffd9a7e8ee7a8142f2d6dfe515e91434bc642be9 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -1,5 +1,6 @@
 - @no_container = true
 - project_duration = age_map_duration(@blame_groups, @project)
+- breadcrumb_title _("Files")
 - page_title "Blame", @blob.path, @ref
 
 %div{ class: container_class }
diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml
index c4712bf3736de582481c30a545fb64763df2ce2d..99f396fb476e9ac06598714cfea9a385b97b6a24 100644
--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
@@ -1,4 +1,4 @@
-- breadcrumb_title "Repository"
+- breadcrumb_title _("Files")
 - @no_container = true
 
 - page_title @blob.path, @ref
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 3ad0166e9cd9052b776d20ea98b88eb1ae6dcc37..551452e84356524d1da5bef77cef6614d5e86b8b 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,6 +1,6 @@
 - @no_container = true
 - breadcrumb_title "Compare Revisions"
-- page_title "Compare"
+- page_title "Compare Revisions"
 
 %div{ class: container_class }
   .sub-header-block
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index f87f1d476f57372912135fe7e4a7167c54f23d89..5e1f8220af8c6323f596821e7cd4f211c5702960 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,5 +1,5 @@
 - @no_container = true
-- add_to_breadcrumbs "Compare Revisions", project_compare_index_path(@project)
+- breadcrumb_title "Compare Revisions"
 - page_title "#{params[:from]}...#{params[:to]}"
 
 %div{ class: container_class }
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 8ae4fd941463e6ff27caa2657e3eb118db2a0e5b..affe80d0951b650bf728fe42bc89673370768e98 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -1,5 +1,5 @@
 - breadcrumb_title "General Settings"
-- page_title "General"
+- page_title "General Settings"
 - @content_class = "limit-container-width" unless fluid_layout
 - expanded = Rails.env.test?
 
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index 2e85f608823cedd2579715705623cfc40d8f1eec..6f96b7d606847b56f6a487c98e59cff64bdd1c16 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -1,6 +1,5 @@
 - @no_container = true
 - page_title "Environments"
-- add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
 
 - content_for :page_specific_javascripts do
   = page_specific_javascript_bundle_tag('common_vue')
diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml
index a3467eb6f05ed49b2a20b2f2e217a05ab9d60ad0..e042989fbc2c4b398d2b2f962890f64e27d66566 100644
--- a/app/views/projects/find_file/show.html.haml
+++ b/app/views/projects/find_file/show.html.haml
@@ -1,3 +1,4 @@
+- breadcrumb_title _("Files")
 - page_title "Find File", @ref
 
 .file-finder-holder.tree-holder.clearfix.js-file-finder{ 'data-file-find-url': "#{escape_javascript(project_files_path(@project, @ref, @options.merge(format: :json)))}", 'data-find-tree-url': escape_javascript(project_tree_path(@project, @ref)), 'data-blob-url-template': escape_javascript(project_blob_path(@project, @id || @commit.id)) }
diff --git a/app/views/projects/pipelines/charts.html.haml b/app/views/projects/pipelines/charts.html.haml
index ba55bc23addbe55114b53bc47d7f11e488eb0e93..561d18ba61bc7ea6e1662c98c6e48c4a29953c01 100644
--- a/app/views/projects/pipelines/charts.html.haml
+++ b/app/views/projects/pipelines/charts.html.haml
@@ -1,6 +1,6 @@
 - @no_container = true
 - breadcrumb_title "CI / CD Charts"
-- page_title _("Charts"), _("Pipelines")
+- page_title _("CI/CD Charts")
 - content_for :page_specific_javascripts do
   = page_specific_javascript_bundle_tag('common_d3')
   = page_specific_javascript_bundle_tag('graphs')
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 62455d0d40de24ba4f7efc45957285436fb600f6..1568eb258ea67c53475cabf463ba838cce1b99f4 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -1,6 +1,5 @@
 - @content_class = "limit-container-width" unless fluid_layout
 - page_title "CI / CD Settings"
-- page_title "CI / CD"
 
 - expanded = Rails.env.test?
 
diff --git a/app/views/projects/settings/integrations/show.html.haml b/app/views/projects/settings/integrations/show.html.haml
index 2f1a548e119b258e991d4145f1afe8f3971bd45e..555a36ef39e94b2119609bbca1972053b5d7fd83 100644
--- a/app/views/projects/settings/integrations/show.html.haml
+++ b/app/views/projects/settings/integrations/show.html.haml
@@ -1,5 +1,5 @@
 - @content_class = "limit-container-width" unless fluid_layout
 - breadcrumb_title "Integrations Settings"
-- page_title 'Integrations'
+- page_title 'Integrations Settings'
 = render 'projects/hooks/index'
 = render 'projects/services/index'
diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml
index 517d51993d2c30ba26db75bcc8e77bd4159d4a5f..4e8c1345a672f5003d333ae78be26017cf7c968c 100644
--- a/app/views/projects/settings/repository/show.html.haml
+++ b/app/views/projects/settings/repository/show.html.haml
@@ -1,5 +1,5 @@
 - breadcrumb_title "Repository Settings"
-- page_title "Repository"
+- page_title "Repository Settings"
 - @content_class = "limit-container-width" unless fluid_layout
 
 - content_for :page_specific_javascripts do
diff --git a/app/views/projects/snippets/new.html.haml b/app/views/projects/snippets/new.html.haml
index 1359a815429c7e701c8b2bcbf561d3a613314ed4..347ef2de6897c9a913b7c942cc5409702757244d 100644
--- a/app/views/projects/snippets/new.html.haml
+++ b/app/views/projects/snippets/new.html.haml
@@ -1,6 +1,5 @@
-- add_to_breadcrumbs "Snippets", project_snippets_path(@project)
-- breadcrumb_title "New"
-- page_title "New Snippets"
+- breadcrumb_title "Snippets"
+- page_title "New Snippet"
 
 %h3.page-title
   New Snippet
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 27d58d4c0e805215e469b815ab46926a837ebf57..aeb89728ca912a0bf42bd8590c22421024c80a2a 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -1,7 +1,6 @@
 - @no_container = true
 - @sort ||= sort_value_recently_updated
 - page_title "Tags"
-- add_to_breadcrumbs("Repository", project_tree_path(@project))
 
 .flex-list{ class: container_class }
   .top-area.adjust
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 0cc6674842a62f8a7ea5e45608a8e7c368bf8941..58dd901fdd3ce741941903be4c567bebe4e73fc2 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -1,5 +1,5 @@
 - @no_container = true
-- breadcrumb_title _("Repository")
+- breadcrumb_title _("Files")
 - @content_class = "limit-container-width" unless fluid_layout
 
 - page_title @path.presence || _("Files"), @ref
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml
index ee8ad8e3999507f825a5e89917c5580661e8e1fd..3481e31120b46b98395d6bbe84e223eac32aa55a 100644
--- a/app/views/shared/boards/_show.html.haml
+++ b/app/views/shared/boards/_show.html.haml
@@ -2,7 +2,7 @@
 - @no_container = true
 - @content_class = "issue-boards-content"
 - breadcrumb_title "Issue Board"
-- page_title "Boards"
+- page_title "Issue Board"
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
index 18ebeb78f87bb0437a8febc16a8a1c642eb77242..0e7477046e5828456ddfa05d3fdd2e86fb0c1120 100644
--- a/app/views/snippets/edit.html.haml
+++ b/app/views/snippets/edit.html.haml
@@ -1,3 +1,4 @@
+- breadcrumb_title @snippet.to_reference
 - page_title "Edit", "#{@snippet.title} (#{@snippet.to_reference})", "Snippets"
 %h3.page-title
   Edit Snippet