diff --git a/package.json b/package.json
index 78149ab3b1ab5..54d81c7a084a6 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
     "inert": "^5.1.0",
     "inline-style": "^2.0.0",
     "joi": "^13.5.2",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.0",
     "js-yaml": "3.13.1",
     "json-stable-stringify": "^1.0.1",
     "json-stringify-pretty-compact": "1.2.0",
diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
index f753a0199fc75..02145314ecfa0 100644
--- a/packages/kbn-ui-framework/package.json
+++ b/packages/kbn-ui-framework/package.json
@@ -50,7 +50,7 @@
     "html": "1.0.0",
     "html-loader": "^0.5.5",
     "imports-loader": "^0.8.0",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.0",
     "keymirror": "0.1.1",
     "moment": "^2.24.0",
     "node-sass": "^4.13.1",
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index 7eb515e6cda3f..72d6312c23579 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -17,7 +17,7 @@
     "core-js": "^3.2.1",
     "custom-event-polyfill": "^0.3.0",
     "elasticsearch-browser": "^16.5.0",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.0",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.27",
     "monaco-editor": "~0.17.0",
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
index f473e91af7ae9..f57c10d1a48dd 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
@@ -8,4 +8,4 @@
   listing-limit="listingLimit"
   hide-write-controls="hideWriteControls"
   initial-filter="initialFilter"
-/>
+></dashboard-listing>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.html b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.html
index 07e5b104d56b3..715762a2ffe0b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.html
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.html
@@ -83,7 +83,7 @@
             />
           </form>
           <button ng-disabled="migration.isMigrating || !migration.newTitle.trim()" class="kuiButton kuiButton--primary kuiButton--iconText" ng-click="migrate()">
-            <span ng-if="migration.isMigrating" class="euiLoadingSpinner euiLoadingSpinner--medium" />
+            <span ng-if="migration.isMigrating" class="euiLoadingSpinner euiLoadingSpinner--medium"></span>
             <span i18n-id="kbn.management.editIndexPattern.migrate"
                   i18n-default-message="Migrate"></span>
           </button>
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
index 0dcacd30fba4e..8cfe322c0105d 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
@@ -76,7 +76,7 @@
     filters="filters"
     query="query"
     app-state="appState"
-    />
+  ></visualization-embedded>
 
   <h1
     class="euiScreenReaderOnly"
@@ -99,6 +99,6 @@
     filters="filters"
     query="query"
     class="visEditor__content"
-  />
+  ></visualization-editor>
 
 </visualize-app>
