From 91b6d925292f7bb62f059f2ba06c41e775ef2eb7 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Thu, 12 May 2016 17:26:39 -0700
Subject: [PATCH 01/17] Changes settings to management

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/index.js                   |   7 +-
 .../dashboard/components/panel/panel.js       |   4 +-
 .../dashboard/services/saved_dashboards.js    |   2 +-
 .../public/discover/controllers/discover.js   |   2 +-
 .../discover/saved_searches/saved_searches.js |   2 +-
 src/plugins/kibana/public/kibana.js           |   2 +-
 src/plugins/kibana/public/management/app.html |  23 +
 src/plugins/kibana/public/management/index.js |  64 +++
 .../kibana/public/management/landing.html     |  45 ++
 .../saved_object_registry.js                  |   0
 .../public/management/sections/index.js       |   3 +
 .../sections/indices/_create.html             |  10 +-
 .../sections/indices/_create.js               |  14 +-
 .../sections/indices/_date_scripts.js         |   0
 .../sections/indices/_edit.html               |  16 +-
 .../sections/indices/_edit.js                 |  26 +-
 .../sections/indices/_field_controls.html     |   0
 .../sections/indices/_field_editor.html       |  10 +-
 .../sections/indices/_field_editor.js         |  14 +-
 .../sections/indices/_field_name.html         |   0
 .../sections/indices/_field_popularity.html   |   0
 .../sections/indices/_field_type.html         |   0
 .../sections/indices/_field_types.js          |   0
 .../sections/indices/_index_header.html       |   0
 .../sections/indices/_index_header.js         |   6 +-
 .../sections/indices/_indexed_fields.html     |   0
 .../sections/indices/_indexed_fields.js       |  10 +-
 .../sections/indices/_refresh_kibana_index.js |   0
 .../sections/indices/_scripted_fields.html    |   0
 .../sections/indices/_scripted_fields.js      |  12 +-
 .../sections/indices/index.html               |   2 +-
 .../management/sections/indices/index.js      |  66 +++
 .../sections/objects/_objects.html            |  10 +-
 .../sections/objects/_objects.js              |  12 +-
 .../sections/objects/_view.html               |   8 +-
 .../sections/objects/_view.js                 |  12 +-
 .../management/sections/objects/index.js      |  15 +
 .../sections/settings}/advanced_row.html      |   0
 .../sections/settings}/advanced_row.js        |   4 +-
 .../sections/settings}/index.html             |   8 +-
 .../sections/settings}/index.js               |  25 +-
 .../lib/__tests__/get_editor_type.js          |   2 +-
 .../settings}/lib/__tests__/get_val_type.js   |   2 +-
 .../lib/__tests__/to_editable_config.js       |   2 +-
 .../sections/settings}/lib/get_editor_type.js |   0
 .../sections/settings}/lib/get_val_type.js    |   0
 .../settings}/lib/to_editable_config.js       |   0
 .../{settings => management}/styles/main.less | 119 +++--
 src/plugins/kibana/public/settings/app.html   |  14 -
 src/plugins/kibana/public/settings/index.js   |  53 --
 .../settings/sections/about/barcode.svg       | 454 ------------------
 .../public/settings/sections/about/index.html |  35 --
 .../public/settings/sections/about/index.js   |  25 -
 .../public/settings/sections/indices/index.js |  54 ---
 .../public/settings/sections/objects/index.js |  18 -
 .../public/settings/sections/status/index.js  |   9 -
 .../kibana/public/visualize/editor/editor.js  |   6 +-
 .../saved_visualizations.js                   |   4 +-
 src/ui/public/chrome/api/angular.js           |  10 +-
 src/ui/public/directives/bread_crumbs.js      |   7 +-
 .../public/directives/saved_object_finder.js  |   2 +-
 src/ui/public/errors.js                       |   2 +-
 src/ui/public/field_editor/field_editor.js    |   1 -
 .../field_format_editor.js                    |   2 +-
 src/ui/public/icons/beats.svg                 |   1 +
 src/ui/public/icons/elasticsearch.svg         |   1 +
 src/ui/public/icons/kibana.svg                |   1 +
 src/ui/public/icons/logstash.svg              |   1 +
 src/ui/public/index_patterns/_ensure_some.js  |   2 +-
 src/ui/public/index_patterns/_field.js        |   2 +-
 .../public/index_patterns/_index_pattern.js   |   8 +-
 src/ui/public/management/__tests__/index.js   |  10 +
 src/ui/public/management/__tests__/section.js | 108 +++++
 src/ui/public/management/index.js             |  23 +
 src/ui/public/management/section.js           |  68 +++
 src/ui/public/registry/settings_sections.js   |   5 -
 src/ui/public/styles/base.less                |  46 ++
 src/ui/public/styles/variables/colors.less    |   5 +
 src/ui/public/styles/variables/for-theme.less |  12 +-
 src/ui/ui_exports.js                          |   2 +-
 .../_creation_form_changes.js                 |   0
 .../_index_pattern_create_delete.js           |   0
 .../_index_pattern_popularity.js              |   0
 .../_index_pattern_results_sort.js            |   0
 .../_initial_state.js                         |   0
 .../_kibana_settings.js}                      |   8 +-
 .../apps/{settings => management}/index.js    |   2 +-
 test/functional/index.js                      |   2 +-
 test/server_config.js                         |   2 +-
 test/support/pages/settings_page.js           |  63 +--
 90 files changed, 743 insertions(+), 884 deletions(-)
 create mode 100644 src/plugins/kibana/public/management/app.html
 create mode 100644 src/plugins/kibana/public/management/index.js
 create mode 100644 src/plugins/kibana/public/management/landing.html
 rename src/plugins/kibana/public/{settings => management}/saved_object_registry.js (100%)
 create mode 100644 src/plugins/kibana/public/management/sections/index.js
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_create.html (97%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_create.js (93%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_date_scripts.js (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_edit.html (87%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_edit.js (65%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_field_controls.html (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_field_editor.html (63%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_field_editor.js (75%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_field_name.html (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_field_popularity.html (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_field_type.html (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_field_types.js (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_index_header.html (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_index_header.js (75%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_indexed_fields.html (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_indexed_fields.js (84%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_refresh_kibana_index.js (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_scripted_fields.html (100%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/_scripted_fields.js (84%)
 rename src/plugins/kibana/public/{settings => management}/sections/indices/index.html (96%)
 create mode 100644 src/plugins/kibana/public/management/sections/indices/index.js
 rename src/plugins/kibana/public/{settings => management}/sections/objects/_objects.html (93%)
 rename src/plugins/kibana/public/{settings => management}/sections/objects/_objects.js (92%)
 rename src/plugins/kibana/public/{settings => management}/sections/objects/_view.html (94%)
 rename src/plugins/kibana/public/{settings => management}/sections/objects/_view.js (94%)
 create mode 100644 src/plugins/kibana/public/management/sections/objects/index.js
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/advanced_row.html (100%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/advanced_row.js (92%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/index.html (88%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/index.js (56%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/lib/__tests__/get_editor_type.js (91%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/lib/__tests__/get_val_type.js (94%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/lib/__tests__/to_editable_config.js (96%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/lib/get_editor_type.js (100%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/lib/get_val_type.js (100%)
 rename src/plugins/kibana/public/{settings/sections/advanced => management/sections/settings}/lib/to_editable_config.js (100%)
 rename src/plugins/kibana/public/{settings => management}/styles/main.less (59%)
 delete mode 100644 src/plugins/kibana/public/settings/app.html
 delete mode 100644 src/plugins/kibana/public/settings/index.js
 delete mode 100644 src/plugins/kibana/public/settings/sections/about/barcode.svg
 delete mode 100644 src/plugins/kibana/public/settings/sections/about/index.html
 delete mode 100644 src/plugins/kibana/public/settings/sections/about/index.js
 delete mode 100644 src/plugins/kibana/public/settings/sections/indices/index.js
 delete mode 100644 src/plugins/kibana/public/settings/sections/objects/index.js
 delete mode 100644 src/plugins/kibana/public/settings/sections/status/index.js
 create mode 100755 src/ui/public/icons/beats.svg
 create mode 100755 src/ui/public/icons/elasticsearch.svg
 create mode 100755 src/ui/public/icons/kibana.svg
 create mode 100755 src/ui/public/icons/logstash.svg
 create mode 100644 src/ui/public/management/__tests__/index.js
 create mode 100644 src/ui/public/management/__tests__/section.js
 create mode 100644 src/ui/public/management/index.js
 create mode 100644 src/ui/public/management/section.js
 delete mode 100644 src/ui/public/registry/settings_sections.js
 rename test/functional/apps/{settings => management}/_creation_form_changes.js (100%)
 rename test/functional/apps/{settings => management}/_index_pattern_create_delete.js (100%)
 rename test/functional/apps/{settings => management}/_index_pattern_popularity.js (100%)
 rename test/functional/apps/{settings => management}/_index_pattern_results_sort.js (100%)
 rename test/functional/apps/{settings => management}/_initial_state.js (100%)
 rename test/functional/apps/{settings/_advanced_settings.js => management/_kibana_settings.js} (87%)
 rename test/functional/apps/{settings => management}/index.js (95%)

diff --git a/src/plugins/kibana/index.js b/src/plugins/kibana/index.js
index 045b442374f39..3ba9aec21c177 100644
--- a/src/plugins/kibana/index.js
+++ b/src/plugins/kibana/index.js
@@ -19,14 +19,13 @@ module.exports = function (kibana) {
         title: 'Kibana',
         listed: false,
         description: 'the kibana you know and love',
-        //icon: 'plugins/kibana/settings/sections/about/barcode.svg',
         main: 'plugins/kibana/kibana',
         uses: [
           'visTypes',
           'spyModes',
           'fieldFormats',
           'navbarExtensions',
-          'settingsSections',
+          'managementSections',
           'docViews'
         ],
 
@@ -62,9 +61,9 @@ module.exports = function (kibana) {
           icon: 'plugins/kibana/assets/dashboard.svg',
         },
         {
-          title: 'Settings',
+          title: 'Management',
           order: 1000,
-          url: '/app/kibana#/settings',
+          url: '/app/kibana#/management',
           description: 'define index patterns, change config, and more',
           icon: 'plugins/kibana/assets/settings.svg',
         }
diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.js b/src/plugins/kibana/public/dashboard/components/panel/panel.js
index 940948d31d291..5cdf1a8469dfa 100644
--- a/src/plugins/kibana/public/dashboard/components/panel/panel.js
+++ b/src/plugins/kibana/public/dashboard/components/panel/panel.js
@@ -15,7 +15,7 @@ uiModules
   const filterManager = Private(FilterManagerProvider);
   const notify = new Notifier();
 
-  const services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) {
+  const services = require('plugins/kibana/management/saved_object_registry').all().map(function (serviceObj) {
     const service = $injector.get(serviceObj.service);
     return {
       type: service.type,
@@ -79,7 +79,7 @@ uiModules
           const service = _.find(services, { type: type });
           if (!service) return;
 
-          $scope.editUrl = '#settings/objects/' + service.name + '/' + id + '?notFound=' + e.savedObjectType;
+          $scope.editUrl = '#management/kibana/objects/' + service.name + '/' + id + '?notFound=' + e.savedObjectType;
         });
 
       });
diff --git a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
index bca33d1a2f573..d90f5faa750f7 100644
--- a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
+++ b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
@@ -9,7 +9,7 @@ const module = uiModules.get('app/dashboard');
 
 // Register this service with the saved object registry so it can be
 // edited by the object editor.
-require('plugins/kibana/settings/saved_object_registry').register({
+require('plugins/kibana/management/saved_object_registry').register({
   service: 'savedDashboards',
   title: 'dashboards'
 });
diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js
index a8c0a01ef37bf..87ce5f4f74e0b 100644
--- a/src/plugins/kibana/public/discover/controllers/discover.js
+++ b/src/plugins/kibana/public/discover/controllers/discover.js
@@ -65,7 +65,7 @@ uiRoutes
       return savedSearches.get($route.current.params.id)
       .catch(courier.redirectWhenMissing({
         'search': '/discover',
-        'index-pattern': '/settings/objects/savedSearches/' + $route.current.params.id
+        'index-pattern': '/management/kibana/objects/savedSearches/' + $route.current.params.id
       }));
     }
   }
diff --git a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
index 0244613baeccb..0ad2526d78bc8 100644
--- a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
+++ b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
@@ -11,7 +11,7 @@ const module = uiModules.get('discover/saved_searches', [
 
 // Register this service with the saved object registry so it can be
 // edited by the object editor.
-require('plugins/kibana/settings/saved_object_registry').register({
+require('plugins/kibana/management/saved_object_registry').register({
   service: 'savedSearches',
   title: 'searches'
 });
diff --git a/src/plugins/kibana/public/kibana.js b/src/plugins/kibana/public/kibana.js
index 764f19dec9f77..bf96cf92207d2 100644
--- a/src/plugins/kibana/public/kibana.js
+++ b/src/plugins/kibana/public/kibana.js
@@ -11,7 +11,7 @@ import 'ui/autoload/all';
 import 'plugins/kibana/discover/index';
 import 'plugins/kibana/visualize/index';
 import 'plugins/kibana/dashboard/index';
-import 'plugins/kibana/settings/index';
+import 'plugins/kibana/management/index';
 import 'plugins/kibana/doc';
 import 'ui/vislib';
 import 'ui/agg_response';
diff --git a/src/plugins/kibana/public/management/app.html b/src/plugins/kibana/public/management/app.html
new file mode 100644
index 0000000000000..7b63d9925e83f
--- /dev/null
+++ b/src/plugins/kibana/public/management/app.html
@@ -0,0 +1,23 @@
+<div class="app-container">
+  <nav class="navbar navbar-default navbar-static-top subnav" data-test-subj="managementNav">
+    <bread-crumbs omit-current-page=true></bread-crumbs>
+
+    <ul class="nav navbar-nav">
+      <li class="current-page" ng-hide="sectionName">
+        {{::section.display}}
+      </li>
+
+      <li
+        ng-if="sectionName"
+        ng-repeat="item in section.items.inOrder"
+        ng-class="item.class">
+
+        <a class="navbar-link" kbn-href="{{::item.url}}" data-test-subj="{{::item.name}}">
+          {{::item.display}}
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div role="main" class="management-container" ng-transclude></div>
+</div>
diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js
new file mode 100644
index 0000000000000..b1dd7b35a0e63
--- /dev/null
+++ b/src/plugins/kibana/public/management/index.js
@@ -0,0 +1,64 @@
+import _ from 'lodash';
+
+import 'plugins/kibana/management/sections';
+import 'plugins/kibana/management/styles/main.less';
+import 'ui/filters/start_from';
+import 'ui/field_editor';
+import 'plugins/kibana/management/sections/indices/_indexed_fields';
+import 'plugins/kibana/management/sections/indices/_scripted_fields';
+import 'ui/directives/bread_crumbs';
+import uiRoutes from 'ui/routes';
+import uiModules from 'ui/modules';
+import appTemplate from 'plugins/kibana/management/app.html';
+import landingTemplate from 'plugins/kibana/management/landing.html';
+import chrome from 'ui/chrome/chrome';
+import management from 'ui/management';
+
+uiRoutes
+.when('/management', {
+  template: landingTemplate
+});
+
+require('ui/index_patterns/route_setup/load_default')({
+  notRequiredRe: /^\/management\//,
+  whenMissingRedirectTo: '/management/kibana/indices'
+});
+
+uiModules
+.get('apps/management')
+.directive('kbnManagementApp', function (Private, $route, $location, timefilter, buildNum, buildSha) {
+  return {
+    restrict: 'E',
+    template: appTemplate,
+    transclude: true,
+    scope: {
+      sectionName: '@section'
+    },
+
+    link: function ($scope) {
+      timefilter.enabled = false;
+      $scope.sections = management.items.inOrder;
+      $scope.section = management.get($scope.sectionName) || management;
+
+      if ($scope.section) {
+        $scope.section.items.forEach(item => {
+          item.class = item.url === '#' + $location.path() ? 'active' : undefined;
+        });
+      }
+
+      management.get('kibana').info = `Build ${buildNum}, Commit SHA ${buildSha.substr(0, 8)}`;
+    }
+  };
+});
+
+uiModules
+.get('apps/management')
+.directive('kbnManagementLanding', function (kbnVersion) {
+  return {
+    restrict: 'E',
+    link: function ($scope) {
+      $scope.sections = management.items.inOrder;
+      $scope.kbnVersion = kbnVersion;
+    }
+  };
+});
diff --git a/src/plugins/kibana/public/management/landing.html b/src/plugins/kibana/public/management/landing.html
new file mode 100644
index 0000000000000..18ecf9a50def7
--- /dev/null
+++ b/src/plugins/kibana/public/management/landing.html
@@ -0,0 +1,45 @@
+<kbn-management-app>
+  <kbn-management-landing>
+    <div class="product-overview">
+      <span class="kibana-version">Version: {{::kbnVersion}}</span>
+    </div>
+    <div class="management-sections">
+      <div
+        ng-if="section.items.length > 0"
+        ng-repeat="section in sections"
+        ng-class="{ 'management-section-info-expanded': section.showInfo }"
+        class="col-xs-12 management-section management-section-{{::section.id}}">
+
+        <div class="panel panel-product">
+          <div class="panel-heading panel-heading-{{::section.id}}">
+            {{::section.display}}
+
+            <i
+              class="fa fa-info-circle pull-right"
+              ng-click="section.showInfo = !!!section.showInfo"
+              ng-if="section.info">
+            </i>
+          </div>
+
+          <div class="panel-body">
+            <div class="row">
+              <ul class="management-section-items list-unstyled">
+                <li
+                  class="col-xs-4 col-md-3"
+                  ng-repeat="item in section.items.inOrder">
+
+                  <a kbn-href="{{::item.url}}">
+                    {{::item.display}}
+                  </a>
+                </li>
+              </ul>
+            </div>
+            <div class="management-section-info">
+              {{::section.info}}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </kbn-management-landing>
+</kbn-management-app>
diff --git a/src/plugins/kibana/public/settings/saved_object_registry.js b/src/plugins/kibana/public/management/saved_object_registry.js
similarity index 100%
rename from src/plugins/kibana/public/settings/saved_object_registry.js
rename to src/plugins/kibana/public/management/saved_object_registry.js
diff --git a/src/plugins/kibana/public/management/sections/index.js b/src/plugins/kibana/public/management/sections/index.js
new file mode 100644
index 0000000000000..34a0f1e43b8de
--- /dev/null
+++ b/src/plugins/kibana/public/management/sections/index.js
@@ -0,0 +1,3 @@
+import 'plugins/kibana/management/sections/settings';
+import 'plugins/kibana/management/sections/objects';
+import 'plugins/kibana/management/sections/indices';
diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.html b/src/plugins/kibana/public/management/sections/indices/_create.html
similarity index 97%
rename from src/plugins/kibana/public/settings/sections/indices/_create.html
rename to src/plugins/kibana/public/management/sections/indices/_create.html
index 4bf6c76fec6c5..9448b933c65fc 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_create.html
+++ b/src/plugins/kibana/public/management/sections/indices/_create.html
@@ -1,6 +1,6 @@
-<kbn-settings-app section="indices">
-  <kbn-settings-indices>
-    <div ng-controller="settingsIndicesCreate" class="kbn-settings-indices-create">
+<kbn-management-app section="kibana">
+  <kbn-management-indices>
+    <div ng-controller="managementIndicesCreate" class="kbn-management-indices-create">
       <div class="page-header">
         <h1>Configure an index pattern</h1>
         In order to use Kibana you must configure at least one index pattern. Index patterns are
@@ -177,5 +177,5 @@ <h4>Time-interval based index patterns are deprecated!</h4>
         </form>
       </div>
     </div>
-  </kbn-settings-indices>
-</kbn-settings-app>
+  </kbn-management-indices>
+</kbn-management-app>
diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/management/sections/indices/_create.js
similarity index 93%
rename from src/plugins/kibana/public/settings/sections/indices/_create.js
rename to src/plugins/kibana/public/management/sections/indices/_create.js
index 78069125040df..32257638e122f 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_create.js
+++ b/src/plugins/kibana/public/management/sections/indices/_create.js
@@ -3,21 +3,21 @@ import moment from 'moment';
 import { IndexPatternMissingIndices } from 'ui/errors';
 import 'ui/directives/validate_index_name';
 import 'ui/directives/auto_select_if_only_one';
-import PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider from 'plugins/kibana/settings/sections/indices/_refresh_kibana_index';
+import RefreshKibanaIndex from 'plugins/kibana/management/sections/indices/_refresh_kibana_index';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
-import createTemplate from 'plugins/kibana/settings/sections/indices/_create.html';
+import createTemplate from 'plugins/kibana/management/sections/indices/_create.html';
 
 
 uiRoutes
-.when('/settings/indices/', {
+.when('/management/kibana/indices/', {
   template: createTemplate
 });
 
-uiModules.get('apps/settings')
-.controller('settingsIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) {
+uiModules.get('apps/management')
+.controller('managementIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) {
   const notify = new Notifier();
-  const refreshKibanaIndex = Private(PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider);
+  const refreshKibanaIndex = Private(RefreshKibanaIndex);
   const intervals = indexPatterns.intervals;
   let samplePromise;
 
@@ -73,7 +73,7 @@ uiModules.get('apps/settings')
               config.set('defaultIndex', indexPattern.id);
             }
             indexPatterns.cache.clear(indexPattern.id);
-            kbnUrl.change('/settings/indices/' + indexPattern.id);
+            kbnUrl.change('/management/kibana/indices/' + indexPattern.id);
           });
         }
       });
diff --git a/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js b/src/plugins/kibana/public/management/sections/indices/_date_scripts.js
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_date_scripts.js
rename to src/plugins/kibana/public/management/sections/indices/_date_scripts.js
diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.html b/src/plugins/kibana/public/management/sections/indices/_edit.html
similarity index 87%
rename from src/plugins/kibana/public/settings/sections/indices/_edit.html
rename to src/plugins/kibana/public/management/sections/indices/_edit.html
index ee0e6f65a307c..31c9d7bc8df4b 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_edit.html
+++ b/src/plugins/kibana/public/management/sections/indices/_edit.html
@@ -1,13 +1,13 @@
-<kbn-settings-app section="indices">
-  <kbn-settings-indices>
-    <div ng-controller="settingsIndicesEdit">
+<kbn-management-app section="kibana">
+  <kbn-management-indices>
+    <div ng-controller="managementIndicesEdit">
       <div class="page-header">
-        <kbn-settings-index-header
+        <kbn-management-index-header
           index-pattern="indexPattern"
           set-default="setDefaultPattern()"
           refresh-fields="indexPattern.refreshFields()"
           delete="removePattern()">
-        </kbn-settings-index-header>
+        </kbn-management-index-header>
 
         <p>
           This page lists every field in the <strong>{{::indexPattern.id}}</strong>
@@ -38,7 +38,7 @@
       <br />
 
       <ul class="nav nav-tabs">
-        <li class="kbn-settings-tab" ng-class="{ active: state.tab === fieldType.index }" ng-repeat="fieldType in fieldTypes">
+        <li class="kbn-management-tab" ng-class="{ active: state.tab === fieldType.index }" ng-repeat="fieldType in fieldTypes">
           <a ng-click="changeTab(fieldType)">
             {{ fieldType.title }}
             <small>({{ fieldType.count }})</small>
@@ -50,5 +50,5 @@
       <scripted-fields ng-show="state.tab == 'scriptedFields'" class="fields scripted-fields"></scripted-fields>
 
     </div>
-  </kbn-settings-indices>
-</kbn-settings-app>
+  </kbn-management-indices>
+</kbn-management-app>
diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.js b/src/plugins/kibana/public/management/sections/indices/_edit.js
similarity index 65%
rename from src/plugins/kibana/public/settings/sections/indices/_edit.js
rename to src/plugins/kibana/public/management/sections/indices/_edit.js
index c9c6388222b83..d2096aaaadbe7 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_edit.js
+++ b/src/plugins/kibana/public/management/sections/indices/_edit.js
@@ -1,38 +1,38 @@
 import _ from 'lodash';
-import 'plugins/kibana/settings/sections/indices/_indexed_fields';
-import 'plugins/kibana/settings/sections/indices/_scripted_fields';
-import 'plugins/kibana/settings/sections/indices/_index_header';
-import PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider from 'plugins/kibana/settings/sections/indices/_refresh_kibana_index';
+import 'plugins/kibana/management/sections/indices/_indexed_fields';
+import 'plugins/kibana/management/sections/indices/_scripted_fields';
+import 'plugins/kibana/management/sections/indices/_index_header';
+import RefreshKibanaIndex from 'plugins/kibana/management/sections/indices/_refresh_kibana_index';
 import UrlProvider from 'ui/url';
-import PluginsKibanaSettingsSectionsIndicesFieldTypesProvider from 'plugins/kibana/settings/sections/indices/_field_types';
+import IndicesFieldTypesProvider from 'plugins/kibana/management/sections/indices/_field_types';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
-import editTemplate from 'plugins/kibana/settings/sections/indices/_edit.html';
+import editTemplate from 'plugins/kibana/management/sections/indices/_edit.html';
 
 uiRoutes
-.when('/settings/indices/:indexPatternId', {
+.when('/management/kibana/indices/:indexPatternId', {
   template: editTemplate,
   resolve: {
     indexPattern: function ($route, courier) {
       return courier.indexPatterns.get($route.current.params.indexPatternId)
-      .catch(courier.redirectWhenMissing('/settings/indices'));
+      .catch(courier.redirectWhenMissing('/management/kibana/indices'));
     }
   }
 });
 
-uiModules.get('apps/settings')
-.controller('settingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
+uiModules.get('apps/management')
+.controller('managementIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
 
   const notify = new Notifier();
   const $state = $scope.state = new AppState();
-  const refreshKibanaIndex = Private(PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider);
+  const refreshKibanaIndex = Private(RefreshKibanaIndex);
 
   $scope.kbnUrl = Private(UrlProvider);
   $scope.indexPattern = $route.current.locals.indexPattern;
   docTitle.change($scope.indexPattern.id);
   const otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);
 
-  const fieldTypes = Private(PluginsKibanaSettingsSectionsIndicesFieldTypesProvider);
+  const fieldTypes = Private(IndicesFieldTypesProvider);
   $scope.$watch('indexPattern.fields', function () {
     $scope.fieldTypes = fieldTypes($scope.indexPattern);
   });
@@ -65,7 +65,7 @@ uiModules.get('apps/settings')
     courier.indexPatterns.delete($scope.indexPattern)
     .then(refreshKibanaIndex)
     .then(function () {
-      $location.url('/settings/indices');
+      $location.url('/management/kibana/indices');
     })
     .catch(notify.fatal);
   };
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_controls.html b/src/plugins/kibana/public/management/sections/indices/_field_controls.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_field_controls.html
rename to src/plugins/kibana/public/management/sections/indices/_field_controls.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_editor.html b/src/plugins/kibana/public/management/sections/indices/_field_editor.html
similarity index 63%
rename from src/plugins/kibana/public/settings/sections/indices/_field_editor.html
rename to src/plugins/kibana/public/management/sections/indices/_field_editor.html
index c5f0312503219..d1427e780f274 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_field_editor.html
+++ b/src/plugins/kibana/public/management/sections/indices/_field_editor.html
@@ -1,7 +1,7 @@
-<kbn-settings-app section="indices">
-  <kbn-settings-indices>
+<kbn-management-app section="kibana">
+  <kbn-management-indices>
     <div class="page-header">
-      <kbn-settings-index-header index-pattern="fieldSettings.indexPattern"></kbn-settings-index-header>
+      <kbn-management-index-header index-pattern="fieldSettings.indexPattern"></kbn-management-index-header>
 
       <h2 ng-if="fieldSettings.mode === 'create'">
         Create {{ fieldSettings.field.scripted ? 'Scripted ' : '' }}Field
@@ -14,5 +14,5 @@ <h2 ng-if="fieldSettings.mode === 'edit'">
 
     <field-editor index-pattern="fieldSettings.indexPattern" field="fieldSettings.field"></field-editor>
 
-  </kbn-settings-indices>
-</kbn-settings-app>
+  </kbn-management-indices>
+</kbn-management-app>
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js b/src/plugins/kibana/public/management/sections/indices/_field_editor.js
similarity index 75%
rename from src/plugins/kibana/public/settings/sections/indices/_field_editor.js
rename to src/plugins/kibana/public/management/sections/indices/_field_editor.js
index 45ca674046275..b0d6cb51aa4e8 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js
+++ b/src/plugins/kibana/public/management/sections/indices/_field_editor.js
@@ -1,19 +1,19 @@
 import 'ui/field_editor';
-import 'plugins/kibana/settings/sections/indices/_index_header';
+import 'plugins/kibana/management/sections/indices/_index_header';
 import IndexPatternsFieldProvider from 'ui/index_patterns/_field';
 import UrlProvider from 'ui/url';
 import uiRoutes from 'ui/routes';
-import fieldEditorTemplate from 'plugins/kibana/settings/sections/indices/_field_editor.html';
+import fieldEditorTemplate from 'plugins/kibana/management/sections/indices/_field_editor.html';
 
 uiRoutes
-.when('/settings/indices/:indexPatternId/field/:fieldName', { mode: 'edit' })
-.when('/settings/indices/:indexPatternId/create-field/', { mode: 'create' })
-.defaults(/settings\/indices\/[^\/]+\/(field|create-field)(\/|$)/, {
+.when('/management/kibana/indices/:indexPatternId/field/:fieldName', { mode: 'edit' })
+.when('/management/kibana/indices/:indexPatternId/create-field/', { mode: 'create' })
+.defaults(/management\/kibana\/indices\/[^\/]+\/(field|create-field)(\/|$)/, {
   template: fieldEditorTemplate,
   resolve: {
     indexPattern: function ($route, courier) {
       return courier.indexPatterns.get($route.current.params.indexPatternId)
-      .catch(courier.redirectWhenMissing('/settings/indices'));
+      .catch(courier.redirectWhenMissing('/management/kibana/indices'));
     }
   },
   controllerAs: 'fieldSettings',
@@ -22,7 +22,6 @@ uiRoutes
     const notify = new Notifier({ location: 'Field Editor' });
     const kbnUrl = Private(UrlProvider);
 
-
     this.mode = $route.current.mode;
     this.indexPattern = $route.current.locals.indexPattern;
 
@@ -54,4 +53,3 @@ uiRoutes
     };
   }
 });
-
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_name.html b/src/plugins/kibana/public/management/sections/indices/_field_name.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_field_name.html
rename to src/plugins/kibana/public/management/sections/indices/_field_name.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_popularity.html b/src/plugins/kibana/public/management/sections/indices/_field_popularity.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_field_popularity.html
rename to src/plugins/kibana/public/management/sections/indices/_field_popularity.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_type.html b/src/plugins/kibana/public/management/sections/indices/_field_type.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_field_type.html
rename to src/plugins/kibana/public/management/sections/indices/_field_type.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_types.js b/src/plugins/kibana/public/management/sections/indices/_field_types.js
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_field_types.js
rename to src/plugins/kibana/public/management/sections/indices/_field_types.js
diff --git a/src/plugins/kibana/public/settings/sections/indices/_index_header.html b/src/plugins/kibana/public/management/sections/indices/_index_header.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_index_header.html
rename to src/plugins/kibana/public/management/sections/indices/_index_header.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/_index_header.js b/src/plugins/kibana/public/management/sections/indices/_index_header.js
similarity index 75%
rename from src/plugins/kibana/public/settings/sections/indices/_index_header.js
rename to src/plugins/kibana/public/management/sections/indices/_index_header.js
index f16156d727e9f..a58863b4bb7e1 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_index_header.js
+++ b/src/plugins/kibana/public/management/sections/indices/_index_header.js
@@ -1,8 +1,8 @@
 import uiModules from 'ui/modules';
-import indexHeaderTemplate from 'plugins/kibana/settings/sections/indices/_index_header.html';
+import indexHeaderTemplate from 'plugins/kibana/management/sections/indices/_index_header.html';
 uiModules
-.get('apps/settings')
-.directive('kbnSettingsIndexHeader', function (config) {
+.get('apps/management')
+.directive('kbnManagementIndexHeader', function (config) {
   return {
     restrict: 'E',
     template: indexHeaderTemplate,
diff --git a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.html b/src/plugins/kibana/public/management/sections/indices/_indexed_fields.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_indexed_fields.html
rename to src/plugins/kibana/public/management/sections/indices/_indexed_fields.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js b/src/plugins/kibana/public/management/sections/indices/_indexed_fields.js
similarity index 84%
rename from src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
rename to src/plugins/kibana/public/management/sections/indices/_indexed_fields.js
index 1d0c6f4904223..d95a41ae66d9a 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
+++ b/src/plugins/kibana/public/management/sections/indices/_indexed_fields.js
@@ -1,12 +1,12 @@
 import _ from 'lodash';
 import 'ui/paginated_table';
-import nameHtml from 'plugins/kibana/settings/sections/indices/_field_name.html';
-import typeHtml from 'plugins/kibana/settings/sections/indices/_field_type.html';
-import controlsHtml from 'plugins/kibana/settings/sections/indices/_field_controls.html';
+import nameHtml from 'plugins/kibana/management/sections/indices/_field_name.html';
+import typeHtml from 'plugins/kibana/management/sections/indices/_field_type.html';
+import controlsHtml from 'plugins/kibana/management/sections/indices/_field_controls.html';
 import uiModules from 'ui/modules';
-import indexedFieldsTemplate from 'plugins/kibana/settings/sections/indices/_indexed_fields.html';
+import indexedFieldsTemplate from 'plugins/kibana/management/sections/indices/_indexed_fields.html';
 
-uiModules.get('apps/settings')
+uiModules.get('apps/management')
 .directive('indexedFields', function ($filter) {
   const yesTemplate = '<i class="fa fa-check" aria-label="yes"></i>';
   const noTemplate = '';
diff --git a/src/plugins/kibana/public/settings/sections/indices/_refresh_kibana_index.js b/src/plugins/kibana/public/management/sections/indices/_refresh_kibana_index.js
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_refresh_kibana_index.js
rename to src/plugins/kibana/public/management/sections/indices/_refresh_kibana_index.js
diff --git a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.html b/src/plugins/kibana/public/management/sections/indices/_scripted_fields.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/indices/_scripted_fields.html
rename to src/plugins/kibana/public/management/sections/indices/_scripted_fields.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js b/src/plugins/kibana/public/management/sections/indices/_scripted_fields.js
similarity index 84%
rename from src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
rename to src/plugins/kibana/public/management/sections/indices/_scripted_fields.js
index da6f4b3ebef00..e4a00ad8540b6 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
+++ b/src/plugins/kibana/public/management/sections/indices/_scripted_fields.js
@@ -1,12 +1,12 @@
 import _ from 'lodash';
 import 'ui/paginated_table';
-import popularityHtml from 'plugins/kibana/settings/sections/indices/_field_popularity.html';
-import controlsHtml from 'plugins/kibana/settings/sections/indices/_field_controls.html';
-import dateScripts from 'plugins/kibana/settings/sections/indices/_date_scripts';
+import popularityHtml from 'plugins/kibana/management/sections/indices/_field_popularity.html';
+import controlsHtml from 'plugins/kibana/management/sections/indices/_field_controls.html';
+import dateScripts from 'plugins/kibana/management/sections/indices/_date_scripts';
 import uiModules from 'ui/modules';
-import scriptedFieldsTemplate from 'plugins/kibana/settings/sections/indices/_scripted_fields.html';
+import scriptedFieldsTemplate from 'plugins/kibana/management/sections/indices/_scripted_fields.html';
 
-uiModules.get('apps/settings')
+uiModules.get('apps/management')
 .directive('scriptedFields', function (kbnUrl, Notifier, $filter) {
   const rowScopes = []; // track row scopes, so they can be destroyed as needed
   const filter = $filter('filter');
@@ -19,7 +19,7 @@ uiModules.get('apps/settings')
     scope: true,
     link: function ($scope) {
 
-      const fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField';
+      const fieldCreatorPath = '/management/kibana/indices/{{ indexPattern }}/scriptedField';
       const fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}';
 
       $scope.perPage = 25;
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/management/sections/indices/index.html
similarity index 96%
rename from src/plugins/kibana/public/settings/sections/indices/index.html
rename to src/plugins/kibana/public/management/sections/indices/index.html
index 755db8397209d..dfa8410b500dc 100644
--- a/src/plugins/kibana/public/settings/sections/indices/index.html
+++ b/src/plugins/kibana/public/management/sections/indices/index.html
@@ -5,7 +5,7 @@ <h5>
         Index Patterns&nbsp;
         <a
           ng-if="editingId"
-          href="#/settings/indices"
+          href="#/management/kibana/indices"
           class="btn btn-primary btn-xs"
           aria-label="Add New">
           <span class="sr-only">Add New</span>
diff --git a/src/plugins/kibana/public/management/sections/indices/index.js b/src/plugins/kibana/public/management/sections/indices/index.js
new file mode 100644
index 0000000000000..faac8d0ec8af9
--- /dev/null
+++ b/src/plugins/kibana/public/management/sections/indices/index.js
@@ -0,0 +1,66 @@
+import management from 'ui/management';
+import 'plugins/kibana/management/sections/indices/_create';
+import 'plugins/kibana/management/sections/indices/_edit';
+import 'plugins/kibana/management/sections/indices/_field_editor';
+import uiRoutes from 'ui/routes';
+import uiModules from 'ui/modules';
+import indexTemplate from 'plugins/kibana/management/sections/indices/index.html';
+
+
+// add a dependency to all of the subsection routes
+uiRoutes
+.defaults(/management\/kibana\/indices/, {
+  resolve: {
+    indexPatternIds: function (courier) {
+      return courier.indexPatterns.getIds();
+    }
+  }
+});
+
+// wrapper directive, which sets some global stuff up like the left nav
+uiModules.get('apps/management')
+.run(function (config) {
+  const index = config.get('defaultIndex');
+  const kibana = management.get('kibana');
+
+  if (index && kibana && kibana.get('indices')) {
+    kibana.get('indices').url = `#/management/kibana/indices/${index}`;
+  }
+})
+.directive('kbnManagementIndices', function ($route, config, kbnUrl) {
+  return {
+    restrict: 'E',
+    transclude: true,
+    template: indexTemplate,
+    link: function ($scope) {
+      $scope.editingId = $route.current.params.indexPatternId;
+      config.bindToScope($scope, 'defaultIndex');
+
+      $scope.$watch('defaultIndex', function () {
+        const ids = $route.current.locals.indexPatternIds;
+        $scope.indexPatternList = ids.map(function (id) {
+          return {
+            id: id,
+            url: kbnUrl.eval('#/management/kibana/indices/{{id}}', {id: id}),
+            class: 'sidebar-item-title ' + ($scope.editingId === id ? 'active' : ''),
+            default: $scope.defaultIndex === id
+          };
+        });
+      });
+
+      $scope.$emit('application.load');
+    }
+  };
+});
+
+management.get('data').register('indices', {
+  display: 'Existing Data',
+  order: 0,
+  path: 'kibana/indices/'
+});
+
+management.get('kibana').register('indices', {
+  display: 'Index Patterns',
+  order: 0,
+  path: 'kibana/indices/'
+});
diff --git a/src/plugins/kibana/public/settings/sections/objects/_objects.html b/src/plugins/kibana/public/management/sections/objects/_objects.html
similarity index 93%
rename from src/plugins/kibana/public/settings/sections/objects/_objects.html
rename to src/plugins/kibana/public/management/sections/objects/_objects.html
index 550ef9aec945f..22178c8d88dbe 100644
--- a/src/plugins/kibana/public/settings/sections/objects/_objects.html
+++ b/src/plugins/kibana/public/management/sections/objects/_objects.html
@@ -1,5 +1,5 @@
-<kbn-settings-app section="objects">
-  <kbn-settings-objects class="container">
+<kbn-management-app section="kibana">
+  <kbn-management-objects class="container-fluid">
     <div class="header">
       <h2 class="title">Edit Saved Objects</h2>
       <button class="btn btn-default controls" ng-click="exportAll()"><i aria-hidden="true" class="fa fa-download"></i> Export Everything</button>
@@ -17,7 +17,7 @@ <h2 class="title">Edit Saved Objects</h2>
     </form>
 
     <ul class="nav nav-tabs">
-      <li class="kbn-settings-tab" ng-class="{ active: state.tab === service.title }" ng-repeat="service in services">
+      <li class="kbn-management-tab" ng-class="{ active: state.tab === service.title }" ng-repeat="service in services">
         <a title="{{ service.title }}" ng-click="changeTab(service)">{{ service.title }}
           <small>
           ({{service.data.length}}<span ng-show="service.total > service.data.length"> of {{service.total}}</span>)
@@ -76,5 +76,5 @@ <h2 class="title">Edit Saved Objects</h2>
       </div>
     </div>
 
-  </kbn-settings-objects>
-</kbn-settings-app>
+  </kbn-management-objects>
+</kbn-management-app>
diff --git a/src/plugins/kibana/public/settings/sections/objects/_objects.js b/src/plugins/kibana/public/management/sections/objects/_objects.js
similarity index 92%
rename from src/plugins/kibana/public/settings/sections/objects/_objects.js
rename to src/plugins/kibana/public/management/sections/objects/_objects.js
index 1a3938aeeb647..1d68a35cb3fea 100644
--- a/src/plugins/kibana/public/settings/sections/objects/_objects.js
+++ b/src/plugins/kibana/public/management/sections/objects/_objects.js
@@ -1,8 +1,8 @@
 import { saveAs } from '@spalger/filesaver';
 import { extend, find, flattenDeep, partialRight, pick, pluck, sortBy } from 'lodash';
 import angular from 'angular';
-import registry from 'plugins/kibana/settings/saved_object_registry';
-import objectIndexHTML from 'plugins/kibana/settings/sections/objects/_objects.html';
+import registry from 'plugins/kibana/management/saved_object_registry';
+import objectIndexHTML from 'plugins/kibana/management/sections/objects/_objects.html';
 import 'ui/directives/file_upload';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
@@ -10,12 +10,12 @@ import uiModules from 'ui/modules';
 const MAX_SIZE = Math.pow(2, 31) - 1;
 
 uiRoutes
-.when('/settings/objects', {
+.when('/management/kibana/objects', {
   template: objectIndexHTML
 });
 
-uiModules.get('apps/settings')
-.directive('kbnSettingsObjects', function (kbnIndex, Notifier, Private, kbnUrl, Promise) {
+uiModules.get('apps/management')
+.directive('kbnManagementObjects', function (kbnIndex, Notifier, Private, kbnUrl, Promise) {
   return {
     restrict: 'E',
     controller: function ($scope, $injector, $q, AppState, es) {
@@ -79,7 +79,7 @@ uiModules.get('apps/settings')
           id: item.id
         };
 
-        kbnUrl.change('/settings/objects/{{ service }}/{{ id }}', params);
+        kbnUrl.change('/management/kibana/objects/{{ service }}/{{ id }}', params);
       };
 
       $scope.bulkDelete = function () {
diff --git a/src/plugins/kibana/public/settings/sections/objects/_view.html b/src/plugins/kibana/public/management/sections/objects/_view.html
similarity index 94%
rename from src/plugins/kibana/public/settings/sections/objects/_view.html
rename to src/plugins/kibana/public/management/sections/objects/_view.html
index b8ce631383970..9ece77d0627a3 100644
--- a/src/plugins/kibana/public/settings/sections/objects/_view.html
+++ b/src/plugins/kibana/public/management/sections/objects/_view.html
@@ -1,5 +1,5 @@
-<kbn-settings-app section="objects">
-  <kbn-settings-objects-view class="container">
+<kbn-management-app section="kibana">
+  <kbn-management-objects-view class="container">
     <div class="pull-right" style="margin-top: 20px;">
       <a href="{{ link }}" class="btn btn-primary">View {{ title }}</a>
       <a confirm-click="delete()" class="btn btn-danger"><i class="fa fa-trash-o"></i> Delete {{ title }} Object</a>
@@ -32,5 +32,5 @@ <h4>Proceed with caution</h4>
       <button aria-label="Cancel" class="btn btn-primary" ng-click="cancel()">Cancel</button>
       <button aria-label="Save {{ title }} Object" class="btn btn-success" ng-click="submit()" ng-disabled="objectForm.$invalid || aceInvalidEditors.length !==0">Save {{ title }} Object</button>
     </div>
-  </kbn-settings-objects-view>
-</kbn-settings-app>
\ No newline at end of file
+  </kbn-management-objects-view>
+</kbn-management-app>
diff --git a/src/plugins/kibana/public/settings/sections/objects/_view.js b/src/plugins/kibana/public/management/sections/objects/_view.js
similarity index 94%
rename from src/plugins/kibana/public/settings/sections/objects/_view.js
rename to src/plugins/kibana/public/management/sections/objects/_view.js
index f3f54f97cfea6..ef868fa6bfa90 100644
--- a/src/plugins/kibana/public/settings/sections/objects/_view.js
+++ b/src/plugins/kibana/public/management/sections/objects/_view.js
@@ -1,19 +1,19 @@
 import _ from 'lodash';
 import angular from 'angular';
 import rison from 'rison-node';
-import registry from 'plugins/kibana/settings/saved_object_registry';
-import objectViewHTML from 'plugins/kibana/settings/sections/objects/_view.html';
+import registry from 'plugins/kibana/management/saved_object_registry';
+import objectViewHTML from 'plugins/kibana/management/sections/objects/_view.html';
 import IndexPatternsCastMappingTypeProvider from 'ui/index_patterns/_cast_mapping_type';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 
 uiRoutes
-.when('/settings/objects/:service/:id', {
+.when('/management/kibana/objects/:service/:id', {
   template: objectViewHTML
 });
 
-uiModules.get('apps/settings')
-.directive('kbnSettingsObjectsView', function (kbnIndex, Notifier) {
+uiModules.get('apps/management')
+.directive('kbnManagementObjectsView', function (kbnIndex, Notifier) {
   return {
     restrict: 'E',
     controller: function ($scope, $injector, $routeParams, $location, $window, $rootScope, es, Private) {
@@ -210,7 +210,7 @@ uiModules.get('apps/settings')
         .then(function (resp) {
           const msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object';
 
-          $location.path('/settings/objects').search({
+          $location.path('/management/kibana/objects').search({
             _a: rison.encode({
               tab: serviceObj.title
             })
diff --git a/src/plugins/kibana/public/management/sections/objects/index.js b/src/plugins/kibana/public/management/sections/objects/index.js
new file mode 100644
index 0000000000000..3f9a1e96d7d88
--- /dev/null
+++ b/src/plugins/kibana/public/management/sections/objects/index.js
@@ -0,0 +1,15 @@
+import management from 'ui/management';
+import 'plugins/kibana/management/sections/objects/_view';
+import 'plugins/kibana/management/sections/objects/_objects';
+import 'ace';
+import 'ui/directives/confirm_click';
+import uiModules from 'ui/modules';
+
+// add the module deps to this module
+uiModules.get('apps/management');
+
+management.get('kibana').register('objects', {
+  display: 'Saved Objects',
+  order: 10,
+  path: 'kibana/objects'
+});
diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html b/src/plugins/kibana/public/management/sections/settings/advanced_row.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/advanced/advanced_row.html
rename to src/plugins/kibana/public/management/sections/settings/advanced_row.html
diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js b/src/plugins/kibana/public/management/sections/settings/advanced_row.js
similarity index 92%
rename from src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
rename to src/plugins/kibana/public/management/sections/settings/advanced_row.js
index 5b82fdc2907ae..3f295c8f23c1a 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
+++ b/src/plugins/kibana/public/management/sections/settings/advanced_row.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import 'ui/elastic_textarea';
 import uiModules from 'ui/modules';
-import advancedRowTemplate from 'plugins/kibana/settings/sections/advanced/advanced_row.html';
+import advancedRowTemplate from 'plugins/kibana/management/sections/settings/advanced_row.html';
 
-uiModules.get('apps/settings')
+uiModules.get('apps/management')
 .directive('advancedRow', function (config, Notifier) {
   return {
     restrict: 'A',
diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.html b/src/plugins/kibana/public/management/sections/settings/index.html
similarity index 88%
rename from src/plugins/kibana/public/settings/sections/advanced/index.html
rename to src/plugins/kibana/public/management/sections/settings/index.html
index 13f85f7c88194..08402cca6b9cd 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/index.html
+++ b/src/plugins/kibana/public/management/sections/settings/index.html
@@ -1,5 +1,5 @@
-<kbn-settings-app section="advanced">
-  <kbn-settings-advanced class="container">
+<kbn-management-app section="kibana">
+  <kbn-management-advanced class="container-fluid">
     <div class="bs-callout bs-callout-warning">
       <h4>Caution: You can break stuff here</h4>
       Be careful in here, these settings are for very advanced users only.
@@ -24,5 +24,5 @@ <h4>Caution: You can break stuff here</h4>
         <tr ng-repeat="conf in configs | filter:advancedFilter" advanced-row="conf" configs="configs"></tr>
       </tbody>
     </table>
-  </kbn-settings-advanced>
-</kbn-settings-app>
+  </kbn-management-advanced>
+</kbn-management-app>
diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.js b/src/plugins/kibana/public/management/sections/settings/index.js
similarity index 56%
rename from src/plugins/kibana/public/settings/sections/advanced/index.js
rename to src/plugins/kibana/public/management/sections/settings/index.js
index 2e7cbb0e7524d..45da5606b3e72 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/index.js
+++ b/src/plugins/kibana/public/management/sections/settings/index.js
@@ -1,18 +1,18 @@
 import _ from 'lodash';
-import registry from 'ui/registry/settings_sections';
-import toEditableConfig from 'plugins/kibana/settings/sections/advanced/lib/to_editable_config';
-import 'plugins/kibana/settings/sections/advanced/advanced_row';
+import toEditableConfig from 'plugins/kibana/management/sections/settings/lib/to_editable_config';
+import 'plugins/kibana/management/sections/settings/advanced_row';
+import management from 'ui/management';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
-import indexTemplate from 'plugins/kibana/settings/sections/advanced/index.html';
+import indexTemplate from 'plugins/kibana/management/sections/settings/index.html';
 
 uiRoutes
-.when('/settings/advanced', {
+.when('/management/kibana/settings', {
   template: indexTemplate
 });
 
-uiModules.get('apps/settings')
-.directive('kbnSettingsAdvanced', function (config, Notifier, Private, $rootScope) {
+uiModules.get('apps/management')
+.directive('kbnManagementAdvanced', function (config, Notifier, Private, $rootScope) {
   return {
     restrict: 'E',
     link: function ($scope) {
@@ -39,9 +39,8 @@ uiModules.get('apps/settings')
   };
 });
 
-registry.register(_.constant({
-  order: 2,
-  name: 'advanced',
-  display: 'Advanced',
-  url: '#/settings/advanced'
-}));
+management.get('kibana').register('settings', {
+  display: 'Settings',
+  order: 20,
+  path: 'kibana/settings'
+});
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js b/src/plugins/kibana/public/management/sections/settings/lib/__tests__/get_editor_type.js
similarity index 91%
rename from src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js
rename to src/plugins/kibana/public/management/sections/settings/lib/__tests__/get_editor_type.js
index 2b230c3fe5a22..824660fd1f1de 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js
+++ b/src/plugins/kibana/public/management/sections/settings/lib/__tests__/get_editor_type.js
@@ -1,5 +1,5 @@
 
-import getEditorType from 'plugins/kibana/settings/sections/advanced/lib/get_editor_type';
+import getEditorType from 'plugins/kibana/management/sections/settings/lib/get_editor_type';
 import expect from 'expect.js';
 
 describe('Settings', function () {
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js b/src/plugins/kibana/public/management/sections/settings/lib/__tests__/get_val_type.js
similarity index 94%
rename from src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js
rename to src/plugins/kibana/public/management/sections/settings/lib/__tests__/get_val_type.js
index d92162787f834..27bc982798622 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js
+++ b/src/plugins/kibana/public/management/sections/settings/lib/__tests__/get_val_type.js
@@ -1,5 +1,5 @@
 
-import getValType from 'plugins/kibana/settings/sections/advanced/lib/get_val_type';
+import getValType from 'plugins/kibana/management/sections/settings/lib/get_val_type';
 import expect from 'expect.js';
 
 describe('Settings', function () {
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js b/src/plugins/kibana/public/management/sections/settings/lib/__tests__/to_editable_config.js
similarity index 96%
rename from src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js
rename to src/plugins/kibana/public/management/sections/settings/lib/__tests__/to_editable_config.js
index 91690be14d9a1..782692e77bd5e 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js
+++ b/src/plugins/kibana/public/management/sections/settings/lib/__tests__/to_editable_config.js
@@ -1,5 +1,5 @@
 
-import toEditableConfig from 'plugins/kibana/settings/sections/advanced/lib/to_editable_config';
+import toEditableConfig from 'plugins/kibana/management/sections/settings/lib/to_editable_config';
 import expect from 'expect.js';
 
 describe('Settings', function () {
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js b/src/plugins/kibana/public/management/sections/settings/lib/get_editor_type.js
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js
rename to src/plugins/kibana/public/management/sections/settings/lib/get_editor_type.js
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js b/src/plugins/kibana/public/management/sections/settings/lib/get_val_type.js
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js
rename to src/plugins/kibana/public/management/sections/settings/lib/get_val_type.js
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js b/src/plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js
rename to src/plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/management/styles/main.less
similarity index 59%
rename from src/plugins/kibana/public/settings/styles/main.less
rename to src/plugins/kibana/public/management/styles/main.less
index beddd122eed35..1e9e0bb1ea815 100644
--- a/src/plugins/kibana/public/settings/styles/main.less
+++ b/src/plugins/kibana/public/management/styles/main.less
@@ -1,13 +1,14 @@
 @import (reference) "~ui/styles/theme";
 @import (reference) "~ui/styles/variables";
 
-kibana-settings-app,
-kbn-settings-indices,
-kbn-settings-indices-edit,
-kbn-settings-indices-create,
-kbn-settings-advanced,
-kbn-settings-objects,
-kbn-settings-objects-view {
+kbn-management-app,
+kbn-management-landing,
+kbn-management-indices,
+kbn-management-indices-edit,
+kbn-management-indices-create,
+kbn-management-advanced,
+kbn-management-objects,
+kbn-management-objects-view {
   display: block;
 }
 
@@ -15,41 +16,95 @@ nav.navbar {
   height: 70px;
 }
 
+.tab-management {
+  background-color: @kibanaGray6;
+}
+
 .settings-nav {
   text-transform: capitalize;
 }
 
-li.kbn-settings-tab:first-letter {
+li.kbn-management-tab:first-letter {
   text-transform: capitalize;
 }
 
-kbn-settings-app {
-  div.app-container {
-    div.container-fluid {
-      padding-left: 0;
-      padding-right: 0;
+kbn-management-app {
+  bread-crumbs ul {
+    height: 36px;
+  }
+
+  li.current-page {
+    font-size: 1.5em;
+    margin: 0 10px;
+  }
+}
+
+kbn-management-landing {
+  padding: 5px;
+
+  .product-overview {
+    color: @kibanaGray2;
+    padding: 5px 0 10px 10px;
+  }
+
+  .management-section-info {
+    bottom: 0;
+    display: none;
+    color: @kibanaPink1;
+    font-size: 0.8em;
+    position: absolute;
+  }
+
+  .panel-heading i {
+    font-size: 0.9em;
+    padding: 5px;
+  }
+
+  .management-section {
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+
+  .management-section-info-expanded {
+    .panel-heading i {
+      color: @black;
+    }
+
+    .management-section-info {
+      display: block;
+    }
+  }
+
+  .panel-product {
+    margin-bottom: 10px;
+
+    .panel-body {
+      padding-bottom: 30px;
+      font-size: 17px;
+      line-height: 32px;
+      position: relative;
     }
   }
 }
 
-kbn-settings-objects {
+kbn-management-objects {
   form {
     margin-bottom: @line-height-computed;
   }
   .list-unstyled {
     li {
       border-bottom: 1px solid;
-      border-bottom-color: @settings-objects-list-border;
+      border-bottom-color: @management-objects-list-border;
       padding: 8px;
     }
   }
   .empty {
-    color: @settings-objects-empty-color;
+    color: @management-objects-empty-color;
   }
 
   .action-bar {
     margin-top: 10px;
-    background-color: @settings-objects-action-bar-bg;
+    background-color: @management-objects-action-bar-bg;
     padding: 4px 12px;
 
     label {
@@ -71,7 +126,7 @@ kbn-settings-objects {
   }
 }
 
-kbn-settings-advanced {
+kbn-management-advanced {
   // super specific rule to override bootstrap's equally specific rule
   // https://github.com/twbs/bootstrap/blob/1f329f8f17aa989eabc6e94bdcab93e69ef0e463/less/tables.less#L35
   .table > tbody > tr > td {
@@ -79,32 +134,13 @@ kbn-settings-advanced {
   }
 }
 
-kbn-settings-objects-view {
+kbn-management-objects-view {
   label {
     font-family: @font-family-monospace;
   }
   .ace_editor { height: 300px; }
 }
 
-.kbn-settings-about {
-  margin-top: 30px;
-
-  .jumbotron h1 {
-    font-weight: bold;
-  }
-
-  &-versions {
-    td {
-      width: 50%;
-    }
-
-    td:first-child {
-      font-weight: bold;
-      text-align: right;
-    }
-  }
-}
-
 .advanced-settings {
   overflow-x: scroll;
 
@@ -112,7 +148,7 @@ kbn-settings-objects-view {
     width: 100%;
 
     tr.default td.value {
-      color: @settings-advanced-table-default-color;
+      color: @management-advanced-table-default-color;
     }
 
     td {
@@ -141,7 +177,7 @@ kbn-settings-objects-view {
 
 .indices-settings {
   i.active {
-    color: @settings-indices-active-color;
+    color: @management-indices-active-color;
   }
 
   tr.field-settings {
@@ -168,7 +204,7 @@ kbn-settings-objects-view {
   }
 }
 
-kbn-settings-indices {
+kbn-management-indices {
   .fields {
     table {
       .table-striped()
@@ -197,7 +233,6 @@ kbn-settings-indices {
   }
 }
 
-
 .kbn-settings-indices-create {
   .time-and-pattern > div {}
 }
diff --git a/src/plugins/kibana/public/settings/app.html b/src/plugins/kibana/public/settings/app.html
deleted file mode 100644
index f78a64d809790..0000000000000
--- a/src/plugins/kibana/public/settings/app.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="app-container">
-  <nav class="navbar navbar-default navbar-static-top subnav" data-test-subj="settingsNav">
-    <div class="container-fluid">
-      <bread-crumbs></bread-crumbs>
-      <ul class="nav navbar-nav">
-        <li ng-repeat="section in sections" ng-class="section.class">
-          <a class="navbar-link" kbn-href="{{section.url}}" data-test-subj="{{section.name}}">{{section.display}}</a>
-        </li>
-      </ul>
-    </div>
-  </nav>
-
-  <div role="main" class="settings-section-container {{section.name}}-settings" ng-transclude></div>
-</div>
diff --git a/src/plugins/kibana/public/settings/index.js b/src/plugins/kibana/public/settings/index.js
deleted file mode 100644
index 59e7d4b1a922a..0000000000000
--- a/src/plugins/kibana/public/settings/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import _ from 'lodash';
-import 'plugins/kibana/settings/sections/indices/index';
-import 'plugins/kibana/settings/sections/advanced/index';
-import 'plugins/kibana/settings/sections/objects/index';
-import 'plugins/kibana/settings/sections/status/index';
-import 'plugins/kibana/settings/sections/about/index';
-import 'plugins/kibana/settings/styles/main.less';
-import 'ui/filters/start_from';
-import 'ui/field_editor';
-import 'plugins/kibana/settings/sections/indices/_indexed_fields';
-import 'plugins/kibana/settings/sections/indices/_scripted_fields';
-import 'ui/directives/bread_crumbs';
-import registry from 'ui/registry/settings_sections';
-import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
-import appTemplate from 'plugins/kibana/settings/app.html';
-
-
-uiRoutes
-.when('/settings', {
-  redirectTo: '/settings/indices'
-});
-
-require('ui/index_patterns/route_setup/load_default')({
-  notRequiredRe: /^\/settings\//,
-  whenMissingRedirectTo: '/settings/indices'
-});
-
-uiModules
-.get('apps/settings')
-.directive('kbnSettingsApp', function (Private, $route, timefilter) {
-  const sections = Private(registry);
-
-  return {
-    restrict: 'E',
-    template: appTemplate,
-    transclude: true,
-    scope: {
-      sectionName: '@section'
-    },
-    link: function ($scope, $el) {
-      timefilter.enabled = false;
-      $scope.sections = sections.inOrder;
-      $scope.section = _.find($scope.sections, { name: $scope.sectionName });
-
-      $scope.sections.forEach(section => {
-        section.class = section === $scope.section ? 'active' : undefined;
-      });
-    }
-  };
-});
-
-// preload
diff --git a/src/plugins/kibana/public/settings/sections/about/barcode.svg b/src/plugins/kibana/public/settings/sections/about/barcode.svg
deleted file mode 100644
index 671b628ca1507..0000000000000
--- a/src/plugins/kibana/public/settings/sections/about/barcode.svg
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg5235"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   viewBox="0 0 64 64"
-   sodipodi:docname="barcode.svg">
-  <defs
-     id="defs5237" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="4.3636364"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="2880"
-     inkscape:window-height="1140"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata5240">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g4300"
-       transform="matrix(1.1002186,0,0,1.1002186,-3.2119331,-3.0092752)">
-      <g
-         transform="matrix(0.57440105,0,0,0.57440105,-36.987859,-56.970747)"
-         id="g6209">
-        <rect
-           style="opacity:1;fill:#39bdb1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-3"
-           width="2.4159346"
-           height="100.54836"
-           x="97.825981"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#ea458b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-9"
-           width="7.5297971"
-           height="100.54836"
-           x="85.735123"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#f3bb19;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-8"
-           width="5.0022545"
-           height="100.54836"
-           x="75.889793"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#2d448e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-2"
-           width="3.2287681"
-           height="100.54836"
-           x="72.783882"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#83cb1c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251"
-           width="3.159905"
-           height="100.54836"
-           x="69.63768"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#ea458b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-9-9"
-           width="6.9419966"
-           height="100.54836"
-           x="119.37186"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#006555;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-5-9"
-           width="4.9434743"
-           height="100.54836"
-           x="131.24544"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#006555;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-5-0"
-           width="1.8869137"
-           height="100.54836"
-           x="83.986267"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#83cb1c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-7"
-           width="4.7083545"
-           height="100.54836"
-           x="93.214729"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#83cb1c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-36"
-           width="5.8251753"
-           height="100.54836"
-           x="136.24173"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#39bdb1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-3-7"
-           width="3.1212945"
-           height="100.54836"
-           x="80.870918"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#ea458b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-9-9-3"
-           width="3.5915353"
-           height="100.54836"
-           x="100.15076"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#ea458b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-9-9-8"
-           width="3.9442151"
-           height="100.54836"
-           x="166.68982"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#39bdb1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-3-3"
-           width="3.3564136"
-           height="100.54836"
-           x="110.55486"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#39bdb1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-3-0"
-           width="4.1793332"
-           height="100.54836"
-           x="148.82066"
-           y="104.33429" />
-        <rect
-           style="opacity:1;fill:#f3bb19;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-8-3"
-           width="2.1808138"
-           height="100.54838"
-           x="129.07057"
-           y="104.33427" />
-        <rect
-           style="opacity:1;fill:#f3bb19;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-8-33"
-           width="3.0037344"
-           height="100.54836"
-           x="142.00218"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#83cb1c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-7-3"
-           width="4.3556747"
-           height="100.54836"
-           x="106.20512"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#2d448e;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-2-0"
-           width="2.4159336"
-           height="100.54836"
-           x="103.73636"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#83cb1c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-36-7"
-           width="3.8266549"
-           height="100.54836"
-           x="116.25652"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#006555;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-5-3"
-           width="2.2983737"
-           height="100.54838"
-           x="113.9641"
-           y="104.33427" />
-        <rect
-           style="opacity:1;fill:#39bdb1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-3-7-7"
-           width="2.8273947"
-           height="100.54836"
-           x="126.30791"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#39bdb1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-3-7-70"
-           width="2.0632553"
-           height="100.54836"
-           x="144.8824"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#ea458b;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-9-9-8-4"
-           width="1.8869162"
-           height="100.54836"
-           x="146.99847"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#39bdb1;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-3-7-70-2"
-           width="4.708354"
-           height="100.54836"
-           x="158.32114"
-           y="104.33428" />
-        <rect
-           style="opacity:1;fill:#f3bb19;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-8-339-2"
-           width="5.413713"
-           height="100.54838"
-           x="152.97215"
-           y="104.33427" />
-        <rect
-           style="opacity:1;fill:#83cb1c;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect5251-36-5"
-           width="3.8266544"
-           height="100.54836"
-           x="162.99417"
-           y="104.33428" />
-      </g>
-      <g
-         transform="matrix(0.57440105,0,0,1.9251702,3.0622581,2.9589583)"
-         id="g4544">
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="1"
-           y1="0"
-           x2="1"
-           y2="30"
-           id="line4450" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="3.5"
-           y1="0"
-           x2="3.5"
-           y2="30"
-           id="line4452" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="6.5"
-           y1="0"
-           x2="6.5"
-           y2="30"
-           id="line4454" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="11.5"
-           y1="0"
-           x2="11.5"
-           y2="30"
-           id="line4456" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="14.5"
-           y1="0"
-           x2="14.5"
-           y2="30"
-           id="line4458" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="17"
-           y1="0"
-           x2="17"
-           y2="30"
-           id="line4460" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="23"
-           y1="0"
-           x2="23"
-           y2="30"
-           id="line4462" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="28.5"
-           y1="0"
-           x2="28.5"
-           y2="30"
-           id="line4464" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="30.5"
-           y1="0"
-           x2="30.5"
-           y2="30"
-           id="line4466" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="34"
-           y1="0"
-           x2="34"
-           y2="30"
-           id="line4468" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="37"
-           y1="0"
-           x2="37"
-           y2="30"
-           id="line4470" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="41"
-           y1="0"
-           x2="41"
-           y2="30"
-           id="line4472" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="44.5"
-           y1="0"
-           x2="44.5"
-           y2="30"
-           id="line4474" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="47"
-           y1="0"
-           x2="47"
-           y2="30"
-           id="line4476" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="50.5"
-           y1="0"
-           x2="50.5"
-           y2="30"
-           id="line4478" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="56"
-           y1="0"
-           x2="56"
-           y2="30"
-           id="line4480" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="59.5"
-           y1="0"
-           x2="59.5"
-           y2="30"
-           id="line4482" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="61.5"
-           y1="0"
-           x2="61.5"
-           y2="30"
-           id="line4484" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="67"
-           y1="0"
-           x2="67"
-           y2="30"
-           id="line4486" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="72.5"
-           y1="0"
-           x2="72.5"
-           y2="30"
-           id="line4488" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="75.5"
-           y1="0"
-           x2="75.5"
-           y2="30"
-           id="line4490" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="77.5"
-           y1="0"
-           x2="77.5"
-           y2="30"
-           id="line4492" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="79.5"
-           y1="0"
-           x2="79.5"
-           y2="30"
-           id="line4494" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:4"
-           x1="83"
-           y1="0"
-           x2="83"
-           y2="30"
-           id="line4496" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="89"
-           y1="0"
-           x2="89"
-           y2="30"
-           id="line4498" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:3"
-           x1="94.5"
-           y1="0"
-           x2="94.5"
-           y2="30"
-           id="line4500" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:1"
-           x1="97.5"
-           y1="0"
-           x2="97.5"
-           y2="30"
-           id="line4502" />
-        <line
-           style="fill:none;stroke:#000000;stroke-width:2"
-           x1="100"
-           y1="0"
-           x2="100"
-           y2="30"
-           id="line4504" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/plugins/kibana/public/settings/sections/about/index.html b/src/plugins/kibana/public/settings/sections/about/index.html
deleted file mode 100644
index fc537b1a3818e..0000000000000
--- a/src/plugins/kibana/public/settings/sections/about/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<kbn-settings-app section="about">
-  <div class="kbn-settings-about container" ng-controller="settingsAbout">
-    <div class="col-md-4 col-md-offset-4 jumbotron">
-      <center>
-        <img kbn-src="/plugins/kibana/settings/sections/about/barcode.svg" alt="Kibana Barcode Logo" width="128" height="128"><br>
-        <h1>Kibana</h1>
-        <p>
-          <table class="table table-condensed kbn-settings-about-versions">
-            <tr>
-              <td>Version</td>
-              <td>{{kbnVersion}}</td>
-            </tr>
-
-            <tr>
-              <td>Build</td>
-              <td>{{buildNum}}</td>
-            </tr>
-
-            <tr>
-              <td>Commit SHA</td>
-              <td>{{buildSha | limitTo:7}}</td>
-            </tr>
-
-            <tr>
-              <td>Server name</td>
-              <td>{{serverName}}</td>
-            </tr>
-
-          </table>
-        </p>
-        <small>© 2015 All Rights Reserved - <a href="https://elastic.co">Elasticsearch</a></small>
-      </center>
-    </div>
-  </div>
-</kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/sections/about/index.js b/src/plugins/kibana/public/settings/sections/about/index.js
deleted file mode 100644
index 3040b7a89cb98..0000000000000
--- a/src/plugins/kibana/public/settings/sections/about/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import _ from 'lodash';
-import registry from 'ui/registry/settings_sections';
-import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
-import indexTemplate from 'plugins/kibana/settings/sections/about/index.html';
-
-uiRoutes
-.when('/settings/about', {
-  template: indexTemplate
-});
-
-uiModules.get('apps/settings')
-.controller('settingsAbout', function ($scope, kbnVersion, buildNum, buildSha, serverName) {
-  $scope.kbnVersion = kbnVersion;
-  $scope.buildNum = buildNum;
-  $scope.buildSha = buildSha;
-  $scope.serverName = serverName;
-});
-
-registry.register(_.constant({
-  order: 1001,
-  name: 'about',
-  display: 'About',
-  url: '#/settings/about'
-}));
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js
deleted file mode 100644
index 9670fbdfad498..0000000000000
--- a/src/plugins/kibana/public/settings/sections/indices/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import _ from 'lodash';
-import registry from 'ui/registry/settings_sections';
-import 'plugins/kibana/settings/sections/indices/_create';
-import 'plugins/kibana/settings/sections/indices/_edit';
-import 'plugins/kibana/settings/sections/indices/_field_editor';
-import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
-import indexTemplate from 'plugins/kibana/settings/sections/indices/index.html';
-
-
-// add a dependency to all of the subsection routes
-uiRoutes
-.defaults(/settings\/indices/, {
-  resolve: {
-    indexPatternIds: function (courier) {
-      return courier.indexPatterns.getIds();
-    }
-  }
-});
-
-// wrapper directive, which sets some global stuff up like the left nav
-uiModules.get('apps/settings')
-.directive('kbnSettingsIndices', function ($route, config, kbnUrl) {
-  return {
-    restrict: 'E',
-    transclude: true,
-    template: indexTemplate,
-    link: function ($scope) {
-      $scope.editingId = $route.current.params.indexPatternId;
-      config.bindToScope($scope, 'defaultIndex');
-
-      $scope.$watch('defaultIndex', function () {
-        const ids = $route.current.locals.indexPatternIds;
-        $scope.indexPatternList = ids.map(function (id) {
-          return {
-            id: id,
-            url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}),
-            class: 'sidebar-item-title ' + ($scope.editingId === id ? 'active' : ''),
-            default: $scope.defaultIndex === id
-          };
-        });
-      });
-
-      $scope.$emit('application.load');
-    }
-  };
-});
-
-registry.register(_.constant({
-  order: 1,
-  name: 'indices',
-  display: 'Indices',
-  url: '#/settings/indices'
-}));
diff --git a/src/plugins/kibana/public/settings/sections/objects/index.js b/src/plugins/kibana/public/settings/sections/objects/index.js
deleted file mode 100644
index df98bbf2f5430..0000000000000
--- a/src/plugins/kibana/public/settings/sections/objects/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import _ from 'lodash';
-import registry from 'ui/registry/settings_sections';
-import 'plugins/kibana/settings/sections/objects/_view';
-import 'plugins/kibana/settings/sections/objects/_objects';
-import 'ace';
-import 'ui/directives/confirm_click';
-import uiModules from 'ui/modules';
-
-
-// add the module deps to this module
-uiModules.get('apps/settings');
-
-registry.register(_.constant({
-  order: 3,
-  name: 'objects',
-  display: 'Objects',
-  url: '#/settings/objects'
-}));
diff --git a/src/plugins/kibana/public/settings/sections/status/index.js b/src/plugins/kibana/public/settings/sections/status/index.js
deleted file mode 100644
index 0b3af4c489a76..0000000000000
--- a/src/plugins/kibana/public/settings/sections/status/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import _ from 'lodash';
-import registry from 'ui/registry/settings_sections';
-
-registry.register(_.constant({
-  order: 1000,
-  name: 'status',
-  display: 'Status',
-  url: '/status'
-}));
diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js
index 1d115af6c8eee..580bbb0aec632 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.js
+++ b/src/plugins/kibana/public/visualize/editor/editor.js
@@ -43,9 +43,9 @@ uiRoutes
       return savedVisualizations.get($route.current.params.id)
       .catch(courier.redirectWhenMissing({
         'visualization': '/visualize',
-        'search': '/settings/objects/savedVisualizations/' + $route.current.params.id,
-        'index-pattern': '/settings/objects/savedVisualizations/' + $route.current.params.id,
-        'index-pattern-field': '/settings/objects/savedVisualizations/' + $route.current.params.id
+        'search': '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+        'index-pattern': '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+        'index-pattern-field': '/management/kibana/objects/savedVisualizations/' + $route.current.params.id
       }));
     }
   }
diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
index aa711aa0adf57..512cfd407cb44 100644
--- a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
+++ b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
@@ -8,7 +8,7 @@ const app = uiModules.get('app/visualize');
 
 // Register this service with the saved object registry so it can be
 // edited by the object editor.
-require('plugins/kibana/settings/saved_object_registry').register({
+require('plugins/kibana/management/saved_object_registry').register({
   service: 'savedVisualizations',
   title: 'visualizations'
 });
@@ -70,7 +70,7 @@ app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Pr
     if (!typeName || !visTypes.byName[typeName]) {
       if (!typeName) notify.error('Visualization type is missing. Please add a type to this visualization.', hit);
       else notify.error('Visualization type of "' + typeName + '" is invalid. Please change to a valid type.', hit);
-      return kbnUrl.redirect('/settings/objects/savedVisualizations/{{id}}', {id: source.id});
+      return kbnUrl.redirect('/management/kibana/objects/savedVisualizations/{{id}}', {id: source.id});
     }
 
     source.type = visTypes.byName[typeName];
diff --git a/src/ui/public/chrome/api/angular.js b/src/ui/public/chrome/api/angular.js
index fb9a21982dea5..e8f9b30115e6b 100644
--- a/src/ui/public/chrome/api/angular.js
+++ b/src/ui/public/chrome/api/angular.js
@@ -39,7 +39,15 @@ module.exports = function (chrome, internals) {
       };
 
       chrome.getBreadcrumbs = () => {
-        return $location.path().split('/').slice(1);
+        let path = $location.path();
+        let length = path.length - 1;
+
+        // trim trailing slash
+        if (path.charAt(length) === '/') {
+          length--;
+        }
+
+        return path.substr(1, length).split('/');
       };
 
       const notify = new Notifier();
diff --git a/src/ui/public/directives/bread_crumbs.js b/src/ui/public/directives/bread_crumbs.js
index 145c2749f85a0..b5a590a60b308 100644
--- a/src/ui/public/directives/bread_crumbs.js
+++ b/src/ui/public/directives/bread_crumbs.js
@@ -7,13 +7,14 @@ let module = uiModules.get('kibana');
 module.directive('breadCrumbs', function () {
   return {
     restrict: 'E',
-    scope: true,
+    scope: {
+      omitCurrentPage: '='
+    },
     template: breadCrumbsTemplate,
     controller: function ($scope) {
       $scope.crumbs = chrome.getBreadcrumbs();
 
-      if (_.last($scope.crumbs) === '') {
-        // Remove the empty string from the end of the array
+      if ($scope.omitCurrentPage === true) {
         $scope.crumbs.pop();
       }
     }
diff --git a/src/ui/public/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js
index 92ed0abfa76fd..9649d05d49f8d 100644
--- a/src/ui/public/directives/saved_object_finder.js
+++ b/src/ui/public/directives/saved_object_finder.js
@@ -227,7 +227,7 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
       };
 
       self.manageObjects = function (type) {
-        $location.url('/settings/objects?_a=' + rison.encode({tab: type}));
+        $location.url('/management/kibana/objects?_a=' + rison.encode({tab: type}));
       };
 
       self.hitCountNoun = function () {
diff --git a/src/ui/public/errors.js b/src/ui/public/errors.js
index e1d2464a6aaab..4be1e8fde4895 100644
--- a/src/ui/public/errors.js
+++ b/src/ui/public/errors.js
@@ -194,7 +194,7 @@ _.class(errors.NoDefinedIndexPatterns).inherits(KbnError);
 
 
 /**
- * Tried to load a route besides settings/indices but you don't have a default index pattern!
+ * Tried to load a route besides management/indices but you don't have a default index pattern!
  */
 errors.NoDefaultIndexPattern = function NoDefaultIndexPattern(type) {
   KbnError.call(this,
diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js
index 3b4692eb1120a..57f9006dfa831 100644
--- a/src/ui/public/field_editor/field_editor.js
+++ b/src/ui/public/field_editor/field_editor.js
@@ -142,4 +142,3 @@ uiModules
     }
   };
 });
-
diff --git a/src/ui/public/field_format_editor/field_format_editor.js b/src/ui/public/field_format_editor/field_format_editor.js
index ee60560543c21..962e1668397b0 100644
--- a/src/ui/public/field_format_editor/field_format_editor.js
+++ b/src/ui/public/field_format_editor/field_format_editor.js
@@ -3,7 +3,7 @@ import $ from 'jquery';
 import uiModules from 'ui/modules';
 
 uiModules
-.get('app/settings')
+.get('app/management')
 .directive('fieldFormatEditor', function (Private, $compile) {
   return {
     restrict: 'A',
diff --git a/src/ui/public/icons/beats.svg b/src/ui/public/icons/beats.svg
new file mode 100755
index 0000000000000..af2f80be45af3
--- /dev/null
+++ b/src/ui/public/icons/beats.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.17 25"><defs><style>.cls-1,.cls-3,.cls-4{fill:#fff;}.cls-1{opacity:0.61;}.cls-2{fill:#f3bd19;}.cls-3{opacity:0.3;}</style></defs><title>Icon-Beats</title><path class="cls-1" d="M14.75,10.33h0.09l0.58,0h0.12l0.25,0h0l0.4,0.06,0.1,0h0l0.29,0.07h0l0.27,0.07,0.09,0,0.06,0h0l0.29,0.1h0l0.22,0.08,0.12,0.05,0.06,0h0L18,11.11h0l0.18,0.09h0a7.29,7.29,0,0,0,1.12-3.88h0A7.33,7.33,0,0,0,12,0H2.92V10.33H14.75Z" transform="translate(-2.92)"/><path class="cls-1" d="M20.32,12.9c0.16,0.26-2.54,4.22-6.43,4.22h-11V25H14.75a7.33,7.33,0,0,0,7.33-7.33h0A7.3,7.3,0,0,0,20.32,12.9Z" transform="translate(-2.92)"/><path class="cls-2" d="M20.32,12.89l-0.12-.13,0.12,0.14h0Z" transform="translate(-2.92)"/><path class="cls-3" d="M20.32,12.9l-0.12-.14c-0.11-.13-0.23-0.25-0.35-0.37l-0.2-.18-0.36-.31-0.23-.17-0.38-.26-0.25-.15-0.2-.11a7.35,7.35,0,0,1-.8,1.05l0,0.05a7.36,7.36,0,0,1-.91.83l-0.17.13-0.29.2-0.42.25-0.24.13L15,14l-0.2.09-0.54.2-0.19.06-0.52.13-0.1,0c-0.21,0-.42.07-0.63,0.1l-0.16,0c-0.22,0-.44,0-0.67,0H2.92V10.33h0v6.78h11C17.77,17.12,20.48,13.16,20.32,12.9Z" transform="translate(-2.92)"/><path class="cls-1" d="M12.83,14.62l-0.16,0Z" transform="translate(-2.92)"/><path class="cls-3" d="M12.83,14.62l-0.16,0Z" transform="translate(-2.92)"/><polygon class="cls-1" points="11.84 10.33 11.84 10.33 11.84 10.33 11.84 10.33"/><polygon class="cls-3" points="11.84 10.33 11.84 10.33 11.84 10.33 11.84 10.33"/><path class="cls-1" d="M13.56,14.5l-0.1,0Z" transform="translate(-2.92)"/><path class="cls-3" d="M13.56,14.5l-0.1,0Z" transform="translate(-2.92)"/><path class="cls-1" d="M15,14l-0.2.09Z" transform="translate(-2.92)"/><path class="cls-3" d="M15,14l-0.2.09Z" transform="translate(-2.92)"/><path class="cls-1" d="M17.33,10.81L17,10.7h0l0.31,0.11h0Z" transform="translate(-2.92)"/><path class="cls-3" d="M17.33,10.81L17,10.7h0l0.31,0.11h0Z" transform="translate(-2.92)"/><path class="cls-1" d="M16.29,13.27l-0.29.2Z" transform="translate(-2.92)"/><path class="cls-3" d="M16.29,13.27l-0.29.2Z" transform="translate(-2.92)"/><path class="cls-1" d="M14.26,14.31l-0.19.06Z" transform="translate(-2.92)"/><path class="cls-3" d="M14.26,14.31l-0.19.06Z" transform="translate(-2.92)"/><path class="cls-1" d="M16.61,10.58h0L16.3,10.5h0l0.08,0Z" transform="translate(-2.92)"/><path class="cls-3" d="M16.61,10.58h0L16.3,10.5h0l0.08,0Z" transform="translate(-2.92)"/><path class="cls-1" d="M15.59,13.73l-0.24.13Z" transform="translate(-2.92)"/><path class="cls-3" d="M15.59,13.73l-0.24.13Z" transform="translate(-2.92)"/><path class="cls-1" d="M15.7,10.4l0.1,0h0l-0.25,0h0Z" transform="translate(-2.92)"/><path class="cls-3" d="M15.7,10.4l0.1,0h0l-0.25,0h0Z" transform="translate(-2.92)"/><path class="cls-1" d="M16.46,13.15a7.36,7.36,0,0,0,.91-0.83A7.39,7.39,0,0,1,16.46,13.15Z" transform="translate(-2.92)"/><path class="cls-3" d="M16.46,13.15a7.36,7.36,0,0,0,.91-0.83A7.39,7.39,0,0,1,16.46,13.15Z" transform="translate(-2.92)"/><polygon class="cls-1" points="11.84 10.33 11.84 10.33 11.84 10.33 11.84 10.33 0 10.33 0 10.33 11.84 10.33"/><polygon class="cls-3" points="11.84 10.33 11.84 10.33 11.84 10.33 11.84 10.33 0 10.33 0 10.33 11.84 10.33"/><path class="cls-1" d="M17.42,12.27a7.35,7.35,0,0,0,.8-1.05h0A7.4,7.4,0,0,1,17.42,12.27Z" transform="translate(-2.92)"/><path class="cls-3" d="M17.42,12.27a7.35,7.35,0,0,0,.8-1.05h0A7.4,7.4,0,0,1,17.42,12.27Z" transform="translate(-2.92)"/><path class="cls-1" d="M18,11.11L17.75,11h0L18,11.12h0Z" transform="translate(-2.92)"/><path class="cls-3" d="M18,11.11L17.75,11h0L18,11.12h0Z" transform="translate(-2.92)"/><polygon class="cls-2" points="11.84 10.33 11.84 10.33 11.84 10.33 11.84 10.33"/><polygon class="cls-3" points="11.84 10.33 11.84 10.33 11.84 10.33 11.84 10.33"/><path class="cls-4" d="M15.42,10.37l-0.58,0H14.76a7.35,7.35,0,0,1,.75,0H15.42Z" transform="translate(-2.92)"/><path class="cls-4" d="M17,10.7l-0.06,0-0.09,0-0.27-.07L17,10.7h0Z" transform="translate(-2.92)"/><path class="cls-4" d="M18.22,11.21L18,11.12l0.17,0.09h0Z" transform="translate(-2.92)"/><path class="cls-4" d="M16.3,10.5l-0.1,0-0.4-.06,0.5,0.08h0Z" transform="translate(-2.92)"/><path class="cls-4" d="M17.68,10.95l-0.12-.05-0.22-.08L17.75,11Z" transform="translate(-2.92)"/><path class="cls-4" d="M16,13.47l-0.42.25Z" transform="translate(-2.92)"/><path class="cls-4" d="M16.46,13.15l-0.17.13Z" transform="translate(-2.92)"/><path class="cls-4" d="M17.42,12.27l0,0.05Z" transform="translate(-2.92)"/><path class="cls-4" d="M14.08,14.37l-0.52.13Z" transform="translate(-2.92)"/><path class="cls-4" d="M15.34,13.86L15,14Z" transform="translate(-2.92)"/><path class="cls-4" d="M13.46,14.52c-0.21,0-.42.07-0.63,0.1C13,14.59,13.25,14.56,13.46,14.52Z" transform="translate(-2.92)"/><path class="cls-4" d="M2.92,14.67H12c0.22,0,.45,0,0.67,0-0.22,0-.44,0-0.67,0H2.92Z" transform="translate(-2.92)"/><path class="cls-4" d="M14.8,14.11l-0.54.2Z" transform="translate(-2.92)"/><path class="cls-4" d="M18,11.12L17.75,11l-0.4-.16L17,10.7l-0.44-.12-0.23-.06-0.08,0-0.5-.08-0.1,0-0.13,0H15.5a7.35,7.35,0,0,0-.75,0H2.92v4.33H12c0.22,0,.45,0,0.67,0l0.16,0c0.21,0,.42-0.05.63-0.1l0.1,0,0.52-.13,0.19-.06,0.54-.2L15,14l0.34-.16,0.24-.13L16,13.47l0.29-.2,0.17-.13a7.39,7.39,0,0,0,.91-0.83l0-.05a7.4,7.4,0,0,0,.8-1.05Z" transform="translate(-2.92)"/></svg>
\ No newline at end of file
diff --git a/src/ui/public/icons/elasticsearch.svg b/src/ui/public/icons/elasticsearch.svg
new file mode 100755
index 0000000000000..d099a0bb40a2f
--- /dev/null
+++ b/src/ui/public/icons/elasticsearch.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><defs><style>.cls-1{fill:none;}.cls-2,.cls-3{fill:#fff;}.cls-2{opacity:0.65;}</style></defs><title>Icon-Elasticsearch</title><path class="cls-1" d="M1.26,18H17.92a5.93,5.93,0,0,1,4.52,2.09,12.49,12.49,0,0,0,0-15.18A5.94,5.94,0,0,1,17.85,7H1.26A12.42,12.42,0,0,0,.5,9H16.44a3.51,3.51,0,0,1,0,7H0.5a12.41,12.41,0,0,0,.76,2h0Z" transform="translate(0)"/><path class="cls-2" d="M4.85,2.62L5.28,2.3Z" transform="translate(0)"/><path class="cls-2" d="M1.76,6.1q0.19-.31.39-0.61C2,5.69,1.89,5.89,1.76,6.1Z" transform="translate(0)"/><path class="cls-2" d="M2.31,5.26l0.32-.43Z" transform="translate(0)"/><path class="cls-2" d="M5.5,2.14l0.6-.38Z" transform="translate(0)"/><path class="cls-2" d="M3.49,3.84l0.37-.37Z" transform="translate(0)"/><path class="cls-2" d="M4.07,3.27l0.54-.47Z" transform="translate(0)"/><path class="cls-2" d="M1.34,6.87q0.13-.27.28-0.53Q1.47,6.6,1.34,6.87Z" transform="translate(0)"/><path class="cls-2" d="M2.82,4.6Q3,4.32,3.28,4.06,3,4.32,2.82,4.6Z" transform="translate(0)"/><path class="cls-2" d="M22.41,4.89A12.49,12.49,0,0,0,6.22,1.69,13.9,13.9,0,0,1,10.49,7h7.36A5.94,5.94,0,0,0,22.41,4.89Z" transform="translate(0)"/><path class="cls-2" d="M22.44,20.07A5.93,5.93,0,0,0,17.92,18H10.7a13.87,13.87,0,0,1-4.12,5.53A12.55,12.55,0,0,1,1.27,18h0A12.5,12.5,0,0,0,22.44,20.07Z" transform="translate(0)"/><path class="cls-2" d="M11.41,12.49A15,15,0,0,1,11,16h5.44a3.51,3.51,0,0,0,0-7H11A13.83,13.83,0,0,1,11.41,12.49Z" transform="translate(0)"/><path class="cls-3" d="M11.41,12.49A13.83,13.83,0,0,0,11,9H0.5a12.49,12.49,0,0,0,0,7H11A15,15,0,0,0,11.41,12.49Z" transform="translate(0)"/><path class="cls-3" d="M2.63,4.83L2.82,4.6Z" transform="translate(0)"/><path class="cls-3" d="M2.15,5.49l0.16-.23Z" transform="translate(0)"/><path class="cls-3" d="M1.26,7h0l0.07-.14Z" transform="translate(0)"/><path class="cls-3" d="M1.62,6.35L1.76,6.1Z" transform="translate(0)"/><path class="cls-3" d="M3.86,3.47l0.21-.2Z" transform="translate(0)"/><path class="cls-3" d="M3.28,4.06l0.2-.21Z" transform="translate(0)"/><path class="cls-3" d="M6.22,1.69L6.1,1.76l0.12-.07h0Z" transform="translate(0)"/><path class="cls-3" d="M5.28,2.3L5.5,2.14Z" transform="translate(0)"/><path class="cls-3" d="M4.61,2.81l0.24-.19Z" transform="translate(0)"/><path class="cls-3" d="M6.22,1.69L6.1,1.76l-0.6.38L5.28,2.3l-0.43.32-0.24.19-0.54.47-0.21.2-0.37.37-0.2.21Q3,4.32,2.82,4.6l-0.18.23-0.32.43-0.16.23q-0.2.3-.39,0.61l-0.14.25q-0.15.26-.28,0.53L1.27,7h9.23A13.9,13.9,0,0,0,6.22,1.69Z" transform="translate(0)"/><polygon class="cls-3" points="1.26 17.97 1.27 17.98 10.71 17.98 10.71 17.97 1.26 17.97"/><path class="cls-3" d="M6.58,23.51A13.87,13.87,0,0,0,10.7,18H1.27A12.55,12.55,0,0,0,6.58,23.51Z" transform="translate(0)"/></svg>
\ No newline at end of file
diff --git a/src/ui/public/icons/kibana.svg b/src/ui/public/icons/kibana.svg
new file mode 100755
index 0000000000000..b0948973577f5
--- /dev/null
+++ b/src/ui/public/icons/kibana.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.24 25"><defs><style>.cls-1,.cls-2,.cls-3{fill:#fff;}.cls-1{opacity:0.7;}.cls-2{opacity:0.5;}</style></defs><title>Icon-Kibana</title><path class="cls-1" d="M12.41,11.69L22.12,0H2.88V9.37H3.24A19.09,19.09,0,0,1,12.41,11.69Z" transform="translate(-2.88)"/><polygon class="cls-1" points="0 23.17 0 23.17 9.53 11.69 0 23.17"/><path class="cls-1" d="M14.9,13.32l0.27,0.21Z" transform="translate(-2.88)"/><path class="cls-1" d="M14.16,12.77l0.15,0.11Z" transform="translate(-2.88)"/><path class="cls-1" d="M15.55,13.84L6.3,25H22.1A19.16,19.16,0,0,0,15.55,13.84Z" transform="translate(-2.88)"/><path class="cls-2" d="M14.07,12.71c-0.67-.48-1.66-1-1.66-1a19.21,19.21,0,0,1,1.75,1.08Z" transform="translate(-2.88)"/><path class="cls-2" d="M15.55,13.84l-0.39-.31,0.38,0.32h0Z" transform="translate(-2.88)"/><path class="cls-2" d="M14.31,12.88l0.59,0.43Z" transform="translate(-2.88)"/><path class="cls-2" d="M15.16,13.52l-0.27-.21-0.59-.43-0.15-.11a19.21,19.21,0,0,0-1.75-1.08L2.88,23.17V25H6.3l9.25-11.16Z" transform="translate(-2.88)"/><path class="cls-3" d="M3.24,9.36H2.88V23.17l9.53-11.48A19.09,19.09,0,0,0,3.24,9.36Z" transform="translate(-2.88)"/></svg>
\ No newline at end of file
diff --git a/src/ui/public/icons/logstash.svg b/src/ui/public/icons/logstash.svg
new file mode 100755
index 0000000000000..defafe2dce886
--- /dev/null
+++ b/src/ui/public/icons/logstash.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22.96 25"><defs><style>.cls-1,.cls-2,.cls-3{fill:#fff;}.cls-1{opacity:0.61;}.cls-3{opacity:0.3;}</style></defs><title>Icon-Logstash</title><path class="cls-1" d="M13.52,6.82A6.82,6.82,0,0,0,6.7,0H1V12.5h12.5V6.82Z" transform="translate(-1.02)"/><path class="cls-2" d="M1,12.5H1A12.5,12.5,0,0,0,13.52,25h0V12.5H1Z" transform="translate(-1.02)"/><rect class="cls-1" x="15.12" y="12.5" width="7.83" height="12.5"/><rect class="cls-3" x="12.5" y="12.5" width="2.62" height="12.5"/></svg>
\ No newline at end of file
diff --git a/src/ui/public/index_patterns/_ensure_some.js b/src/ui/public/index_patterns/_ensure_some.js
index ec97f3874926c..02167d9b41042 100644
--- a/src/ui/public/index_patterns/_ensure_some.js
+++ b/src/ui/public/index_patterns/_ensure_some.js
@@ -6,7 +6,7 @@ export default function EnsureSomeIndexPatternsFn(Private, Notifier, $location,
     return function promiseHandler(patterns) {
       if (!patterns || patterns.length === 0) {
         // notify.warning(new errors.NoDefinedIndexPatterns());
-        kbnUrl.redirectPath('/settings/indices');
+        kbnUrl.redirectPath('/management/kibana/indices');
       }
 
       return patterns;
diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js
index a0c4e6a0cba98..af4471f48feef 100644
--- a/src/ui/public/index_patterns/_field.js
+++ b/src/ui/public/index_patterns/_field.js
@@ -71,7 +71,7 @@ export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope
   }
 
   Field.prototype.routes = {
-    edit: '/settings/indices/{{indexPattern.id}}/field/{{name}}'
+    edit: '/management/kibana/indices/{{indexPattern.id}}/field/{{name}}'
   };
 
   return Field;
diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js
index 3f40531c57233..0f7b8c8130cee 100644
--- a/src/ui/public/index_patterns/_index_pattern.js
+++ b/src/ui/public/index_patterns/_index_pattern.js
@@ -30,10 +30,10 @@ export default function IndexPatternFactory(Private, Notifier, config, kbnIndex,
   const configWatchers = new WeakMap();
   const docSources = new WeakMap();
   const getRoutes = () => ({
-    edit: '/settings/indices/{{id}}',
-    addField: '/settings/indices/{{id}}/create-field',
-    indexedFields: '/settings/indices/{{id}}?_a=(tab:indexedFields)',
-    scriptedFields: '/settings/indices/{{id}}?_a=(tab:scriptedFields)'
+    edit: '/management/kibana/indices/{{id}}',
+    addField: '/management/kibana/indices/{{id}}/create-field',
+    indexedFields: '/management/kibana/indices/{{id}}?_a=(tab:indexedFields)',
+    scriptedFields: '/management/kibana/indices/{{id}}?_a=(tab:scriptedFields)'
   });
 
   const mapping = mappingSetup.expandShorthand({
diff --git a/src/ui/public/management/__tests__/index.js b/src/ui/public/management/__tests__/index.js
new file mode 100644
index 0000000000000..d0316ca48472d
--- /dev/null
+++ b/src/ui/public/management/__tests__/index.js
@@ -0,0 +1,10 @@
+import expect from 'expect.js';
+
+import management from 'ui/management';
+import ManagementSection from 'ui/management/section';
+
+describe('Management', () => {
+  it('provides ManagementSection', () => {
+    expect(management).to.be.a(ManagementSection);
+  });
+});
diff --git a/src/ui/public/management/__tests__/section.js b/src/ui/public/management/__tests__/section.js
new file mode 100644
index 0000000000000..f16aad04a431e
--- /dev/null
+++ b/src/ui/public/management/__tests__/section.js
@@ -0,0 +1,108 @@
+import expect from 'expect.js';
+
+import ManagementSection from 'ui/management/section';
+import IndexedArray from 'ui/indexed_array';
+
+describe('ManagementSection', () => {
+  describe('constructor', () => {
+    it('defaults display to id', () => {
+      const section = new ManagementSection('kibana');
+      expect(section.display).to.be('kibana');
+    });
+
+    it('exposes items', () => {
+      const section = new ManagementSection('kibana');
+      expect(section.items).to.beEmpty;
+    });
+
+    it('sets url based on path', () => {
+      const section = new ManagementSection('kibana', { path: 'foo' });
+      expect(section.url).to.be('#/management/foo');
+    });
+
+    it('assigns all options', () => {
+      const section = new ManagementSection('kibana', { description: 'test' });
+      expect(section.description).to.be('test');
+    });
+  });
+
+  describe('register', () => {
+    let section;
+
+    beforeEach(() => {
+      section = new ManagementSection('kibana');
+    });
+
+    it('returns a ManagementSection', () => {
+      expect(section.register('about')).to.be.a(ManagementSection);
+    });
+
+    it('provides a reference to the parent', () => {
+      expect(section.register('about').parent).to.eql(section);
+    });
+
+    it('adds item', function () {
+      section.register('about', { description: 'test' });
+
+      expect(section.items).to.have.length(1);
+      expect(section.items[0]).to.be.a(ManagementSection);
+      expect(section.items[0].id).to.be('about');
+    });
+
+    it('can only register a section once', () => {
+      let threwException = false;
+      section.register('about');
+
+      try {
+        section.register('about');
+      } catch (e) {
+        threwException = e.message.indexOf('is already registered') > -1;
+      };
+
+      expect(threwException).to.be(true);
+    });
+  });
+
+  describe('get', () => {
+    let section;
+
+    beforeEach(() => {
+      section = new ManagementSection('kibana');
+      section.register('about');
+    });
+
+    it('returns registered section', () => {
+      expect(section.get('about')).to.be.a(ManagementSection);
+    });
+
+    it('returns undefined if un-registered', () => {
+      expect(section.get('unknown')).to.be(undefined);
+    });
+  });
+
+  describe('items', () => {
+    let section;
+
+    beforeEach(() => {
+      section = new ManagementSection('kibana');
+
+      section.register('three', { order: 3 });
+      section.register('one', { order: 1 });
+      section.register('two', { order: 2 });
+    });
+
+    it('is an indexed array', () => {
+      expect(section.items).to.be.a(IndexedArray);
+    });
+
+    it('is indexed on id', () => {
+      expect(section.items.byId).to.be.an('object');
+      expect(Object.keys(section.items.byId)).to.eql(['three', 'one', 'two']);
+    });
+
+    it('can be ordered', () => {
+      const ids = section.items.inOrder.map((i) => { return i.id; });
+      expect(ids).to.eql(['one', 'two', 'three']);
+    });
+  });
+});
diff --git a/src/ui/public/management/index.js b/src/ui/public/management/index.js
new file mode 100644
index 0000000000000..55939d00a1b09
--- /dev/null
+++ b/src/ui/public/management/index.js
@@ -0,0 +1,23 @@
+import ManagementSection from './section';
+
+const sections = new ManagementSection('management', {
+  display: 'Management'
+});
+
+// TODO: where should this live?
+sections.register('data', {
+  display: 'Connect Data',
+  order: 0
+});
+
+sections.register('elasticsearch', {
+  display: 'Elasticsearch',
+  order: 10
+});
+
+sections.register('kibana', {
+  display: 'Kibana',
+  order: 20,
+});
+
+export default sections;
diff --git a/src/ui/public/management/section.js b/src/ui/public/management/section.js
new file mode 100644
index 0000000000000..617132833c816
--- /dev/null
+++ b/src/ui/public/management/section.js
@@ -0,0 +1,68 @@
+import {assign} from 'lodash';
+import IndexedArray from 'ui/indexed_array';
+
+export default class ManagementSection {
+
+  /**
+   * @param {string} id
+   * @param {object} options
+   * @returns {ManagementSection}
+   */
+
+  constructor(id, options = {}) {
+    this.display = id;
+    this.id = id;
+    this.items = new IndexedArray({
+      index: ['id'],
+      order: ['order']
+    });
+
+    if (!options.url) {
+      options.url = '#/management/' + options.path || '';
+    }
+
+    assign(this, options);
+  }
+
+  /**
+   * Registers a section
+   *
+   * @param {string} id
+   * @param {object} options
+   * @returns {ManagementSection}
+   */
+
+  register(id, options = {}) {
+    const item = new ManagementSection(id, assign(options, { parent: this }));
+
+    if (this.hasItem(id)) {
+      throw new Error(`'${id}' is already registered`);
+    }
+
+    this.items.push(item);
+
+    return item;
+  }
+
+  /**
+   * Determine if an id is already registered
+   *
+   * @param {string} id
+   * @returns {boolean}
+   */
+
+  hasItem(id) {
+    return this.items.byId.hasOwnProperty(id);
+  }
+
+  /**
+   * Fetches a section by id
+   *
+   * @param {string} id
+   * @returns {ManagementSection}
+   */
+
+  get(id) {
+    return this.items.byId[id];
+  }
+}
diff --git a/src/ui/public/registry/settings_sections.js b/src/ui/public/registry/settings_sections.js
deleted file mode 100644
index 0dcd261a2bd33..0000000000000
--- a/src/ui/public/registry/settings_sections.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import uiRegistry from 'ui/registry/_registry';
-export default uiRegistry({
-  name: 'settingsSections',
-  order: ['order']
-});
diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less
index bc5d2eb534cc4..c91f4742e93fa 100644
--- a/src/ui/public/styles/base.less
+++ b/src/ui/public/styles/base.less
@@ -608,4 +608,50 @@ fieldset {
   }
 }
 
+.panel-product {
+  margin-bottom: 10px;
+
+  .panel-heading {
+    background-color: @kibanaBlue3;
+    border-radius: 0;
+    color: @white;
+    font-size: 17px;
+    padding: 7px 10px;
+  }
+
+  .panel-heading-elasticsearch,
+  .panel-heading-kibana,
+  .panel-heading-beats,
+  .panel-heading-logstash {
+    background-position: 4px 7px;
+    background-repeat: no-repeat;
+    background-size: 26px 26px;
+    padding-left: 32px;
+  }
+
+  .panel-heading-elasticsearch {
+    background-color: @product-elasticsearch;
+    background-image: url("~ui/icons/elasticsearch.svg");
+  }
+
+  .panel-heading-kibana {
+    background-color: @product-kibana;
+    background-image: url("~ui/icons/kibana.svg");
+  }
+
+  .panel-heading-beats {
+    background-color: @product-beats;
+    background-image: url("~ui/icons/beats.svg");
+  }
+
+  .panel-heading-logstash {
+    background-color: @product-logstash;
+    background-image: url("~ui/icons/logstash.svg");
+  }
+
+  .panel-body {
+    padding: 10px;
+  }
+}
+
 @import (reference) "~dragula/dist/dragula.css";
diff --git a/src/ui/public/styles/variables/colors.less b/src/ui/public/styles/variables/colors.less
index ece20608f74d5..5bbddaa6a37b6 100644
--- a/src/ui/public/styles/variables/colors.less
+++ b/src/ui/public/styles/variables/colors.less
@@ -62,3 +62,8 @@
 
 @kibanaPink1:                           #E8488B;
 @kibanaPink2:                           #FF95C1;
+
+@product-kibana:                          @kibanaPink1;
+@product-elasticsearch:                   #3EBEB0;
+@product-logstash:                        #F3BD19;
+@product-beats:                           #07A5DE;
diff --git a/src/ui/public/styles/variables/for-theme.less b/src/ui/public/styles/variables/for-theme.less
index 9995ba06cefb6..6dbb4cf26dd38 100644
--- a/src/ui/public/styles/variables/for-theme.less
+++ b/src/ui/public/styles/variables/for-theme.less
@@ -111,14 +111,14 @@
 @app-switcher-app-description-color: @gray;
 
 
-// Settings ====================================================================
-@settings-objects-list-border: @gray-lighter;
-@settings-objects-empty-color: @gray-light;
-@settings-objects-action-bar-bg: @gray-lighter;
+// Management ==================================================================
+@management-objects-list-border: @gray-lighter;
+@management-objects-empty-color: @gray-light;
+@management-objects-action-bar-bg: @gray-lighter;
 
-@settings-advanced-table-default-color: @input-color-placeholder;
+@management-advanced-table-default-color: @input-color-placeholder;
 
-@settings-indices-active-color: @btn-success-bg;
+@management-indices-active-color: @btn-success-bg;
 
 
 // Visualize ===================================================================
diff --git a/src/ui/ui_exports.js b/src/ui/ui_exports.js
index b7f985d85bf67..9cd4d2dc1ebed 100644
--- a/src/ui/ui_exports.js
+++ b/src/ui/ui_exports.js
@@ -81,7 +81,7 @@ class UiExports {
       case 'spyModes':
       case 'chromeNavControls':
       case 'navbarExtensions':
-      case 'settingsSections':
+      case 'managementSections':
       case 'docViews':
       case 'hacks':
         return (plugin, spec) => {
diff --git a/test/functional/apps/settings/_creation_form_changes.js b/test/functional/apps/management/_creation_form_changes.js
similarity index 100%
rename from test/functional/apps/settings/_creation_form_changes.js
rename to test/functional/apps/management/_creation_form_changes.js
diff --git a/test/functional/apps/settings/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js
similarity index 100%
rename from test/functional/apps/settings/_index_pattern_create_delete.js
rename to test/functional/apps/management/_index_pattern_create_delete.js
diff --git a/test/functional/apps/settings/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
similarity index 100%
rename from test/functional/apps/settings/_index_pattern_popularity.js
rename to test/functional/apps/management/_index_pattern_popularity.js
diff --git a/test/functional/apps/settings/_index_pattern_results_sort.js b/test/functional/apps/management/_index_pattern_results_sort.js
similarity index 100%
rename from test/functional/apps/settings/_index_pattern_results_sort.js
rename to test/functional/apps/management/_index_pattern_results_sort.js
diff --git a/test/functional/apps/settings/_initial_state.js b/test/functional/apps/management/_initial_state.js
similarity index 100%
rename from test/functional/apps/settings/_initial_state.js
rename to test/functional/apps/management/_initial_state.js
diff --git a/test/functional/apps/settings/_advanced_settings.js b/test/functional/apps/management/_kibana_settings.js
similarity index 87%
rename from test/functional/apps/settings/_advanced_settings.js
rename to test/functional/apps/management/_kibana_settings.js
index 498842801fbd2..c9f8783d255a5 100644
--- a/test/functional/apps/settings/_advanced_settings.js
+++ b/test/functional/apps/management/_kibana_settings.js
@@ -19,11 +19,14 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
 
   bdd.describe('index pattern creation', function indexPatternCreation() {
     bdd.before(function () {
-      return settingsPage.createIndexPattern();
+      return settingsPage.createIndexPattern()
+      .then(function () {
+        return settingsPage.navigateTo();
+      });
     });
 
     bdd.it('should allow setting advanced settings', function () {
-      return settingsPage.clickAdvancedTab()
+      return settingsPage.clickKibanaSettings()
       .then(function TestCallSetAdvancedSettingsForTimezone() {
         common.saveScreenshot('Settings-advanced-tab');
         common.debug('calling setAdvancedSetting');
@@ -37,6 +40,5 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
         expect(advancedSetting).to.be('America/Phoenix');
       });
     });
-
   });
 });
diff --git a/test/functional/apps/settings/index.js b/test/functional/apps/management/index.js
similarity index 95%
rename from test/functional/apps/settings/index.js
rename to test/functional/apps/management/index.js
index 08a7fc86a1eff..9c04fffedef76 100644
--- a/test/functional/apps/settings/index.js
+++ b/test/functional/apps/management/index.js
@@ -21,5 +21,5 @@ bdd.describe('settings app', function () {
   require('./_index_pattern_create_delete');
   require('./_index_pattern_results_sort');
   require('./_index_pattern_popularity');
-  require('./_advanced_settings');
+  require('./_kibana_settings');
 });
diff --git a/test/functional/index.js b/test/functional/index.js
index 52202e316f58f..c881e78b1abe7 100644
--- a/test/functional/index.js
+++ b/test/functional/index.js
@@ -22,7 +22,7 @@ define(function (require) {
       'intern/dojo/node!../support/index',
       'intern/dojo/node!./apps/discover',
       'intern/dojo/node!./status_page',
-      'intern/dojo/node!./apps/settings',
+      'intern/dojo/node!./apps/management',
       'intern/dojo/node!./apps/visualize',
       'intern/dojo/node!./apps/console',
       'intern/dojo/node!./apps/dashboard'
diff --git a/test/server_config.js b/test/server_config.js
index 35bf5fefa7386..a462a525685b9 100644
--- a/test/server_config.js
+++ b/test/server_config.js
@@ -40,7 +40,7 @@ module.exports = {
     },
     settings: {
       pathname: kibanaURL,
-      hash: '/settings'
+      hash: '/management'
     },
     console: {
       pathname: 'app/console',
diff --git a/test/support/pages/settings_page.js b/test/support/pages/settings_page.js
index 5ac4b080d0e3e..1695c1504caa1 100644
--- a/test/support/pages/settings_page.js
+++ b/test/support/pages/settings_page.js
@@ -9,9 +9,21 @@ export default (function () {
   SettingsPage.prototype = {
     constructor: SettingsPage,
 
-    clickAdvancedTab: function () {
-      common.debug('in clickAdvancedTab');
-      return common.findTestSubject('settingsNav advanced').click();
+    clickNavigation: function () {
+      // TODO: find better way to target the element
+      return this.remote.findDisplayedByCssSelector('.app-link:nth-child(5) a').click();
+    },
+
+    clickPath: function (path) {
+      return this.remote.findDisplayedByCssSelector('[kbn-href="#/management/' + path + '"]').click();
+    },
+
+    clickKibanaSettings: function () {
+      return this.clickPath('kibana/settings');
+    },
+
+    clickKibanaIndicies: function () {
+      return this.clickPath('kibana/indices');
     },
 
     getAdvancedSettings: function getAdvancedSettings(propertyName) {
@@ -20,14 +32,9 @@ export default (function () {
       .getVisibleText();
     },
 
-
-    clickAdvancedTab: function () {
-      common.debug('in clickAdvancedTab');
-      return common.findTestSubject('settingsNav advanced').click();
-    },
-
     setAdvancedSettings: function setAdvancedSettings(propertyName, propertyValue) {
       var self = this;
+
       return common.findTestSubject('advancedSetting&' + propertyName + ' editButton')
       .click()
       .then(function () {
@@ -51,12 +58,10 @@ export default (function () {
       .getVisibleText();
     },
 
-
     navigateTo: function () {
       return common.navigateToApp('settings');
     },
 
-
     getTimeBasedEventsCheckbox: function () {
       return this.remote.setFindTimeout(defaultFindTimeout)
       .findByCssSelector('input[ng-model="index.isTimeBased"]');
@@ -108,12 +113,7 @@ export default (function () {
 
     getCreateButton: function () {
       return this.remote.setFindTimeout(defaultFindTimeout)
-        .findDisplayedByCssSelector('.btn');
-    },
-
-    clickCreateButton: function () {
-      return this.remote.setFindTimeout(defaultFindTimeout)
-      .findByCssSelector('.btn').click();
+        .findDisplayedByCssSelector('[type="submit"]');
     },
 
     clickDefaultIndexButton: function () {
@@ -169,7 +169,7 @@ export default (function () {
 
     getFieldsTabCount: function () {
       var self = this;
-      var selector = 'li.kbn-settings-tab.active a small';
+      var selector = 'li.kbn-management-tab.active a small';
 
       return common.try(function () {
         return self.remote.setFindTimeout(defaultFindTimeout / 10)
@@ -284,21 +284,26 @@ export default (function () {
       var self = this;
 
       return common.try(function () {
-        return self.selectTimeFieldOption('@timestamp')
-        .then(function () {
-          return self.getCreateButton().click();
-        });
+        return self.navigateTo()
+          .then(function () {
+            return self.selectTimeFieldOption('@timestamp');
+          })
+          .then(function () {
+            return self.getCreateButton().click();
+          });
       })
       .then(function () {
         return common.try(function () {
           return self.remote.getCurrentUrl()
-          .then(function (currentUrl) {
-            if (!currentUrl.match(/indices\/.+\?/)) {
-              throw new Error('Index pattern not created');
-            } else {
-              common.debug('Index pattern created: ' + currentUrl);
-            }
-          });
+            .then(function (currentUrl) {
+              common.log('currentUrl', currentUrl);
+
+              if (!currentUrl.match(/indices\/.+\?/)) {
+                throw new Error('Index pattern not created');
+              } else {
+                common.debug('Index pattern created: ' + currentUrl);
+              }
+            });
         });
       });
     },

From b43ac4cdd59be22896655e64acf2a91858bd9228 Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Wed, 8 Jun 2016 16:48:30 -0700
Subject: [PATCH 02/17] Refactor management styles for less specificity.

---
 .../kibana/public/management/landing.html     |  6 +--
 .../kibana/public/management/styles/main.less | 49 ++++++++++---------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/plugins/kibana/public/management/landing.html b/src/plugins/kibana/public/management/landing.html
index 18ecf9a50def7..81a761c4e0c5e 100644
--- a/src/plugins/kibana/public/management/landing.html
+++ b/src/plugins/kibana/public/management/landing.html
@@ -10,12 +10,12 @@
         ng-class="{ 'management-section-info-expanded': section.showInfo }"
         class="col-xs-12 management-section management-section-{{::section.id}}">
 
-        <div class="panel panel-product">
+        <div class="panel panel-product management-panel-product">
           <div class="panel-heading panel-heading-{{::section.id}}">
             {{::section.display}}
 
             <i
-              class="fa fa-info-circle pull-right"
+              class="fa fa-info-circle pull-right panel-heading-icon"
               ng-click="section.showInfo = !!!section.showInfo"
               ng-if="section.info">
             </i>
@@ -28,7 +28,7 @@
                   class="col-xs-4 col-md-3"
                   ng-repeat="item in section.items.inOrder">
 
-                  <a kbn-href="{{::item.url}}">
+                  <a class="management-link" kbn-href="{{::item.url}}">
                     {{::item.display}}
                   </a>
                 </li>
diff --git a/src/plugins/kibana/public/management/styles/main.less b/src/plugins/kibana/public/management/styles/main.less
index 1e9e0bb1ea815..495f939685045 100644
--- a/src/plugins/kibana/public/management/styles/main.less
+++ b/src/plugins/kibana/public/management/styles/main.less
@@ -41,6 +41,31 @@ kbn-management-app {
 
 kbn-management-landing {
   padding: 5px;
+}
+
+  .management-panel-product {
+    margin-bottom: 10px;
+
+    .panel-body {
+      padding-bottom: 30px;
+      position: relative;
+    }
+  }
+
+  .management-section {
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+
+  .management-link {
+    font-size: 17px;
+    line-height: 32px;
+  }
+
+  .panel-heading-icon {
+    font-size: 0.9em;
+    padding: 5px;
+  }
 
   .product-overview {
     color: @kibanaGray2;
@@ -55,18 +80,8 @@ kbn-management-landing {
     position: absolute;
   }
 
-  .panel-heading i {
-    font-size: 0.9em;
-    padding: 5px;
-  }
-
-  .management-section {
-    padding-left: 5px;
-    padding-right: 5px;
-  }
-
   .management-section-info-expanded {
-    .panel-heading i {
+    .panel-heading-icon {
       color: @black;
     }
 
@@ -75,18 +90,6 @@ kbn-management-landing {
     }
   }
 
-  .panel-product {
-    margin-bottom: 10px;
-
-    .panel-body {
-      padding-bottom: 30px;
-      font-size: 17px;
-      line-height: 32px;
-      position: relative;
-    }
-  }
-}
-
 kbn-management-objects {
   form {
     margin-bottom: @line-height-computed;

From 0ac1c8c9a76b075ab091f1da1d85b01d0ea036ad Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Fri, 10 Jun 2016 11:13:46 -0700
Subject: [PATCH 03/17] Changes MangementSection.get{,Section}

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/index.js          |  4 ++--
 .../kibana/public/management/sections/indices/index.js | 10 +++++-----
 .../kibana/public/management/sections/objects/index.js |  2 +-
 .../public/management/sections/settings/index.js       |  2 +-
 src/ui/public/management/__tests__/section.js          |  6 +++---
 src/ui/public/management/section.js                    |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js
index b1dd7b35a0e63..cc6c25458fb63 100644
--- a/src/plugins/kibana/public/management/index.js
+++ b/src/plugins/kibana/public/management/index.js
@@ -38,7 +38,7 @@ uiModules
     link: function ($scope) {
       timefilter.enabled = false;
       $scope.sections = management.items.inOrder;
-      $scope.section = management.get($scope.sectionName) || management;
+      $scope.section = management.getSection($scope.sectionName) || management;
 
       if ($scope.section) {
         $scope.section.items.forEach(item => {
@@ -46,7 +46,7 @@ uiModules
         });
       }
 
-      management.get('kibana').info = `Build ${buildNum}, Commit SHA ${buildSha.substr(0, 8)}`;
+      management.getSection('kibana').info = `Build ${buildNum}, Commit SHA ${buildSha.substr(0, 8)}`;
     }
   };
 });
diff --git a/src/plugins/kibana/public/management/sections/indices/index.js b/src/plugins/kibana/public/management/sections/indices/index.js
index faac8d0ec8af9..3298ac5e06fc8 100644
--- a/src/plugins/kibana/public/management/sections/indices/index.js
+++ b/src/plugins/kibana/public/management/sections/indices/index.js
@@ -21,10 +21,10 @@ uiRoutes
 uiModules.get('apps/management')
 .run(function (config) {
   const index = config.get('defaultIndex');
-  const kibana = management.get('kibana');
+  const kibana = management.getSection('kibana');
 
-  if (index && kibana && kibana.get('indices')) {
-    kibana.get('indices').url = `#/management/kibana/indices/${index}`;
+  if (index && kibana && kibana.getSection('indices')) {
+    kibana.getSection('indices').url = `#/management/kibana/indices/${index}`;
   }
 })
 .directive('kbnManagementIndices', function ($route, config, kbnUrl) {
@@ -53,13 +53,13 @@ uiModules.get('apps/management')
   };
 });
 
-management.get('data').register('indices', {
+management.getSection('data').register('indices', {
   display: 'Existing Data',
   order: 0,
   path: 'kibana/indices/'
 });
 
-management.get('kibana').register('indices', {
+management.getSection('kibana').register('indices', {
   display: 'Index Patterns',
   order: 0,
   path: 'kibana/indices/'
diff --git a/src/plugins/kibana/public/management/sections/objects/index.js b/src/plugins/kibana/public/management/sections/objects/index.js
index 3f9a1e96d7d88..69e2f4842f698 100644
--- a/src/plugins/kibana/public/management/sections/objects/index.js
+++ b/src/plugins/kibana/public/management/sections/objects/index.js
@@ -8,7 +8,7 @@ import uiModules from 'ui/modules';
 // add the module deps to this module
 uiModules.get('apps/management');
 
-management.get('kibana').register('objects', {
+management.getSection('kibana').register('objects', {
   display: 'Saved Objects',
   order: 10,
   path: 'kibana/objects'
diff --git a/src/plugins/kibana/public/management/sections/settings/index.js b/src/plugins/kibana/public/management/sections/settings/index.js
index 45da5606b3e72..b3912faac5d53 100644
--- a/src/plugins/kibana/public/management/sections/settings/index.js
+++ b/src/plugins/kibana/public/management/sections/settings/index.js
@@ -39,7 +39,7 @@ uiModules.get('apps/management')
   };
 });
 
-management.get('kibana').register('settings', {
+management.getSection('kibana').register('settings', {
   display: 'Settings',
   order: 20,
   path: 'kibana/settings'
diff --git a/src/ui/public/management/__tests__/section.js b/src/ui/public/management/__tests__/section.js
index f16aad04a431e..512cf65ae1993 100644
--- a/src/ui/public/management/__tests__/section.js
+++ b/src/ui/public/management/__tests__/section.js
@@ -63,7 +63,7 @@ describe('ManagementSection', () => {
     });
   });
 
-  describe('get', () => {
+  describe('getSection', () => {
     let section;
 
     beforeEach(() => {
@@ -72,11 +72,11 @@ describe('ManagementSection', () => {
     });
 
     it('returns registered section', () => {
-      expect(section.get('about')).to.be.a(ManagementSection);
+      expect(section.getSection('about')).to.be.a(ManagementSection);
     });
 
     it('returns undefined if un-registered', () => {
-      expect(section.get('unknown')).to.be(undefined);
+      expect(section.getSection('unknown')).to.be(undefined);
     });
   });
 
diff --git a/src/ui/public/management/section.js b/src/ui/public/management/section.js
index 617132833c816..209f4b6f4a21f 100644
--- a/src/ui/public/management/section.js
+++ b/src/ui/public/management/section.js
@@ -62,7 +62,7 @@ export default class ManagementSection {
    * @returns {ManagementSection}
    */
 
-  get(id) {
+  getSection(id) {
     return this.items.byId[id];
   }
 }

From 8e69ed2f0b2732928bddcbf7b4a82ebdbe407f04 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Fri, 10 Jun 2016 11:14:06 -0700
Subject: [PATCH 04/17] Maintain section selection for child pages

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js
index cc6c25458fb63..ae8e064ed2590 100644
--- a/src/plugins/kibana/public/management/index.js
+++ b/src/plugins/kibana/public/management/index.js
@@ -42,7 +42,7 @@ uiModules
 
       if ($scope.section) {
         $scope.section.items.forEach(item => {
-          item.class = item.url === '#' + $location.path() ? 'active' : undefined;
+          item.class = `#${$location.path()}`.indexOf(item.url) > -1 ? 'active' : undefined;
         });
       }
 

From 78e96f9af042fafdc1ed16b707787eb6cdacfb95 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Fri, 10 Jun 2016 11:14:54 -0700
Subject: [PATCH 05/17] Removes title on Indicies as it's represented in the
 sub-nav

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/sections/indices/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/kibana/public/management/sections/indices/index.html b/src/plugins/kibana/public/management/sections/indices/index.html
index dfa8410b500dc..68c95608bd07d 100644
--- a/src/plugins/kibana/public/management/sections/indices/index.html
+++ b/src/plugins/kibana/public/management/sections/indices/index.html
@@ -2,7 +2,6 @@
   <div class="sidebar-list">
     <div class="sidebar-list-header">
       <h5>
-        Index Patterns&nbsp;
         <a
           ng-if="editingId"
           href="#/management/kibana/indices"

From 5e237cb1eaa2489592768bc24d8b46ac2ed040f2 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Fri, 10 Jun 2016 11:16:10 -0700
Subject: [PATCH 06/17] Fixes styling for Saved Object page

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../kibana/public/management/styles/main.less | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/plugins/kibana/public/management/styles/main.less b/src/plugins/kibana/public/management/styles/main.less
index 495f939685045..8f7937b93066c 100644
--- a/src/plugins/kibana/public/management/styles/main.less
+++ b/src/plugins/kibana/public/management/styles/main.less
@@ -73,7 +73,7 @@ kbn-management-landing {
   }
 
   .management-section-info {
-    bottom: 0;
+    bottom: 10px;
     display: none;
     color: @kibanaPink1;
     font-size: 0.8em;
@@ -105,6 +105,18 @@ kbn-management-objects {
     color: @management-objects-empty-color;
   }
 
+  .item {
+    padding: 12px;
+
+    .item-title {
+      margin-left: 30px;
+    }
+
+    .actions {
+      margin-top: -6px;
+    }
+  }
+
   .action-bar {
     margin-top: 10px;
     background-color: @management-objects-action-bar-bg;
@@ -164,20 +176,6 @@ kbn-management-objects-view {
   }
 }
 
-.objects-settings {
-  .item {
-    padding: 12px;
-
-    .item-title {
-      margin-left: 30px;
-    }
-
-    .actions {
-      margin-top: -6px;
-    }
-  }
-}
-
 .indices-settings {
   i.active {
     color: @management-indices-active-color;

From 727bc0c6f535655218054561d63b19227b0d7396 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Fri, 10 Jun 2016 11:16:30 -0700
Subject: [PATCH 07/17] Improves documentation for ManagementSection

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/ui/public/management/section.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ui/public/management/section.js b/src/ui/public/management/section.js
index 209f4b6f4a21f..ffc5406954574 100644
--- a/src/ui/public/management/section.js
+++ b/src/ui/public/management/section.js
@@ -6,6 +6,11 @@ export default class ManagementSection {
   /**
    * @param {string} id
    * @param {object} options
+   * @param {number|null} options.order
+   * @param {string|null} options.display - defaults to id
+   * @param {string|null} options.url - defaults based on path
+   * @param {string|null} options.path - used to create url within management
+   * @param {string|null} options.info
    * @returns {ManagementSection}
    */
 
@@ -25,7 +30,7 @@ export default class ManagementSection {
   }
 
   /**
-   * Registers a section
+   * Registers a sub-section
    *
    * @param {string} id
    * @param {object} options

From 90bffc5a735db29af06d53237280a7a640632d8d Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Fri, 10 Jun 2016 19:12:24 -0700
Subject: [PATCH 08/17] Moves index creation to management/data/index

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/index.js         |  2 +-
 .../public/management/sections/indices/_create.html   |  2 +-
 .../public/management/sections/indices/_create.js     | 10 +++++++---
 .../public/management/sections/indices/_edit.js       | 11 ++++++++++-
 .../public/management/sections/indices/index.html     |  2 +-
 .../public/management/sections/indices/index.js       | 10 +---------
 src/ui/public/index_patterns/_ensure_some.js          |  2 +-
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js
index ae8e064ed2590..4d3f74d7a2a97 100644
--- a/src/plugins/kibana/public/management/index.js
+++ b/src/plugins/kibana/public/management/index.js
@@ -21,7 +21,7 @@ uiRoutes
 
 require('ui/index_patterns/route_setup/load_default')({
   notRequiredRe: /^\/management\//,
-  whenMissingRedirectTo: '/management/kibana/indices'
+  whenMissingRedirectTo: '/management/data/index'
 });
 
 uiModules
diff --git a/src/plugins/kibana/public/management/sections/indices/_create.html b/src/plugins/kibana/public/management/sections/indices/_create.html
index 9448b933c65fc..6eaa9d95279a1 100644
--- a/src/plugins/kibana/public/management/sections/indices/_create.html
+++ b/src/plugins/kibana/public/management/sections/indices/_create.html
@@ -1,4 +1,4 @@
-<kbn-management-app section="kibana">
+<kbn-management-app section="data">
   <kbn-management-indices>
     <div ng-controller="managementIndicesCreate" class="kbn-management-indices-create">
       <div class="page-header">
diff --git a/src/plugins/kibana/public/management/sections/indices/_create.js b/src/plugins/kibana/public/management/sections/indices/_create.js
index 32257638e122f..6bbee1e38f372 100644
--- a/src/plugins/kibana/public/management/sections/indices/_create.js
+++ b/src/plugins/kibana/public/management/sections/indices/_create.js
@@ -8,10 +8,14 @@ import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import createTemplate from 'plugins/kibana/management/sections/indices/_create.html';
 
-
 uiRoutes
-.when('/management/kibana/indices/', {
-  template: createTemplate
+.when('/management/data/index/', {
+  template: createTemplate,
+  resolve: {
+    indexPatternIds: function (courier) {
+      return courier.indexPatterns.getIds();
+    }
+  }
 });
 
 uiModules.get('apps/management')
diff --git a/src/plugins/kibana/public/management/sections/indices/_edit.js b/src/plugins/kibana/public/management/sections/indices/_edit.js
index d2096aaaadbe7..25de6e304fdfa 100644
--- a/src/plugins/kibana/public/management/sections/indices/_edit.js
+++ b/src/plugins/kibana/public/management/sections/indices/_edit.js
@@ -15,7 +15,16 @@ uiRoutes
   resolve: {
     indexPattern: function ($route, courier) {
       return courier.indexPatterns.get($route.current.params.indexPatternId)
-      .catch(courier.redirectWhenMissing('/management/kibana/indices'));
+      .catch(courier.redirectWhenMissing('/management/data/index'));
+    }
+  }
+});
+
+uiRoutes
+.when('/management/kibana/indices', {
+  resolve: {
+    _: function ($location, config) {
+      $location.path(`/management/kibana/indices/${config.get('defaultIndex')}`);
     }
   }
 });
diff --git a/src/plugins/kibana/public/management/sections/indices/index.html b/src/plugins/kibana/public/management/sections/indices/index.html
index 68c95608bd07d..2da7014d8c413 100644
--- a/src/plugins/kibana/public/management/sections/indices/index.html
+++ b/src/plugins/kibana/public/management/sections/indices/index.html
@@ -4,7 +4,7 @@
       <h5>
         <a
           ng-if="editingId"
-          href="#/management/kibana/indices"
+          href="#/management/data/index"
           class="btn btn-primary btn-xs"
           aria-label="Add New">
           <span class="sr-only">Add New</span>
diff --git a/src/plugins/kibana/public/management/sections/indices/index.js b/src/plugins/kibana/public/management/sections/indices/index.js
index 3298ac5e06fc8..fa405d0f55640 100644
--- a/src/plugins/kibana/public/management/sections/indices/index.js
+++ b/src/plugins/kibana/public/management/sections/indices/index.js
@@ -19,14 +19,6 @@ uiRoutes
 
 // wrapper directive, which sets some global stuff up like the left nav
 uiModules.get('apps/management')
-.run(function (config) {
-  const index = config.get('defaultIndex');
-  const kibana = management.getSection('kibana');
-
-  if (index && kibana && kibana.getSection('indices')) {
-    kibana.getSection('indices').url = `#/management/kibana/indices/${index}`;
-  }
-})
 .directive('kbnManagementIndices', function ($route, config, kbnUrl) {
   return {
     restrict: 'E',
@@ -56,7 +48,7 @@ uiModules.get('apps/management')
 management.getSection('data').register('indices', {
   display: 'Existing Data',
   order: 0,
-  path: 'kibana/indices/'
+  path: 'data/index/'
 });
 
 management.getSection('kibana').register('indices', {
diff --git a/src/ui/public/index_patterns/_ensure_some.js b/src/ui/public/index_patterns/_ensure_some.js
index 02167d9b41042..8576b4fff4cd2 100644
--- a/src/ui/public/index_patterns/_ensure_some.js
+++ b/src/ui/public/index_patterns/_ensure_some.js
@@ -6,7 +6,7 @@ export default function EnsureSomeIndexPatternsFn(Private, Notifier, $location,
     return function promiseHandler(patterns) {
       if (!patterns || patterns.length === 0) {
         // notify.warning(new errors.NoDefinedIndexPatterns());
-        kbnUrl.redirectPath('/management/kibana/indices');
+        kbnUrl.redirectPath('/management/data/index');
       }
 
       return patterns;

From fb313cdf2b10c3c30a0f3d59da431045fb5a8d42 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Mon, 13 Jun 2016 10:17:51 -0700
Subject: [PATCH 09/17] Prevents linking to last sub-url for Management

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/index.js     | 1 +
 src/ui/public/chrome/api/nav.js | 4 ++++
 src/ui/ui_nav_link.js           | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/kibana/index.js b/src/plugins/kibana/index.js
index 3ba9aec21c177..61b83cb38c9d0 100644
--- a/src/plugins/kibana/index.js
+++ b/src/plugins/kibana/index.js
@@ -66,6 +66,7 @@ module.exports = function (kibana) {
           url: '/app/kibana#/management',
           description: 'define index patterns, change config, and more',
           icon: 'plugins/kibana/assets/settings.svg',
+          linkToLastSubUrl: false
         }
       ],
       injectDefaultVars(server, options) {
diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js
index 73a2396510d3a..fc815a34163a8 100644
--- a/src/ui/public/chrome/api/nav.js
+++ b/src/ui/public/chrome/api/nav.js
@@ -35,6 +35,10 @@ export default function (chrome, internals) {
   }
 
   function setLastUrl(link, url) {
+    if (link.linkToLastSubUrl === false) {
+      return;
+    }
+
     link.lastSubUrl = url;
     internals.appUrlStore.setItem(lastSubUrlKey(link), url);
   }
diff --git a/src/ui/ui_nav_link.js b/src/ui/ui_nav_link.js
index 503a31073834b..a0db4646fdb32 100644
--- a/src/ui/ui_nav_link.js
+++ b/src/ui/ui_nav_link.js
@@ -8,9 +8,10 @@ export default class UiNavLink {
     this.url = `${uiExports.urlBasePath || ''}${spec.url}`;
     this.description = spec.description;
     this.icon = spec.icon;
+    this.linkToLastSubUrl = spec.linkToLastSubUrl === false ? false : true;
   }
 
   toJSON() {
-    return pick(this, ['title', 'url', 'order', 'description', 'icon']);
+    return pick(this, ['title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl']);
   }
 }

From 96bf22264c475933299e21592164ff94505c1b24 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Tue, 14 Jun 2016 11:14:07 -0700
Subject: [PATCH 10/17] Loads default index instead of preforming a redirect

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../management/sections/indices/_edit.js      | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/plugins/kibana/public/management/sections/indices/_edit.js b/src/plugins/kibana/public/management/sections/indices/_edit.js
index 25de6e304fdfa..90d124685d78b 100644
--- a/src/plugins/kibana/public/management/sections/indices/_edit.js
+++ b/src/plugins/kibana/public/management/sections/indices/_edit.js
@@ -10,21 +10,18 @@ import uiModules from 'ui/modules';
 import editTemplate from 'plugins/kibana/management/sections/indices/_edit.html';
 
 uiRoutes
-.when('/management/kibana/indices/:indexPatternId', {
+.when('/management/kibana/indices/:indexPatternId?', {
   template: editTemplate,
   resolve: {
-    indexPattern: function ($route, courier) {
-      return courier.indexPatterns.get($route.current.params.indexPatternId)
-      .catch(courier.redirectWhenMissing('/management/data/index'));
-    }
-  }
-});
+    indexPattern: function ($route, config, courier) {
+      let id = $route.current.params.indexPatternId;
 
-uiRoutes
-.when('/management/kibana/indices', {
-  resolve: {
-    _: function ($location, config) {
-      $location.path(`/management/kibana/indices/${config.get('defaultIndex')}`);
+      if (typeof id === 'undefined') {
+        id = config.get('defaultIndex');
+      }
+
+      return courier.indexPatterns.get(id)
+      .catch(courier.redirectWhenMissing('/management/data/index'));
     }
   }
 });

From 01d56e2023c9bda320b303956daa4f4291ac265c Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Tue, 14 Jun 2016 11:18:20 -0700
Subject: [PATCH 11/17] Quotes directive argument

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/app.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/management/app.html b/src/plugins/kibana/public/management/app.html
index 7b63d9925e83f..ae024a25622f0 100644
--- a/src/plugins/kibana/public/management/app.html
+++ b/src/plugins/kibana/public/management/app.html
@@ -1,6 +1,6 @@
 <div class="app-container">
   <nav class="navbar navbar-default navbar-static-top subnav" data-test-subj="managementNav">
-    <bread-crumbs omit-current-page=true></bread-crumbs>
+    <bread-crumbs omit-current-page="true"></bread-crumbs>
 
     <ul class="nav navbar-nav">
       <li class="current-page" ng-hide="sectionName">

From b21cf83e3c5bf5316198fda0c3843ec9d8f13806 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Tue, 14 Jun 2016 12:00:39 -0700
Subject: [PATCH 12/17] Resolves indexPatternIds for /management/data path

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../public/management/sections/indices/_edit.js  |  8 ++++----
 .../public/management/sections/indices/index.js  | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/plugins/kibana/public/management/sections/indices/_edit.js b/src/plugins/kibana/public/management/sections/indices/_edit.js
index 90d124685d78b..c48ff0344d60d 100644
--- a/src/plugins/kibana/public/management/sections/indices/_edit.js
+++ b/src/plugins/kibana/public/management/sections/indices/_edit.js
@@ -14,13 +14,13 @@ uiRoutes
   template: editTemplate,
   resolve: {
     indexPattern: function ($route, config, courier) {
-      let id = $route.current.params.indexPatternId;
+      const params = $route.current.params;
 
-      if (typeof id === 'undefined') {
-        id = config.get('defaultIndex');
+      if (typeof params.indexPatternId === 'undefined') {
+        params.indexPatternId = config.get('defaultIndex');
       }
 
-      return courier.indexPatterns.get(id)
+      return courier.indexPatterns.get(params.indexPatternId)
       .catch(courier.redirectWhenMissing('/management/data/index'));
     }
   }
diff --git a/src/plugins/kibana/public/management/sections/indices/index.js b/src/plugins/kibana/public/management/sections/indices/index.js
index fa405d0f55640..34b52f9004bef 100644
--- a/src/plugins/kibana/public/management/sections/indices/index.js
+++ b/src/plugins/kibana/public/management/sections/indices/index.js
@@ -6,15 +6,21 @@ import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import indexTemplate from 'plugins/kibana/management/sections/indices/index.html';
 
+const indexPatternsResolutions = {
+  indexPatternIds: function (courier) {
+    return courier.indexPatterns.getIds();
+  }
+};
 
 // add a dependency to all of the subsection routes
 uiRoutes
 .defaults(/management\/kibana\/indices/, {
-  resolve: {
-    indexPatternIds: function (courier) {
-      return courier.indexPatterns.getIds();
-    }
-  }
+  resolve: indexPatternsResolutions
+});
+
+uiRoutes
+.defaults(/management\/data\/index/, {
+  resolve: indexPatternsResolutions
 });
 
 // wrapper directive, which sets some global stuff up like the left nav

From 65b0de73b833d0007ac42a12d168b865d80f4453 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Tue, 14 Jun 2016 12:07:38 -0700
Subject: [PATCH 13/17] Labels Kibana's settings as "Advanced Settings"

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/sections/settings/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/management/sections/settings/index.js b/src/plugins/kibana/public/management/sections/settings/index.js
index b3912faac5d53..6421f770eb8de 100644
--- a/src/plugins/kibana/public/management/sections/settings/index.js
+++ b/src/plugins/kibana/public/management/sections/settings/index.js
@@ -40,7 +40,7 @@ uiModules.get('apps/management')
 });
 
 management.getSection('kibana').register('settings', {
-  display: 'Settings',
+  display: 'Advanced Settings',
   order: 20,
   path: 'kibana/settings'
 });

From 56d03d9f8a712fd71c1659f0ba5a9958cb28fd13 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 15 Jun 2016 00:03:21 -0700
Subject: [PATCH 14/17] Don't require /management/data for existing indicies

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/index.js | 2 +-
 src/ui/public/errors.js                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js
index 4d3f74d7a2a97..03e3884df165a 100644
--- a/src/plugins/kibana/public/management/index.js
+++ b/src/plugins/kibana/public/management/index.js
@@ -20,7 +20,7 @@ uiRoutes
 });
 
 require('ui/index_patterns/route_setup/load_default')({
-  notRequiredRe: /^\/management\//,
+  notRequiredRe: /^\/management\/data\//,
   whenMissingRedirectTo: '/management/data/index'
 });
 
diff --git a/src/ui/public/errors.js b/src/ui/public/errors.js
index 4be1e8fde4895..888d8587f8130 100644
--- a/src/ui/public/errors.js
+++ b/src/ui/public/errors.js
@@ -194,7 +194,7 @@ _.class(errors.NoDefinedIndexPatterns).inherits(KbnError);
 
 
 /**
- * Tried to load a route besides management/indices but you don't have a default index pattern!
+ * Tried to load a route besides management/data/* but you don't have a default index pattern!
  */
 errors.NoDefaultIndexPattern = function NoDefaultIndexPattern(type) {
   KbnError.call(this,

From 725c2c11423917052d42e5499e04b571f3a3c0fb Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 15 Jun 2016 00:31:28 -0700
Subject: [PATCH 15/17] Addresses ManagementSection test feedback

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/ui/public/management/__tests__/section.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ui/public/management/__tests__/section.js b/src/ui/public/management/__tests__/section.js
index 512cf65ae1993..540fe8bbff207 100644
--- a/src/ui/public/management/__tests__/section.js
+++ b/src/ui/public/management/__tests__/section.js
@@ -12,7 +12,7 @@ describe('ManagementSection', () => {
 
     it('exposes items', () => {
       const section = new ManagementSection('kibana');
-      expect(section.items).to.beEmpty;
+      expect(section.items).to.be.empty();
     });
 
     it('sets url based on path', () => {
@@ -38,7 +38,7 @@ describe('ManagementSection', () => {
     });
 
     it('provides a reference to the parent', () => {
-      expect(section.register('about').parent).to.eql(section);
+      expect(section.register('about').parent).to.be(section);
     });
 
     it('adds item', function () {
@@ -96,8 +96,10 @@ describe('ManagementSection', () => {
     });
 
     it('is indexed on id', () => {
+      const keys = Object.keys(section.items.byId).sort();
       expect(section.items.byId).to.be.an('object');
-      expect(Object.keys(section.items.byId)).to.eql(['three', 'one', 'two']);
+
+      expect(keys).to.eql(['one', 'three', 'two']);
     });
 
     it('can be ordered', () => {

From 3ec1c513a55147a235e46f480a9a7140e5aba035 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 15 Jun 2016 08:48:16 -0700
Subject: [PATCH 16/17] Removes duplicate indexPatternIds resolution

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../kibana/public/management/sections/indices/_create.js   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/plugins/kibana/public/management/sections/indices/_create.js b/src/plugins/kibana/public/management/sections/indices/_create.js
index 6bbee1e38f372..cb98e86824576 100644
--- a/src/plugins/kibana/public/management/sections/indices/_create.js
+++ b/src/plugins/kibana/public/management/sections/indices/_create.js
@@ -10,12 +10,7 @@ import createTemplate from 'plugins/kibana/management/sections/indices/_create.h
 
 uiRoutes
 .when('/management/data/index/', {
-  template: createTemplate,
-  resolve: {
-    indexPatternIds: function (courier) {
-      return courier.indexPatterns.getIds();
-    }
-  }
+  template: createTemplate
 });
 
 uiModules.get('apps/management')

From 52238006ad6b024dd6a187632a61230bd58cefd0 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 15 Jun 2016 13:12:04 -0700
Subject: [PATCH 17/17] Correctly route to add index page on deletion

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/plugins/kibana/public/management/sections/indices/_edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/management/sections/indices/_edit.js b/src/plugins/kibana/public/management/sections/indices/_edit.js
index c48ff0344d60d..663f917356b4c 100644
--- a/src/plugins/kibana/public/management/sections/indices/_edit.js
+++ b/src/plugins/kibana/public/management/sections/indices/_edit.js
@@ -71,7 +71,7 @@ uiModules.get('apps/management')
     courier.indexPatterns.delete($scope.indexPattern)
     .then(refreshKibanaIndex)
     .then(function () {
-      $location.url('/management/kibana/indices');
+      $location.url('/management/data/index');
     })
     .catch(notify.fatal);
   };