diff --git a/src/plugins/visualize/public/application/editor/editor.html b/src/plugins/visualize/public/application/editor/editor.html
new file mode 100644
index 0000000000000..3c3455fb34f18
--- /dev/null
+++ b/src/plugins/visualize/public/application/editor/editor.html
@@ -0,0 +1,104 @@
+<visualize-app class="app-container visEditor visEditor--{{ vis.type.name }}">
+
+  <!--
+    Local nav.
+    Most visualizations have all search bar components enabled
+    Some visualizations have fewer options but all visualizations have a search bar
+    which is why show-search-baris set to "true".
+    All visualizaions also have least a timepicker \ autorefresh component, which is why
+    show-query-bar is set to "true".
+  -->
+  <kbn-top-nav
+    ng-if="isVisible"
+    app-name="'visualize'"
+    config="topNavMenu"
+    show-search-bar="true"
+    show-query-bar="true"
+    show-query-input="showQueryInput()"
+    show-filter-bar="showFilterBar() && isVisible"
+    show-date-picker="showQueryBarTimePicker()"
+    show-auto-refresh-only="!showQueryBarTimePicker()"
+    query="query"
+    saved-query="savedQuery"
+    screen-title="vis.title"
+    on-query-submit="updateQueryAndFetch"
+    index-patterns="[indexPattern]"
+    filters="filters"
+    on-filters-updated="onFiltersUpdated"
+    date-range-from="timeRange.from"
+    date-range-to="timeRange.to"
+    is-refresh-paused="refreshInterval.pause"
+    refresh-interval="refreshInterval.value"
+    on-refresh-change="onRefreshChange"
+    show-save-query="showSaveQuery"
+    on-saved="updateSavedQuery"
+    on-saved-query-updated="updateSavedQuery"
+    on-clear-saved-query="onClearSavedQuery"
+  >
+  </kbn-top-nav>
+
+  <!--
+    The top nav is hidden in embed mode but the filter bar must still be present so
+    we show the filter bar on its own here if the chrome is not visible.
+  -->
+  <kbn-top-nav
+    ng-if="showFilterBar() && !isVisible"
+
+    app-name="'visualize'"
+    show-search-bar="true"
+    show-filter-bar="true"
+    show-save-query="false"
+    show-date-picker="false"
+
+    filters="filters"
+    on-filters-updated="onFiltersUpdated"
+    index-patterns="[indexPattern]"
+  >
+  </kbn-top-nav>
+
+  <div
+    class="euiCallOut euiCallOut--primary euiCallOut--small hide-for-sharing"
+    ng-if="vis.type.shouldMarkAsExperimentalInUI()"
+    data-test-subj="experimentalVisInfo"
+  >
+    <div class="euiText">
+      <p ng-bind-html="getAdditionalMessage()"></p>
+    </div>
+  </div>
+
+  <visualization-embedded
+    ng-if="!isVisible"
+    class="visualize"
+    vis="vis"
+    embeddable-handler="embeddableHandler"
+    ui-state="uiState"
+    time-range="timeRange"
+    filters="filters"
+    query="query"
+    app-state="appState"
+  ></visualization-embedded>
+
+  <h1
+    class="euiScreenReaderOnly"
+    i18n-id="visualize.pageHeading"
+    i18n-default-message="{chartName} {chartType} visualization"
+    i18n-values="{
+      chartName: savedVis.title,
+      chartType: vis.type.title
+    }"
+  >
+  </h1>
+  <visualization-editor
+    ng-if="isVisible"
+    vis="vis"
+    saved-search="savedSearch"
+    embeddable-handler="embeddableHandler"
+    event-emitter="eventEmitter"
+    ui-state="uiState"
+    time-range="timeRange"
+    filters="filters"
+    query="query"
+    class="visEditor__content"
+  ></visualization-editor>
+
+</visualize-app>
diff --git a/x-pack/legacy/plugins/maps/public/angular/listing_ng_wrapper.html b/x-pack/legacy/plugins/maps/public/angular/listing_ng_wrapper.html
index ed787edec6e01..bfea81e13e9df 100644
--- a/x-pack/legacy/plugins/maps/public/angular/listing_ng_wrapper.html
+++ b/x-pack/legacy/plugins/maps/public/angular/listing_ng_wrapper.html
@@ -3,4 +3,4 @@
   delete="delete"
   listing-limit="listingLimit"
   read-only="readOnly"
-/>
+></map-listing>
diff --git a/x-pack/legacy/plugins/monitoring/public/directives/main/index.html b/x-pack/legacy/plugins/monitoring/public/directives/main/index.html
index bb34cf6f5bb63..e8a186aab8ff9 100644
--- a/x-pack/legacy/plugins/monitoring/public/directives/main/index.html
+++ b/x-pack/legacy/plugins/monitoring/public/directives/main/index.html
@@ -239,7 +239,7 @@
           i18n-id="xpack.monitoring.logstashNavigation.pipelinesLinkText"
           i18n-default-message="Pipelines"
         ></span>
-        <span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature" />
+        <span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature"></span>
       </a>
       <a
         ng-if="!monitoringMain.instance && !monitoringMain.pipelineId && monitoringMain.isDisabledTab('logstash')"
@@ -251,7 +251,7 @@
           i18n-id="xpack.monitoring.logstashNavigation.pipelinesLinkText"
           i18n-default-message="Pipelines"
         ></span>
-        <span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature" />
+        <span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature"></span>
       </a>
       <a
         ng-if="monitoringMain.instance"
@@ -272,7 +272,7 @@
           i18n-id="xpack.monitoring.logstashNavigation.instance.pipelinesLinkText"
           i18n-default-message="Pipelines"
         ></span>
-        <span class="kuiIcon fa-flask fa-sm monTabs--icon" tooltip="Beta feature" />
+        <span class="kuiIcon fa-flask fa-sm monTabs--icon" tooltip="Beta feature"></span>
       </a>
       <a
         ng-if="monitoringMain.instance"
diff --git a/x-pack/package.json b/x-pack/package.json
index d4ba4d5224c8a..8bc23a3ab9c2f 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -268,7 +268,7 @@
     "io-ts": "^2.0.5",
     "isbinaryfile": "4.0.2",
     "joi": "^13.5.2",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.0",
     "js-search": "^1.4.3",
     "js-yaml": "3.13.1",
     "json-stable-stringify": "^1.0.1",
diff --git a/x-pack/plugins/graph/public/angular/templates/index.html b/x-pack/plugins/graph/public/angular/templates/index.html
index 4493d794cb8d1..8555658596179 100644
--- a/x-pack/plugins/graph/public/angular/templates/index.html
+++ b/x-pack/plugins/graph/public/angular/templates/index.html
@@ -208,7 +208,7 @@
             ng-click="selectSelected(n)">
             <svg width="24" height="24">
               <circle class="gphNode__circle " r="10" cx="12" cy="12" ng-attr-style="fill:{{n.color}}"
-                ng-click="workspace.deselectNode(n)" />
+                ng-click="workspace.deselectNode(n)" ></circle>
 
               <text
                 ng-if="n.icon"
diff --git a/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html b/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
index c4dc0926b4b0f..2f75d663126b2 100644
--- a/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
+++ b/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
@@ -8,4 +8,4 @@
   capabilities="capabilities"
   initial-filter="initialFilter"
   core-start="coreStart"
-/>
+></graph-listing>
diff --git a/x-pack/plugins/monitoring/public/directives/main/index.html b/x-pack/plugins/monitoring/public/directives/main/index.html
new file mode 100644
index 0000000000000..39d357813b3f2
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/directives/main/index.html
@@ -0,0 +1,317 @@
+<div class="app-container">
+  <div id="setupModeNav"></div>
+  <kbn-top-nav
+    name="monitoringMain.navName"
+    app-name="'monitoring'"
+    show-search-bar="true"
+    show-auto-refresh-only="!monitoringMain.datePicker.enableTimeFilter"
+    show-date-picker="monitoringMain.datePicker.enableTimeFilter"
+    date-range-from="monitoringMain.datePicker.timeRange.from"
+    date-range-to="monitoringMain.datePicker.timeRange.to"
+    is-refresh-paused="monitoringMain.datePicker.refreshInterval.pause"
+    refresh-interval="monitoringMain.datePicker.refreshInterval.value"
+    on-refresh-change="monitoringMain.datePicker.onRefreshChange"
+    on-query-submit="monitoringMain.datePicker.onTimeUpdate"
+  >
+  </kbn-top-nav>
+  <div>
+    <div ng-if="monitoringMain.inElasticsearch" class="euiTabs" role="navigation">
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.isDisabledTab('elasticsearch')"
+        kbn-href="#/elasticsearch"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.esNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance && monitoringMain.isDisabledTab('elasticsearch')"
+        kbn-href=""
+        class="euiTab euiTab-isDisabled"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.esNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance"
+        kbn-href="#/elasticsearch/nodes"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('nodes')}"
+        i18n-id="xpack.monitoring.esNavigation.nodesLinkText"
+        i18n-default-message="Nodes"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.isDisabledTab('elasticsearch')"
+        kbn-href="#/elasticsearch/indices"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('indices')}"
+        i18n-id="xpack.monitoring.esNavigation.indicesLinkText"
+        i18n-default-message="Indices"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance && monitoringMain.isDisabledTab('elasticsearch')"
+        kbn-href=""
+        class="euiTab euiTab-isDisabled"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('indices')}"
+        i18n-id="xpack.monitoring.esNavigation.indicesLinkText"
+        i18n-default-message="Indices"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance && monitoringMain.isMlSupported()"
+        kbn-href="#/elasticsearch/ml_jobs"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('ml')}"
+        i18n-id="xpack.monitoring.esNavigation.jobsLinkText"
+        i18n-default-message="Jobs"
+      ></a>
+      <a
+        ng-if="(monitoringMain.isCcrEnabled || monitoringMain.isActiveTab('ccr')) && !monitoringMain.instance"
+        kbn-href="#/elasticsearch/ccr"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('ccr')}"
+        i18n-id="xpack.monitoring.esNavigation.ccrLinkText"
+        i18n-default-message="CCR"
+      ></a>
+      <a
+        ng-if="monitoringMain.instance && (monitoringMain.name === 'nodes' || monitoringMain.name === 'indices')"
+        kbn-href="#/elasticsearch/{{ monitoringMain.name }}/{{ monitoringMain.resolver }}"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.page === 'overview'}"
+      >
+        <span
+          ng-if="monitoringMain.tabIconClass"
+          class="fa {{ monitoringMain.tabIconClass }}"
+          title="{{ monitoringMain.tabIconLabel }}"
+        ></span>
+        <span
+          i18n-id="xpack.monitoring.esNavigation.instance.overviewLinkText"
+          i18n-default-message="Overview"
+        ></span>
+      </a>
+      <a
+        ng-if="monitoringMain.instance && (monitoringMain.name === 'nodes' || monitoringMain.name === 'indices')"
+        kbn-href="#/elasticsearch/{{ monitoringMain.name }}/{{ monitoringMain.resolver }}/advanced"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.page === 'advanced'}"
+        i18n-id="xpack.monitoring.esNavigation.instance.advancedLinkText"
+        i18n-default-message="Advanced"
+      >
+      </a>
+      <!-- ML Instance (for use later) -->
+      <a
+        ng-if="monitoringMain.instance && monitoringMain.name !== 'nodes' && monitoringMain.name !== 'indices'"
+        class="euiTab"
+        >{{ monitoringMain.instance }}</a
+      >
+    </div>
+
+    <div ng-if="monitoringMain.inKibana" class="euiTabs" role="navigation">
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.isDisabledTab('kibana')"
+        kbn-href="#/kibana"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.kibanaNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance && monitoringMain.isDisabledTab('kibana')"
+        kbn-href=""
+        class="euiTab euiTab-isDisabled"
+        ng-class="{
+          'euiTab-isSelected': monitoringMain.isActiveTab('overview'),
+        }"
+        i18n-id="xpack.monitoring.kibanaNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance"
+        kbn-href="#/kibana/instances"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('kibanas')}"
+        i18n-id="xpack.monitoring.kibanaNavigation.instancesLinkText"
+        i18n-default-message="Instances"
+      ></a>
+      <a ng-if="monitoringMain.instance" class="euiTab">{{ monitoringMain.instance }}</a>
+    </div>
+
+    <div ng-if="monitoringMain.inApm" class="euiTabs" role="navigation">
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.isDisabledTab('apm')"
+        kbn-href="#/apm"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.apmNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance && monitoringMain.isDisabledTab('apm')"
+        kbn-href=""
+        class="euiTab euiTab-isDisabled"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.apmNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      ></a>
+      <a
+        ng-if="!monitoringMain.instance"
+        kbn-href="#/apm/instances"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('apms')}"
+        i18n-id="xpack.monitoring.apmNavigation.instancesLinkText"
+        i18n-default-message="Instances"
+      ></a>
+      <a ng-if="monitoringMain.instance" class="euiTab">{{ monitoringMain.instance }}</a>
+    </div>
+
+    <div ng-if="monitoringMain.inBeats" class="euiTabs" role="navigation">
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.isDisabledTab('beats')"
+        kbn-href="#/beats"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.beatsNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      >
+      </a>
+      <a
+        ng-if="!monitoringMain.instance && monitoringMain.isDisabledTab('beats')"
+        kbn-href=""
+        class="euiTab euiTab-isDisabled"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.beatsNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      >
+      </a>
+      <a
+        ng-if="!monitoringMain.instance"
+        kbn-href="#/beats/beats"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('beats')}"
+        i18n-id="xpack.monitoring.beatsNavigation.instancesLinkText"
+        i18n-default-message="Instances"
+      >
+      </a>
+      <a
+        ng-if="monitoringMain.instance"
+        kbn-href="#/beats/beat/{{ monitoringMain.resolver }}"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.page === 'overview'}"
+        i18n-id="xpack.monitoring.beatsNavigation.instance.overviewLinkText"
+        i18n-default-message="Overview"
+      >
+      </a>
+    </div>
+
+    <div ng-if="monitoringMain.inLogstash" class="euiTabs" role="navigation">
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.pipelineId && !monitoringMain.isDisabledTab('logstash')"
+        kbn-href="#/logstash"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.logstashNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      >
+      </a>
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.pipelineId && monitoringMain.isDisabledTab('logstash')"
+        kbn-href=""
+        class="euiTab euiTab-isDisabled"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('overview')}"
+        i18n-id="xpack.monitoring.logstashNavigation.overviewLinkText"
+        i18n-default-message="Overview"
+      >
+      </a>
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.pipelineId"
+        kbn-href="#/logstash/nodes"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('nodes')}"
+        i18n-id="xpack.monitoring.logstashNavigation.nodesLinkText"
+        i18n-default-message="Nodes"
+      >
+      </a>
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.pipelineId && !monitoringMain.isDisabledTab('logstash')"
+        kbn-href="#/logstash/pipelines"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('pipelines')}"
+      >
+        <span
+          i18n-id="xpack.monitoring.logstashNavigation.pipelinesLinkText"
+          i18n-default-message="Pipelines"
+        ></span>
+        <span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature"></span>
+      </a>
+      <a
+        ng-if="!monitoringMain.instance && !monitoringMain.pipelineId && monitoringMain.isDisabledTab('logstash')"
+        kbn-href=""
+        class="euiTab euiTab-isDisabled"
+        ng-class="{'euiTab-isSelected': monitoringMain.isActiveTab('pipelines')}"
+      >
+        <span
+          i18n-id="xpack.monitoring.logstashNavigation.pipelinesLinkText"
+          i18n-default-message="Pipelines"
+        ></span>
+        <span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature"></span>
+      </a>
+      <a
+        ng-if="monitoringMain.instance"
+        kbn-href="#/logstash/node/{{ monitoringMain.resolver }}"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.page === 'overview'}"
+        i18n-id="xpack.monitoring.logstashNavigation.instance.overviewLinkText"
+        i18n-default-message="Overview"
+      >
+      </a>
+      <a
+        ng-if="monitoringMain.instance"
+        kbn-href="#/logstash/node/{{ monitoringMain.resolver }}/pipelines"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.page === 'pipelines'}"
+      >
+        <span
+          i18n-id="xpack.monitoring.logstashNavigation.instance.pipelinesLinkText"
+          i18n-default-message="Pipelines"
+        ></span>
+        <span class="kuiIcon fa-flask fa-sm monTabs--icon" tooltip="Beta feature"></span>
+      </a>
+      <a
+        ng-if="monitoringMain.instance"
+        kbn-href="#/logstash/node/{{ monitoringMain.resolver }}/advanced"
+        class="euiTab"
+        ng-class="{'euiTab-isSelected': monitoringMain.page === 'advanced'}"
+        i18n-id="xpack.monitoring.logstashNavigation.instance.advancedLinkText"
+        i18n-default-message="Advanced"
+      >
+      </a>
+      <div
+        class="euiTab"
+        ng-if="monitoringMain.pipelineVersions.length"
+        id="dropdown-elm"
+        ng-init="monitoringMain.dropdownLoadedHandler()"
+      ></div>
+    </div>
+
+    <div ng-if="monitoringMain.inOverview" class="euiTabs" role="navigation">
+      <a class="euiTab" data-test-subj="clusterName">{{ pageData.cluster_name }}</a>
+    </div>
+
+    <div ng-if="monitoringMain.inAlerts" class="euiTabs" role="navigation">
+      <a
+        class="euiTab"
+        data-test-subj="clusterAlertsListingPage"
+        i18n-id="xpack.monitoring.clusterAlertsNavigation.clusterAlertsLinkText"
+        i18n-default-message="Cluster Alerts"
+      ></a>
+    </div>
+
+    <div ng-if="monitoringMain.inListing" class="euiTabs" role="navigation">
+      <a
+        class="euiTab"
+        i18n-id="xpack.monitoring.clustersNavigation.clustersLinkText"
+        i18n-default-message="Clusters"
+      ></a>
+    </div>
+  </div>
+  <div ng-transclude></div>
+</div>
diff --git a/yarn.lock b/yarn.lock
index bfa62faa43406..ec10623aee473 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19422,10 +19422,10 @@ jpeg-js@^0.3.4:
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.4.tgz#dc2ba501ee3d58b7bb893c5d1fab47294917e7e7"
   integrity sha512-6IzjQxvnlT8UlklNmDXIJMWxijULjqGrzgqc0OG7YadZdvm7KPQ1j0ehmQQHckgEWOfgpptzcnWgESovxudpTA==
 
-jquery@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
-  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+jquery@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
 js-base64@^2.1.8:
   version "2.4.5"
@@ -27834,9 +27834,9 @@ sentence-case@^2.1.0:
     upper-case-first "^1.1.2"
 
 serialize-javascript@^1.7.0, serialize-javascript@^2.1.1, serialize-javascript@^2.1.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.1.tgz#952907a04a3e3a75af7f73d92d15e233862048b2"
-  integrity sha512-MPLPRpD4FNqWq9tTIjYG5LesFouDhdyH0EPY3gVK4DRD5+g4aDqdNSzLIwceulo3Yj+PL1bPh6laE5+H6LTcrQ==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
 serve-favicon@^2.5.0:
   version "2.5.0"