From 512855d5b30dafda046db44fe55e221c221b073a Mon Sep 17 00:00:00 2001
From: chorn <caroline@curiouschaos.com>
Date: Fri, 13 Jul 2018 18:09:21 -0400
Subject: [PATCH] Fixed breaking `EuiPage` changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mainly adding `EuiPageBody`’s where there were none
---
 .../template/public/components/main/main.js   |   10 +-
 .../kbn-ui-framework/dist/ui_framework.css    |  208 +---
 .../__snapshots__/home.test.js.snap           | 1024 +++++++++--------
 .../home/components/feature_directory.js      |   29 +-
 .../kibana/public/home/components/home.js     |  102 +-
 .../__snapshots__/tutorial.test.js.snap       |  404 +++----
 .../home/components/tutorial/tutorial.js      |   13 +-
 .../home/components/tutorial_directory.js     |   41 +-
 .../__snapshots__/objects_table.test.js.snap  |  184 +--
 .../components/objects_table/objects_table.js |   69 +-
 .../components/index_table/index_table.js     |  139 +--
 .../components/cluster/overview/index.js      |   28 +-
 .../pipeline_viewer/views/pipeline_viewer.js  |   59 +-
 13 files changed, 1076 insertions(+), 1234 deletions(-)

diff --git a/packages/kbn-plugin-generator/sao_template/template/public/components/main/main.js b/packages/kbn-plugin-generator/sao_template/template/public/components/main/main.js
index b32d9e46e442f..ab9bf897ca79d 100644
--- a/packages/kbn-plugin-generator/sao_template/template/public/components/main/main.js
+++ b/packages/kbn-plugin-generator/sao_template/template/public/components/main/main.js
@@ -30,12 +30,12 @@ export class Main extends React.Component {
     const { title } = this.props;
     return (
       <EuiPage>
-        <EuiPageHeader>
-          <EuiTitle size="l">
-            <h1>{title} Hello World!</h1>
-          </EuiTitle>
-        </EuiPageHeader>
         <EuiPageBody>
+          <EuiPageHeader>
+            <EuiTitle size="l">
+              <h1>{title} Hello World!</h1>
+            </EuiTitle>
+          </EuiPageHeader>
           <EuiPageContent>
             <EuiPageContentHeader>
               <EuiTitle>
diff --git a/packages/kbn-ui-framework/dist/ui_framework.css b/packages/kbn-ui-framework/dist/ui_framework.css
index 0d013535e3555..409034cd9b6ea 100644
--- a/packages/kbn-ui-framework/dist/ui_framework.css
+++ b/packages/kbn-ui-framework/dist/ui_framework.css
@@ -78,15 +78,12 @@ main {
   overflow: hidden; }
 
 .kuiActionItem {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between; }
@@ -105,15 +102,12 @@ main {
   background-color: rgba(0, 0, 0, 0.1); }
 
 .kuiBar {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -121,22 +115,18 @@ main {
   /* 1 */ }
 
 .kuiBarSection {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
   margin-left: 25px;
   margin-right: 25px; }
   .kuiBarSection:not(:first-child):not(:last-child):not(:only-child) {
-    -webkit-box-pack: center;
     -webkit-justify-content: center;
         -ms-flex-pack: center;
             justify-content: center;
@@ -145,12 +135,10 @@ main {
     margin-left: 0; }
   .kuiBarSection:last-child {
     margin-right: 0;
-    -webkit-box-flex: 0;
     -webkit-flex: 0 1 auto;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;
     /* 4 */
-    -webkit-box-pack: end;
     -webkit-justify-content: flex-end;
         -ms-flex-pack: end;
             justify-content: flex-end;
@@ -201,12 +189,10 @@ main {
    * 1. Solves whitespace problems introduced by inline elements.
    */
 .kuiButton__inner {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
   /* 1 */
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -513,11 +499,9 @@ main {
     background-color: rgba(165, 231, 255, 0.5); }
 
 .kuiButtonGroup {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center; }
@@ -545,24 +529,19 @@ main {
   margin-left: 2px; }
 
 .kuiButtonGroup--fullWidth {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex; }
   .kuiButtonGroup--fullWidth > .kuiButton {
-    -webkit-box-flex: 1;
     -webkit-flex: 1 1 auto;
         -ms-flex: 1 1 auto;
             flex: 1 1 auto;
     text-align: center; }
 
 .kuiCard {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
@@ -572,20 +551,15 @@ main {
   line-height: 1.5; }
 
 .kuiCard__description {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: start;
   -webkit-justify-content: flex-start;
       -ms-flex-pack: start;
           justify-content: flex-start;
@@ -613,7 +587,6 @@ main {
  * 2. Offset the spacing between wrapped cards.
  */
 .kuiCardGroup {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -628,7 +601,6 @@ main {
    * 2. Use an even margin all around the card so that the spacing is still even when wrapped.
    */ }
   .kuiCardGroup .kuiCard {
-    -webkit-box-flex: 1;
     -webkit-flex: 1 1 auto;
         -ms-flex: 1 1 auto;
             flex: 1 1 auto;
@@ -636,7 +608,6 @@ main {
     margin: 15px;
     /* 2 */ }
     .kuiCardGroup .kuiCard .kuiCard__description {
-      -webkit-box-flex: 1;
       -webkit-flex: 1 1 auto;
           -ms-flex: 1 1 auto;
               flex: 1 1 auto; }
@@ -687,20 +658,15 @@ main {
   right: 0;
   left: 0;
   background: rgba(255, 255, 255, 0.7);
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
-  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -736,11 +702,9 @@ main {
   cursor: pointer; }
 
 .kuiColorPicker__preview {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center; }
@@ -890,11 +854,9 @@ main {
   margin-right: 8px; }
 
 .kuiContextMenu__itemLayout {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center; }
@@ -1071,13 +1033,11 @@ main {
     color: #ffffff; }
 
 .kuiContextMenuItem__inner {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex; }
 
 .kuiContextMenuItem__text {
-  -webkit-box-flex: 1;
   -webkit-flex-grow: 1;
       -ms-flex-positive: 1;
           flex-grow: 1; }
@@ -1096,13 +1056,11 @@ main {
     text-decoration: none; }
 
 .kuiEvent {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex; }
 
 .kuiEventSymbol {
-  -webkit-box-flex: 0;
   -webkit-flex: 0 1 auto;
       -ms-flex: 0 1 auto;
           flex: 0 1 auto;
@@ -1111,7 +1069,6 @@ main {
   padding-right: 8px; }
 
 .kuiEventBody {
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 0%;
       -ms-flex: 1 1 0%;
           flex: 1 1 0%; }
@@ -1150,16 +1107,13 @@ main {
   border-bottom: solid 2px #00A69B; }
 
 .kuiFlexGroup {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
   .kuiFlexGroup .kuiFlexItem {
-    -webkit-box-flex: 1;
     -webkit-flex-grow: 1;
         -ms-flex-positive: 1;
             flex-grow: 1; }
@@ -1185,13 +1139,11 @@ main {
     margin: 20px; }
 
 .kuiFlexGroup--justifyContentSpaceEvenly {
-  -webkit-box-pack: space-evenly;
   -webkit-justify-content: space-evenly;
       -ms-flex-pack: space-evenly;
           justify-content: space-evenly; }
 
 .kuiFlexGroup--justifyContentSpaceBetween {
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between; }
@@ -1202,31 +1154,26 @@ main {
           justify-content: space-around; }
 
 .kuiFlexGroup--justifyContentCenter {
-  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center; }
 
 .kuiFlexGroup--justifyContentFlexEnd {
-  -webkit-box-pack: end;
   -webkit-justify-content: flex-end;
       -ms-flex-pack: end;
           justify-content: flex-end; }
 
 .kuiFlexGroup--alignItemsStart {
-  -webkit-box-align: start;
   -webkit-align-items: flex-start;
       -ms-flex-align: start;
           align-items: flex-start; }
 
 .kuiFlexGroup--alignItemsCenter {
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center; }
 
 .kuiFlexGroup--alignItemsEnd {
-  -webkit-box-align: end;
   -webkit-align-items: flex-end;
       -ms-flex-align: end;
           align-items: flex-end; }
@@ -1243,7 +1190,6 @@ main {
             flex-wrap: wrap; } }
 
 .kuiFlexGrid {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -1252,12 +1198,10 @@ main {
           flex-wrap: wrap;
   margin-bottom: 0; }
   .kuiFlexGrid > .kuiFlexItem {
-    -webkit-box-flex: 0;
     -webkit-flex-grow: 0;
         -ms-flex-positive: 0;
             flex-grow: 0; }
     .kuiFlexGrid > .kuiFlexItem.kuiFlexItem--flexGrowZero {
-      -webkit-box-flex: 0 !important;
       -webkit-flex-grow: 0 !important;
           -ms-flex-positive: 0 !important;
               flex-grow: 0 !important;
@@ -1274,7 +1218,6 @@ main {
 
 .kuiFlexGrid--gutterSmall {
   margin: -4px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1285,7 +1228,6 @@ main {
 
 .kuiFlexGrid--gutterSmall {
   margin: -4px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1296,7 +1238,6 @@ main {
 
 .kuiFlexGrid--gutterSmall {
   margin: -4px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1314,7 +1255,6 @@ main {
 
 .kuiFlexGrid--gutterMedium {
   margin: -8px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1325,7 +1265,6 @@ main {
 
 .kuiFlexGrid--gutterMedium {
   margin: -8px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1336,7 +1275,6 @@ main {
 
 .kuiFlexGrid--gutterMedium {
   margin: -8px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1354,7 +1292,6 @@ main {
 
 .kuiFlexGrid--gutterLarge {
   margin: -12px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1365,7 +1302,6 @@ main {
 
 .kuiFlexGrid--gutterLarge {
   margin: -12px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1376,7 +1312,6 @@ main {
 
 .kuiFlexGrid--gutterLarge {
   margin: -12px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1394,7 +1329,6 @@ main {
 
 .kuiFlexGrid--gutterXLarge {
   margin: -16px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1405,7 +1339,6 @@ main {
 
 .kuiFlexGrid--gutterXLarge {
   margin: -16px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1416,7 +1349,6 @@ main {
 
 .kuiFlexGrid--gutterXLarge {
   margin: -16px;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -1429,13 +1361,10 @@ main {
  * 1. Allow KuiPanels to expand to fill the item.
  */
 .kuiFlexItem {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
   /* 1 */
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
@@ -1446,7 +1375,6 @@ main {
    */ }
   .kuiFlexItem.kuiFlexItem--flexGrowZero {
     /* 1 */
-    -webkit-box-flex: 0;
     -webkit-flex-grow: 0;
         -ms-flex-positive: 0;
             flex-grow: 0;
@@ -1456,52 +1384,42 @@ main {
             flex-basis: auto;
     /* 2 */ }
   .kuiFlexItem.kuiFlexItem--flexGrow1 {
-    -webkit-box-flex: 1;
     -webkit-flex-grow: 1;
         -ms-flex-positive: 1;
             flex-grow: 1; }
   .kuiFlexItem.kuiFlexItem--flexGrow2 {
-    -webkit-box-flex: 2;
     -webkit-flex-grow: 2;
         -ms-flex-positive: 2;
             flex-grow: 2; }
   .kuiFlexItem.kuiFlexItem--flexGrow3 {
-    -webkit-box-flex: 3;
     -webkit-flex-grow: 3;
         -ms-flex-positive: 3;
             flex-grow: 3; }
   .kuiFlexItem.kuiFlexItem--flexGrow4 {
-    -webkit-box-flex: 4;
     -webkit-flex-grow: 4;
         -ms-flex-positive: 4;
             flex-grow: 4; }
   .kuiFlexItem.kuiFlexItem--flexGrow5 {
-    -webkit-box-flex: 5;
     -webkit-flex-grow: 5;
         -ms-flex-positive: 5;
             flex-grow: 5; }
   .kuiFlexItem.kuiFlexItem--flexGrow6 {
-    -webkit-box-flex: 6;
     -webkit-flex-grow: 6;
         -ms-flex-positive: 6;
             flex-grow: 6; }
   .kuiFlexItem.kuiFlexItem--flexGrow7 {
-    -webkit-box-flex: 7;
     -webkit-flex-grow: 7;
         -ms-flex-positive: 7;
             flex-grow: 7; }
   .kuiFlexItem.kuiFlexItem--flexGrow8 {
-    -webkit-box-flex: 8;
     -webkit-flex-grow: 8;
         -ms-flex-positive: 8;
             flex-grow: 8; }
   .kuiFlexItem.kuiFlexItem--flexGrow9 {
-    -webkit-box-flex: 9;
     -webkit-flex-grow: 9;
         -ms-flex-positive: 9;
             flex-grow: 9; }
   .kuiFlexItem.kuiFlexItem--flexGrow10 {
-    -webkit-box-flex: 10;
     -webkit-flex-grow: 10;
         -ms-flex-positive: 10;
             flex-grow: 10; }
@@ -1592,11 +1510,9 @@ main {
       background-color: #0079a5; }
 
 .kuiCheckBoxLabel {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -1860,18 +1776,15 @@ main {
  * 1. We may want to put elements in here which have different heights.
  */
 .kuiFieldGroup {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
   /* 1 */ }
 
 .kuiFieldGroup--alignTop {
-  -webkit-box-align: start;
   -webkit-align-items: flex-start;
       -ms-flex-align: start;
           align-items: flex-start; }
@@ -1882,7 +1795,6 @@ main {
     margin-left: 10px; }
 
 .kuiFieldGroupSection--wide {
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto; }
@@ -1890,7 +1802,6 @@ main {
     width: 100%; }
 
 .kuiGallery {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -1899,20 +1810,15 @@ main {
           flex-wrap: wrap; }
 
 .kuiGalleryItem {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center;
@@ -1931,15 +1837,12 @@ main {
     border-color: #00A6FF; }
 
 .kuiGalleryItem__image {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center;
@@ -1970,15 +1873,12 @@ main {
   color: #666; }
 
 .kuiHeaderBar {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -1990,22 +1890,18 @@ main {
  * 1. Align a single section to the left by default.
  */
 .kuiHeaderBarSection {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
   margin-left: 25px;
   margin-right: 25px; }
   .kuiHeaderBarSection:not(:first-child):not(:last-child):not(:only-child) {
-    -webkit-box-pack: center;
     -webkit-justify-content: center;
         -ms-flex-pack: center;
             justify-content: center;
@@ -2014,12 +1910,10 @@ main {
     margin-left: 0; }
   .kuiHeaderBarSection:last-child {
     margin-right: 0;
-    -webkit-box-flex: 0;
     -webkit-flex: 0 1 auto;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;
     /* 4 */
-    -webkit-box-pack: end;
     -webkit-justify-content: flex-end;
         -ms-flex-pack: end;
             justify-content: flex-end;
@@ -2118,11 +2012,9 @@ main {
  * 1. Align with first line of title text if it wraps.
  */
 .kuiInfoPanelHeader {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: baseline;
   -webkit-align-items: baseline;
       -ms-flex-align: baseline;
           align-items: baseline;
@@ -2179,11 +2071,9 @@ main {
  *    a bit.
  */
 .kuiLocalBreadcrumbs {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -2253,15 +2143,12 @@ main {
   padding: 0; }
 
 .kuiDatePickerNavigation {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -2425,13 +2312,11 @@ main {
     /* 1 */ }
 
 .kuiLocalDropdownPanels {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex; }
 
 .kuiLocalDropdownPanel {
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 0%;
       -ms-flex: 1 1 0%;
           flex: 1 1 0%; }
@@ -2460,15 +2345,12 @@ main {
     margin-bottom: 0; }
 
 .kuiLocalDropdownHeader {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -2487,7 +2369,6 @@ main {
     color: #cecece; }
 
 .kuiLocalDropdownHeader__actions {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex; }
@@ -2549,21 +2430,17 @@ main {
     color: #9e9e9e; }
 
 .kuiLocalMenu {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
 
 .kuiLocalMenuItem {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -2615,16 +2492,12 @@ main {
  *    dropdown.
  */
 .kuiLocalNav {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -2643,15 +2516,12 @@ main {
  * 1. Allow row to expand if the content is so long that it wraps.
  */
 .kuiLocalNavRow {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -2659,11 +2529,9 @@ main {
   /* 1 */ }
 
 .kuiLocalNavRow__section {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: stretch;
   -webkit-align-items: stretch;
       -ms-flex-align: stretch;
           align-items: stretch; }
@@ -2678,14 +2546,12 @@ main {
 .kuiLocalNavRow--secondary {
   padding: 0 10px;
   /* 1 */
-  -webkit-box-align: start;
   -webkit-align-items: flex-start;
       -ms-flex-align: start;
           align-items: flex-start;
   /* 1 */ }
 
 .kuiLocalSearch {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -2708,7 +2574,6 @@ main {
   transition: border-color 0.1s linear;
   min-height: 30px;
   /* 1 */
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 100%;
       -ms-flex: 1 1 100%;
           flex: 1 1 100%;
@@ -2738,7 +2603,6 @@ main {
 
 .kuiLocalSearchInput--secondary {
   height: 30px;
-  -webkit-box-flex: 0;
   -webkit-flex: 0 0 auto;
       -ms-flex: 0 0 auto;
           flex: 0 0 auto;
@@ -2750,11 +2614,9 @@ main {
     border-right-color: #333333; }
 
 .kuiLocalSearchAssistedInput {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 100%;
       -ms-flex: 1 1 100%;
           flex: 1 1 100%;
@@ -2857,11 +2719,9 @@ main {
  * 1. We want the bottom border on selected tabs to be flush with the bottom of the container.
  */
 .kuiLocalTabs {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: end;
   -webkit-align-items: flex-end;
       -ms-flex-align: end;
           align-items: flex-end;
@@ -2906,11 +2766,9 @@ main {
     color: #dedede; }
 
 .kuiLocalTitle {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -3042,7 +2900,6 @@ main {
     /* 3 */ }
 
 .kuiMenuButtonGroup {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex; }
@@ -3050,7 +2907,6 @@ main {
     margin-left: 4px; }
 
 .kuiMenuButtonGroup--alignRight {
-  -webkit-box-pack: end;
   -webkit-justify-content: flex-end;
       -ms-flex-pack: end;
           justify-content: flex-end; }
@@ -3073,7 +2929,6 @@ main {
     color: #191E23; }
 
 .kuiMicroButtonGroup {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex; }
@@ -3087,15 +2942,12 @@ main {
   left: 0;
   right: 0;
   bottom: 0;
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center;
@@ -3121,15 +2973,12 @@ main {
   min-width: auto; }
 
 .kuiModalHeader {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -3170,11 +3019,9 @@ main {
     color: #cecece; }
 
 .kuiModalFooter {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: end;
   -webkit-justify-content: flex-end;
       -ms-flex-pack: end;
           justify-content: flex-end;
@@ -3213,11 +3060,9 @@ main {
  * 1. Put 10px of space between each child.
  */
 .kuiPager {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center; }
@@ -3237,21 +3082,16 @@ main {
   border-radius: 4px; }
 
 .kuiPanel--prompt {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
   text-align: center;
-  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center;
@@ -3268,29 +3108,23 @@ main {
   border-radius: 0; }
 
 .kuiPanel--centered {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center; }
 
 .kuiPanelHeader {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -3352,22 +3186,18 @@ main {
  * 1. Undo what barSection mixin does.
  */
 .kuiPanelHeaderSection {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
   margin-left: 25px;
   margin-right: 25px; }
   .kuiPanelHeaderSection:not(:first-child):not(:last-child):not(:only-child) {
-    -webkit-box-pack: center;
     -webkit-justify-content: center;
         -ms-flex-pack: center;
             justify-content: center;
@@ -3376,12 +3206,10 @@ main {
     margin-left: 0; }
   .kuiPanelHeaderSection:last-child {
     margin-right: 0;
-    -webkit-box-flex: 0;
     -webkit-flex: 0 1 auto;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;
     /* 4 */
-    -webkit-box-pack: end;
     -webkit-justify-content: flex-end;
         -ms-flex-pack: end;
             justify-content: flex-end;
@@ -3406,7 +3234,6 @@ main {
   background-color: #FFF;
   border: 1px solid #D9D9D9;
   border-radius: 4px;
-  -webkit-box-flex: 1;
   -webkit-flex-grow: 1;
       -ms-flex-positive: 1;
           flex-grow: 1; }
@@ -3419,7 +3246,6 @@ main {
   .kuiPanelSimple.kuiPanelSimple--shadow {
     box-shadow: 0 16px 16px -8px rgba(0, 0, 0, 0.1); }
   .kuiPanelSimple.kuiPanelSimple--flexGrowZero {
-    -webkit-box-flex: 0;
     -webkit-flex-grow: 0;
         -ms-flex-positive: 0;
             flex-grow: 0; }
@@ -3513,16 +3339,12 @@ main {
     color: #ffffff; }
 
 .kuiEmptyTablePrompt {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
   -webkit-flex-direction: column;
       -ms-flex-direction: column;
           flex-direction: column;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -3537,11 +3359,9 @@ main {
   margin-top: 10px; }
 
 .kuiStatusText {
-  display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
   display: inline-flex;
-  -webkit-box-align: baseline;
   -webkit-align-items: baseline;
       -ms-flex-align: baseline;
           align-items: baseline; }
@@ -3657,11 +3477,9 @@ main {
     display: block;
     opacity: 1; }
   .kuiTableHeaderCellButton .kuiTableHeaderCell__liner {
-    display: -webkit-box;
     display: -webkit-flex;
     display: -ms-flexbox;
     display: flex;
-    -webkit-box-align: center;
     -webkit-align-items: center;
         -ms-flex-align: center;
             align-items: center; }
@@ -3762,7 +3580,6 @@ main {
   line-height: 1.5; }
 
 .kuiTabs {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -3835,7 +3652,7 @@ main {
       border-bottom-color: #333333; }
 
 /**
- * 1. Allow container to deteermine font-size and line-height.
+ * 1. Allow container to determine font-size and line-height.
  * 2. Override inherited Bootstrap styles.
  */
 .kuiToggleButton {
@@ -3886,15 +3703,12 @@ main {
     /* 1 */ }
 
 .kuiToolBar {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -3945,22 +3759,18 @@ main {
       border-color: #0079a5; }
 
 .kuiToolBarSection {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
   margin-left: 25px;
   margin-right: 25px; }
   .kuiToolBarSection:not(:first-child):not(:last-child):not(:only-child) {
-    -webkit-box-pack: center;
     -webkit-justify-content: center;
         -ms-flex-pack: center;
             justify-content: center;
@@ -3969,12 +3779,10 @@ main {
     margin-left: 0; }
   .kuiToolBarSection:last-child {
     margin-right: 0;
-    -webkit-box-flex: 0;
     -webkit-flex: 0 1 auto;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;
     /* 4 */
-    -webkit-box-pack: end;
     -webkit-justify-content: flex-end;
         -ms-flex-pack: end;
             justify-content: flex-end;
@@ -3994,15 +3802,12 @@ main {
   /* 1 */ }
 
 .kuiToolBarFooter {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
@@ -4014,22 +3819,18 @@ main {
   border: 1px solid #D9D9D9; }
 
 .kuiToolBarFooterSection {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
   margin-left: 25px;
   margin-right: 25px; }
   .kuiToolBarFooterSection:not(:first-child):not(:last-child):not(:only-child) {
-    -webkit-box-pack: center;
     -webkit-justify-content: center;
         -ms-flex-pack: center;
             justify-content: center;
@@ -4038,12 +3839,10 @@ main {
     margin-left: 0; }
   .kuiToolBarFooterSection:last-child {
     margin-right: 0;
-    -webkit-box-flex: 0;
     -webkit-flex: 0 1 auto;
         -ms-flex: 0 1 auto;
             flex: 0 1 auto;
     /* 4 */
-    -webkit-box-pack: end;
     -webkit-justify-content: flex-end;
         -ms-flex-pack: end;
             justify-content: flex-end;
@@ -4061,17 +3860,14 @@ main {
  *    kuiToolBarSection sibling.
  */
 .kuiToolBarSearch {
-  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
   margin-left: 25px;
   margin-right: 25px;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
@@ -4087,7 +3883,6 @@ main {
     /* 1 */ }
 
 .kuiToolBarSearchBox {
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto;
@@ -4210,7 +4005,6 @@ main {
 
 .kuiView {
   background-color: #FFF;
-  -webkit-box-flex: 1;
   -webkit-flex: 1 1 auto;
       -ms-flex: 1 1 auto;
           flex: 1 1 auto; }
diff --git a/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap b/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
index 955fa03003d88..dcc8b2348fdaf 100644
--- a/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
+++ b/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
@@ -5,109 +5,111 @@ exports[`directories should not render directory entry when showOnHomePage is fa
   className="home"
   restrictWidth={false}
 >
-  <AddData
-    apmUiEnabled={true}
-  />
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="flexStart"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+  <EuiPageBody>
+    <AddData
+      apmUiEnabled={true}
+    />
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={true}
+      direction="row"
+      gutterSize="l"
+      justifyContent="flexStart"
+      responsive={true}
+      wrap={false}
     >
-      <EuiPanel
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Visualize and Explore Data
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-    <EuiFlexItem
-      component="div"
-      grow={true}
-    >
-      <EuiPanel
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Visualize and Explore Data
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Manage and Administer the Elastic Stack
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="center"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Manage and Administer the Elastic Stack
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={false}
+      direction="row"
+      gutterSize="l"
+      justifyContent="center"
+      responsive={true}
+      wrap={false}
     >
-      <EuiText
-        grow={true}
-      >
-        <p>
-          Didn’t find what you were looking for?
-        </p>
-      </EuiText>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiButton
-        color="primary"
-        fill={false}
-        href="#/home/feature_directory"
-        iconSide="left"
-        type="button"
+      <EuiFlexItem
+        component="div"
+        grow={false}
       >
-        View full directory of Kibana plugins
-      </EuiButton>
-    </EuiFlexItem>
-  </EuiFlexGroup>
+        <EuiText
+          grow={true}
+        >
+          <p>
+            Didn’t find what you were looking for?
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="s"
+        />
+        <EuiButton
+          color="primary"
+          fill={false}
+          href="#/home/feature_directory"
+          iconSide="left"
+          type="button"
+        >
+          View full directory of Kibana plugins
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiPageBody>
 </EuiPage>
 `;
 
@@ -116,128 +118,130 @@ exports[`directories should render ADMIN directory entry in "Manage" panel 1`] =
   className="home"
   restrictWidth={false}
 >
-  <AddData
-    apmUiEnabled={true}
-  />
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="flexStart"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+  <EuiPageBody>
+    <AddData
+      apmUiEnabled={true}
+    />
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={true}
+      direction="row"
+      gutterSize="l"
+      justifyContent="flexStart"
+      responsive={true}
+      wrap={false}
     >
-      <EuiPanel
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Visualize and Explore Data
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-    <EuiFlexItem
-      component="div"
-      grow={true}
-    >
-      <EuiPanel
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Visualize and Explore Data
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
-        >
-          <h3>
-            Manage and Administer the Elastic Stack
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <EuiFlexItem
-            component="div"
-            grow={true}
-            key="index_patterns"
-            style={
-              Object {
-                "minHeight": 64,
-              }
-            }
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Manage and Administer the Elastic Stack
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
           >
-            <Synopsis
-              description="Manage the index patterns that help retrieve your data from Elasticsearch."
-              iconType="indexPatternApp"
-              isBeta={false}
-              title="Index Patterns"
-              url="base_path/index_management_landing_page"
-            />
-          </EuiFlexItem>
-        </EuiFlexGrid>
-      </EuiPanel>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="center"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+            <EuiFlexItem
+              component="div"
+              grow={true}
+              key="index_patterns"
+              style={
+                Object {
+                  "minHeight": 64,
+                }
+              }
+            >
+              <Synopsis
+                description="Manage the index patterns that help retrieve your data from Elasticsearch."
+                iconType="indexPatternApp"
+                isBeta={false}
+                title="Index Patterns"
+                url="base_path/index_management_landing_page"
+              />
+            </EuiFlexItem>
+          </EuiFlexGrid>
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={false}
+      direction="row"
+      gutterSize="l"
+      justifyContent="center"
+      responsive={true}
+      wrap={false}
     >
-      <EuiText
-        grow={true}
-      >
-        <p>
-          Didn’t find what you were looking for?
-        </p>
-      </EuiText>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiButton
-        color="primary"
-        fill={false}
-        href="#/home/feature_directory"
-        iconSide="left"
-        type="button"
+      <EuiFlexItem
+        component="div"
+        grow={false}
       >
-        View full directory of Kibana plugins
-      </EuiButton>
-    </EuiFlexItem>
-  </EuiFlexGroup>
+        <EuiText
+          grow={true}
+        >
+          <p>
+            Didn’t find what you were looking for?
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="s"
+        />
+        <EuiButton
+          color="primary"
+          fill={false}
+          href="#/home/feature_directory"
+          iconSide="left"
+          type="button"
+        >
+          View full directory of Kibana plugins
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiPageBody>
 </EuiPage>
 `;
 
@@ -246,128 +250,130 @@ exports[`directories should render DATA directory entry in "Explore Data" panel
   className="home"
   restrictWidth={false}
 >
-  <AddData
-    apmUiEnabled={true}
-  />
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="flexStart"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+  <EuiPageBody>
+    <AddData
+      apmUiEnabled={true}
+    />
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={true}
+      direction="row"
+      gutterSize="l"
+      justifyContent="flexStart"
+      responsive={true}
+      wrap={false}
     >
-      <EuiPanel
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Visualize and Explore Data
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        >
-          <EuiFlexItem
-            component="div"
-            grow={true}
-            key="dashboard"
-            style={
-              Object {
-                "minHeight": 64,
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Visualize and Explore Data
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          >
+            <EuiFlexItem
+              component="div"
+              grow={true}
+              key="dashboard"
+              style={
+                Object {
+                  "minHeight": 64,
+                }
               }
-            }
+            >
+              <Synopsis
+                description="Display and share a collection of visualizations and saved searches."
+                iconType="dashboardApp"
+                isBeta={false}
+                title="Dashboard"
+                url="base_path/dashboard_landing_page"
+              />
+            </EuiFlexItem>
+          </EuiFlexGrid>
+        </EuiPanel>
+      </EuiFlexItem>
+      <EuiFlexItem
+        component="div"
+        grow={true}
+      >
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
+        >
+          <EuiTitle
+            size="m"
           >
-            <Synopsis
-              description="Display and share a collection of visualizations and saved searches."
-              iconType="dashboardApp"
-              isBeta={false}
-              title="Dashboard"
-              url="base_path/dashboard_landing_page"
-            />
-          </EuiFlexItem>
-        </EuiFlexGrid>
-      </EuiPanel>
-    </EuiFlexItem>
-    <EuiFlexItem
+            <h3>
+              Manage and Administer the Elastic Stack
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={true}
+      direction="row"
+      gutterSize="l"
+      justifyContent="center"
+      responsive={true}
+      wrap={false}
     >
-      <EuiPanel
-        grow={true}
-        hasShadow={false}
-        paddingSize="l"
+      <EuiFlexItem
+        component="div"
+        grow={false}
       >
-        <EuiTitle
-          size="m"
+        <EuiText
+          grow={true}
         >
-          <h3>
-            Manage and Administer the Elastic Stack
-          </h3>
-        </EuiTitle>
+          <p>
+            Didn’t find what you were looking for?
+          </p>
+        </EuiText>
         <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
+          size="s"
         />
-      </EuiPanel>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="center"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
-      component="div"
-      grow={false}
-    >
-      <EuiText
-        grow={true}
-      >
-        <p>
-          Didn’t find what you were looking for?
-        </p>
-      </EuiText>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiButton
-        color="primary"
-        fill={false}
-        href="#/home/feature_directory"
-        iconSide="left"
-        type="button"
-      >
-        View full directory of Kibana plugins
-      </EuiButton>
-    </EuiFlexItem>
-  </EuiFlexGroup>
+        <EuiButton
+          color="primary"
+          fill={false}
+          href="#/home/feature_directory"
+          iconSide="left"
+          type="button"
+        >
+          View full directory of Kibana plugins
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiPageBody>
 </EuiPage>
 `;
 
@@ -376,109 +382,111 @@ exports[`should not contain RecentlyAccessed panel when there is no recentlyAcce
   className="home"
   restrictWidth={false}
 >
-  <AddData
-    apmUiEnabled={true}
-  />
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="flexStart"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+  <EuiPageBody>
+    <AddData
+      apmUiEnabled={true}
+    />
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={true}
+      direction="row"
+      gutterSize="l"
+      justifyContent="flexStart"
+      responsive={true}
+      wrap={false}
     >
-      <EuiPanel
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Visualize and Explore Data
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-    <EuiFlexItem
-      component="div"
-      grow={true}
-    >
-      <EuiPanel
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Visualize and Explore Data
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Manage and Administer the Elastic Stack
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="center"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Manage and Administer the Elastic Stack
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={false}
+      direction="row"
+      gutterSize="l"
+      justifyContent="center"
+      responsive={true}
+      wrap={false}
     >
-      <EuiText
-        grow={true}
+      <EuiFlexItem
+        component="div"
+        grow={false}
       >
-        <p>
-          Didn’t find what you were looking for?
-        </p>
-      </EuiText>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiButton
-        color="primary"
-        fill={false}
-        href="#/home/feature_directory"
-        iconSide="left"
-        type="button"
-      >
-        View full directory of Kibana plugins
-      </EuiButton>
-    </EuiFlexItem>
-  </EuiFlexGroup>
+        <EuiText
+          grow={true}
+        >
+          <p>
+            Didn’t find what you were looking for?
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="s"
+        />
+        <EuiButton
+          color="primary"
+          fill={false}
+          href="#/home/feature_directory"
+          iconSide="left"
+          type="button"
+        >
+          View full directory of Kibana plugins
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiPageBody>
 </EuiPage>
 `;
 
@@ -487,124 +495,126 @@ exports[`should render home component 1`] = `
   className="home"
   restrictWidth={false}
 >
-  <React.Fragment>
-    <RecentlyAccessed
-      recentlyAccessed={
-        Array [
-          Object {
-            "id": "1",
-            "label": "my vis",
-            "link": "link_to_my_vis",
-          },
-        ]
-      }
+  <EuiPageBody>
+    <React.Fragment>
+      <RecentlyAccessed
+        recentlyAccessed={
+          Array [
+            Object {
+              "id": "1",
+              "label": "my vis",
+              "link": "link_to_my_vis",
+            },
+          ]
+        }
+      />
+      <EuiSpacer
+        size="l"
+      />
+    </React.Fragment>
+    <AddData
+      apmUiEnabled={true}
     />
     <EuiSpacer
       size="l"
     />
-  </React.Fragment>
-  <AddData
-    apmUiEnabled={true}
-  />
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="flexStart"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={true}
+      direction="row"
+      gutterSize="l"
+      justifyContent="flexStart"
+      responsive={true}
+      wrap={false}
     >
-      <EuiPanel
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Visualize and Explore Data
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-    <EuiFlexItem
-      component="div"
-      grow={true}
-    >
-      <EuiPanel
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Visualize and Explore Data
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+      <EuiFlexItem
+        component="div"
         grow={true}
-        hasShadow={false}
-        paddingSize="l"
       >
-        <EuiTitle
-          size="m"
+        <EuiPanel
+          grow={true}
+          hasShadow={false}
+          paddingSize="l"
         >
-          <h3>
-            Manage and Administer the Elastic Stack
-          </h3>
-        </EuiTitle>
-        <EuiSpacer
-          size="m"
-        />
-        <EuiFlexGrid
-          columns={2}
-          gutterSize="l"
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="l"
-  />
-  <EuiFlexGroup
-    alignItems="stretch"
-    component="div"
-    direction="row"
-    gutterSize="l"
-    justifyContent="center"
-    responsive={true}
-    wrap={false}
-  >
-    <EuiFlexItem
+          <EuiTitle
+            size="m"
+          >
+            <h3>
+              Manage and Administer the Elastic Stack
+            </h3>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
+          />
+          <EuiFlexGrid
+            columns={2}
+            gutterSize="l"
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiSpacer
+      size="l"
+    />
+    <EuiFlexGroup
+      alignItems="stretch"
       component="div"
-      grow={false}
+      direction="row"
+      gutterSize="l"
+      justifyContent="center"
+      responsive={true}
+      wrap={false}
     >
-      <EuiText
-        grow={true}
+      <EuiFlexItem
+        component="div"
+        grow={false}
       >
-        <p>
-          Didn’t find what you were looking for?
-        </p>
-      </EuiText>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiButton
-        color="primary"
-        fill={false}
-        href="#/home/feature_directory"
-        iconSide="left"
-        type="button"
-      >
-        View full directory of Kibana plugins
-      </EuiButton>
-    </EuiFlexItem>
-  </EuiFlexGroup>
+        <EuiText
+          grow={true}
+        >
+          <p>
+            Didn’t find what you were looking for?
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="s"
+        />
+        <EuiButton
+          color="primary"
+          fill={false}
+          href="#/home/feature_directory"
+          iconSide="left"
+          type="button"
+        >
+          View full directory of Kibana plugins
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiPageBody>
 </EuiPage>
 `;
diff --git a/src/core_plugins/kibana/public/home/components/feature_directory.js b/src/core_plugins/kibana/public/home/components/feature_directory.js
index 6a17cd7257898..fff2c58659ef6 100644
--- a/src/core_plugins/kibana/public/home/components/feature_directory.js
+++ b/src/core_plugins/kibana/public/home/components/feature_directory.js
@@ -26,6 +26,7 @@ import {
   EuiFlexItem,
   EuiFlexGrid,
   EuiPage,
+  EuiPageBody,
   EuiTitle,
   EuiSpacer,
 } from '@elastic/eui';
@@ -114,19 +115,21 @@ export class FeatureDirectory extends React.Component {
   render() {
     return (
       <EuiPage className="home">
-        <EuiTitle size="l">
-          <h1>
-            Directory
-          </h1>
-        </EuiTitle>
-        <EuiSpacer size="m" />
-        <EuiTabs className="homeDirectoryTabs">
-          {this.renderTabs()}
-        </EuiTabs>
-        <EuiSpacer />
-        <EuiFlexGrid columns={4}>
-          { this.renderDirectories() }
-        </EuiFlexGrid>
+        <EuiPageBody>
+          <EuiTitle size="l">
+            <h1>
+              Directory
+            </h1>
+          </EuiTitle>
+          <EuiSpacer size="m" />
+          <EuiTabs className="homeDirectoryTabs">
+            {this.renderTabs()}
+          </EuiTabs>
+          <EuiSpacer />
+          <EuiFlexGrid columns={4}>
+            { this.renderDirectories() }
+          </EuiFlexGrid>
+        </EuiPageBody>
       </EuiPage>
     );
   }
diff --git a/src/core_plugins/kibana/public/home/components/home.js b/src/core_plugins/kibana/public/home/components/home.js
index 7e98a23129002..3c04da08cb524 100644
--- a/src/core_plugins/kibana/public/home/components/home.js
+++ b/src/core_plugins/kibana/public/home/components/home.js
@@ -33,6 +33,7 @@ import {
   EuiFlexItem,
   EuiFlexGrid,
   EuiText,
+  EuiPageBody,
 } from '@elastic/eui';
 
 import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
@@ -72,62 +73,63 @@ export function Home({ addBasePath, directories, apmUiEnabled, recentlyAccessed
 
   return (
     <EuiPage className="home">
+      <EuiPageBody>
 
-      {recentlyAccessedPanel}
+        {recentlyAccessedPanel}
 
-      <AddData
-        apmUiEnabled={apmUiEnabled}
-      />
-
-      <EuiSpacer size="l" />
+        <AddData
+          apmUiEnabled={apmUiEnabled}
+        />
 
-      <EuiFlexGroup>
-        <EuiFlexItem>
-          <EuiPanel paddingSize="l">
-            <EuiTitle>
-              <h3>
-                Visualize and Explore Data
-              </h3>
-            </EuiTitle>
-            <EuiSpacer size="m"/>
-            <EuiFlexGrid columns={2}>
-              { renderDirectories(FeatureCatalogueCategory.DATA) }
-            </EuiFlexGrid>
-          </EuiPanel>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiPanel paddingSize="l">
-            <EuiTitle>
-              <h3>
-                Manage and Administer the Elastic Stack
-              </h3>
-            </EuiTitle>
-            <EuiSpacer size="m"/>
-            <EuiFlexGrid columns={2}>
-              { renderDirectories(FeatureCatalogueCategory.ADMIN) }
-            </EuiFlexGrid>
-          </EuiPanel>
-        </EuiFlexItem>
-      </EuiFlexGroup>
+        <EuiSpacer size="l" />
 
-      <EuiSpacer size="l" />
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiPanel paddingSize="l">
+              <EuiTitle>
+                <h3>
+                  Visualize and Explore Data
+                </h3>
+              </EuiTitle>
+              <EuiSpacer size="m"/>
+              <EuiFlexGrid columns={2}>
+                { renderDirectories(FeatureCatalogueCategory.DATA) }
+              </EuiFlexGrid>
+            </EuiPanel>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiPanel paddingSize="l">
+              <EuiTitle>
+                <h3>
+                  Manage and Administer the Elastic Stack
+                </h3>
+              </EuiTitle>
+              <EuiSpacer size="m"/>
+              <EuiFlexGrid columns={2}>
+                { renderDirectories(FeatureCatalogueCategory.ADMIN) }
+              </EuiFlexGrid>
+            </EuiPanel>
+          </EuiFlexItem>
+        </EuiFlexGroup>
 
-      <EuiFlexGroup justifyContent="center">
-        <EuiFlexItem grow={false}>
-          <EuiText>
-            <p>
-              Didn’t find what you were looking for?
-            </p>
-          </EuiText>
-          <EuiSpacer size="s" />
-          <EuiButton
-            href="#/home/feature_directory"
-          >
-            View full directory of Kibana plugins
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
+        <EuiSpacer size="l" />
 
+        <EuiFlexGroup justifyContent="center">
+          <EuiFlexItem grow={false}>
+            <EuiText>
+              <p>
+                Didn’t find what you were looking for?
+              </p>
+            </EuiText>
+            <EuiSpacer size="s" />
+            <EuiButton
+              href="#/home/feature_directory"
+            >
+              View full directory of Kibana plugins
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPageBody>
     </EuiPage>
   );
 }
diff --git a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
index 80d6494c65309..7021cf5eca7f5 100644
--- a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
+++ b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
@@ -5,68 +5,72 @@ exports[`isCloudEnabled is false should not render instruction toggle when ON_PR
   className="home"
   restrictWidth={false}
 >
-  <EuiLink
-    color="primary"
-    href="#/home"
-    type="button"
-  >
-    Home
-  </EuiLink>
-   / 
-  <EuiLink
-    color="primary"
-    href="#/home/tutorial_directory"
-    type="button"
-  >
-    Add Data
-  </EuiLink>
-  <EuiSpacer
-    size="s"
-  />
-  <div>
-    <Introduction
-      description="tutorial used to drive jest tests"
-      isBeta={false}
-      title="jest test tutorial"
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <div
-      className="text-center"
-    />
+  <EuiPageBody>
+    <div>
+      <EuiLink
+        color="primary"
+        href="#/home"
+        type="button"
+      >
+        Home
+      </EuiLink>
+       / 
+      <EuiLink
+        color="primary"
+        href="#/home/tutorial_directory"
+        type="button"
+      >
+        Add Data
+      </EuiLink>
+    </div>
     <EuiSpacer
-      size="l"
+      size="s"
     />
-    <EuiPanel
-      grow={true}
-      hasShadow={false}
-      paddingSize="l"
-    >
-      <InstructionSet
-        instructionVariants={
-          Array [
-            Object {
-              "id": "platform id",
-              "instructions": Array [
-                Object {
-                  "title": "onPrem instructions",
-                },
-              ],
-            },
-          ]
-        }
-        key="0"
-        offset={1}
-        onStatusCheck={[Function]}
-        paramValues={Object {}}
-        replaceTemplateStrings={[Function]}
-        setParameter={[Function]}
-        statusCheckState="NOT_CHECKED"
-        title="Instruction title"
+    <div>
+      <Introduction
+        description="tutorial used to drive jest tests"
+        isBeta={false}
+        title="jest test tutorial"
+      />
+      <EuiSpacer
+        size="l"
+      />
+      <div
+        className="text-center"
       />
-    </EuiPanel>
-  </div>
+      <EuiSpacer
+        size="l"
+      />
+      <EuiPanel
+        grow={true}
+        hasShadow={false}
+        paddingSize="l"
+      >
+        <InstructionSet
+          instructionVariants={
+            Array [
+              Object {
+                "id": "platform id",
+                "instructions": Array [
+                  Object {
+                    "title": "onPrem instructions",
+                  },
+                ],
+              },
+            ]
+          }
+          key="0"
+          offset={1}
+          onStatusCheck={[Function]}
+          paramValues={Object {}}
+          replaceTemplateStrings={[Function]}
+          setParameter={[Function]}
+          statusCheckState="NOT_CHECKED"
+          title="Instruction title"
+        />
+      </EuiPanel>
+    </div>
+  </EuiPageBody>
 </EuiPage>
 `;
 
@@ -75,87 +79,91 @@ exports[`isCloudEnabled is false should render ON_PREM instructions with instruc
   className="home"
   restrictWidth={false}
 >
-  <EuiLink
-    color="primary"
-    href="#/home"
-    type="button"
-  >
-    Home
-  </EuiLink>
-   / 
-  <EuiLink
-    color="primary"
-    href="#/home/tutorial_directory"
-    type="button"
-  >
-    Add Data
-  </EuiLink>
-  <EuiSpacer
-    size="s"
-  />
-  <div>
-    <Introduction
-      description="tutorial used to drive jest tests"
-      iconType="logoApache"
-      isBeta={false}
-      title="jest test tutorial"
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <div
-      className="text-center"
-    >
-      <RadioButtonGroup
-        buttons={
-          Array [
-            Object {
-              "dataTestSubj": "onPremBtn",
-              "label": "Self managed",
-              "onClick": [Function],
-            },
-            Object {
-              "dataTestSubj": "onPremElasticCloudBtn",
-              "label": "Elastic Cloud",
-              "onClick": [Function],
-            },
-          ]
-        }
-        selectedBtnLabel="Self managed"
-      />
+  <EuiPageBody>
+    <div>
+      <EuiLink
+        color="primary"
+        href="#/home"
+        type="button"
+      >
+        Home
+      </EuiLink>
+       / 
+      <EuiLink
+        color="primary"
+        href="#/home/tutorial_directory"
+        type="button"
+      >
+        Add Data
+      </EuiLink>
     </div>
     <EuiSpacer
-      size="l"
+      size="s"
     />
-    <EuiPanel
-      grow={true}
-      hasShadow={false}
-      paddingSize="l"
-    >
-      <InstructionSet
-        instructionVariants={
-          Array [
-            Object {
-              "id": "platform id",
-              "instructions": Array [
-                Object {
-                  "title": "onPrem instructions",
-                },
-              ],
-            },
-          ]
-        }
-        key="0"
-        offset={1}
-        onStatusCheck={[Function]}
-        paramValues={Object {}}
-        replaceTemplateStrings={[Function]}
-        setParameter={[Function]}
-        statusCheckState="NOT_CHECKED"
-        title="Instruction title"
+    <div>
+      <Introduction
+        description="tutorial used to drive jest tests"
+        iconType="logoApache"
+        isBeta={false}
+        title="jest test tutorial"
       />
-    </EuiPanel>
-  </div>
+      <EuiSpacer
+        size="l"
+      />
+      <div
+        className="text-center"
+      >
+        <RadioButtonGroup
+          buttons={
+            Array [
+              Object {
+                "dataTestSubj": "onPremBtn",
+                "label": "Self managed",
+                "onClick": [Function],
+              },
+              Object {
+                "dataTestSubj": "onPremElasticCloudBtn",
+                "label": "Elastic Cloud",
+                "onClick": [Function],
+              },
+            ]
+          }
+          selectedBtnLabel="Self managed"
+        />
+      </div>
+      <EuiSpacer
+        size="l"
+      />
+      <EuiPanel
+        grow={true}
+        hasShadow={false}
+        paddingSize="l"
+      >
+        <InstructionSet
+          instructionVariants={
+            Array [
+              Object {
+                "id": "platform id",
+                "instructions": Array [
+                  Object {
+                    "title": "onPrem instructions",
+                  },
+                ],
+              },
+            ]
+          }
+          key="0"
+          offset={1}
+          onStatusCheck={[Function]}
+          paramValues={Object {}}
+          replaceTemplateStrings={[Function]}
+          setParameter={[Function]}
+          statusCheckState="NOT_CHECKED"
+          title="Instruction title"
+        />
+      </EuiPanel>
+    </div>
+  </EuiPageBody>
 </EuiPage>
 `;
 
@@ -164,68 +172,72 @@ exports[`should render ELASTIC_CLOUD instructions when isCloudEnabled is true 1`
   className="home"
   restrictWidth={false}
 >
-  <EuiLink
-    color="primary"
-    href="#/home"
-    type="button"
-  >
-    Home
-  </EuiLink>
-   / 
-  <EuiLink
-    color="primary"
-    href="#/home/tutorial_directory"
-    type="button"
-  >
-    Add Data
-  </EuiLink>
-  <EuiSpacer
-    size="s"
-  />
-  <div>
-    <Introduction
-      description="tutorial used to drive jest tests"
-      iconType="logoApache"
-      isBeta={false}
-      title="jest test tutorial"
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <div
-      className="text-center"
-    />
+  <EuiPageBody>
+    <div>
+      <EuiLink
+        color="primary"
+        href="#/home"
+        type="button"
+      >
+        Home
+      </EuiLink>
+       / 
+      <EuiLink
+        color="primary"
+        href="#/home/tutorial_directory"
+        type="button"
+      >
+        Add Data
+      </EuiLink>
+    </div>
     <EuiSpacer
-      size="l"
+      size="s"
     />
-    <EuiPanel
-      grow={true}
-      hasShadow={false}
-      paddingSize="l"
-    >
-      <InstructionSet
-        instructionVariants={
-          Array [
-            Object {
-              "id": "platform id",
-              "instructions": Array [
-                Object {
-                  "title": "elasticCloud instructions",
-                },
-              ],
-            },
-          ]
-        }
-        key="0"
-        offset={1}
-        onStatusCheck={[Function]}
-        paramValues={Object {}}
-        replaceTemplateStrings={[Function]}
-        setParameter={[Function]}
-        statusCheckState="NOT_CHECKED"
-        title="Instruction title"
+    <div>
+      <Introduction
+        description="tutorial used to drive jest tests"
+        iconType="logoApache"
+        isBeta={false}
+        title="jest test tutorial"
+      />
+      <EuiSpacer
+        size="l"
       />
-    </EuiPanel>
-  </div>
+      <div
+        className="text-center"
+      />
+      <EuiSpacer
+        size="l"
+      />
+      <EuiPanel
+        grow={true}
+        hasShadow={false}
+        paddingSize="l"
+      >
+        <InstructionSet
+          instructionVariants={
+            Array [
+              Object {
+                "id": "platform id",
+                "instructions": Array [
+                  Object {
+                    "title": "elasticCloud instructions",
+                  },
+                ],
+              },
+            ]
+          }
+          key="0"
+          offset={1}
+          onStatusCheck={[Function]}
+          paramValues={Object {}}
+          replaceTemplateStrings={[Function]}
+          setParameter={[Function]}
+          statusCheckState="NOT_CHECKED"
+          title="Instruction title"
+        />
+      </EuiPanel>
+    </div>
+  </EuiPageBody>
 </EuiPage>
 `;
diff --git a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js
index 6f64536e61b2a..2daf164a75b58 100644
--- a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js
+++ b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.js
@@ -25,7 +25,7 @@ import { Footer } from './footer';
 import { Introduction } from './introduction';
 import { InstructionSet } from './instruction_set';
 import { RadioButtonGroup } from './radio_button_group';
-import { EuiSpacer, EuiPage, EuiPanel, EuiLink, EuiText } from '@elastic/eui';
+import { EuiSpacer, EuiPage, EuiPanel, EuiLink, EuiText, EuiPageBody } from '@elastic/eui';
 import * as StatusCheckStates from './status_check_states';
 
 const INSTRUCTIONS_TYPE = {
@@ -313,10 +313,15 @@ export class Tutorial extends React.Component {
     }
     return (
       <EuiPage className="home">
+        <EuiPageBody>
 
-        <EuiLink href="#/home">Home</EuiLink> / <EuiLink href="#/home/tutorial_directory">Add Data</EuiLink>
-        <EuiSpacer size="s" />
-        {content}
+          <div>
+            <EuiLink href="#/home">Home</EuiLink> / <EuiLink href="#/home/tutorial_directory">Add Data</EuiLink>
+          </div>
+          <EuiSpacer size="s" />
+          {content}
+
+        </EuiPageBody>
       </EuiPage>
     );
   }
diff --git a/src/core_plugins/kibana/public/home/components/tutorial_directory.js b/src/core_plugins/kibana/public/home/components/tutorial_directory.js
index b2af4f70fe07d..39562910c192d 100644
--- a/src/core_plugins/kibana/public/home/components/tutorial_directory.js
+++ b/src/core_plugins/kibana/public/home/components/tutorial_directory.js
@@ -31,6 +31,7 @@ import {
   EuiFlexGrid,
   EuiSpacer,
   EuiTitle,
+  EuiPageBody,
 } from '@elastic/eui';
 
 
@@ -213,25 +214,27 @@ export class TutorialDirectory extends React.Component {
   render() {
     return (
       <EuiPage className="home">
-
-        <a className="kuiLink" href="#/home">Home</a>
-        <EuiSpacer size="s" />
-        <EuiTitle size="l">
-          <h1>
-            Add Data to Kibana
-          </h1>
-        </EuiTitle>
-
-        <EuiSpacer size="m" />
-
-        <EuiTabs>
-          {this.renderTabs()}
-        </EuiTabs>
-        <EuiSpacer />
-        <EuiFlexGrid columns={4}>
-          { this.renderTab() }
-        </EuiFlexGrid>
-
+        <EuiPageBody>
+
+          <a className="kuiLink" href="#/home">Home</a>
+          <EuiSpacer size="s" />
+          <EuiTitle size="l">
+            <h1>
+              Add Data to Kibana
+            </h1>
+          </EuiTitle>
+
+          <EuiSpacer size="m" />
+
+          <EuiTabs>
+            {this.renderTabs()}
+          </EuiTabs>
+          <EuiSpacer />
+          <EuiFlexGrid columns={4}>
+            { this.renderTab() }
+          </EuiFlexGrid>
+
+        </EuiPageBody>
       </EuiPage>
     );
   }
diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__tests__/__snapshots__/objects_table.test.js.snap b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__tests__/__snapshots__/objects_table.test.js.snap
index 991f4df6abf8f..6aa2b555ad47d 100644
--- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__tests__/__snapshots__/objects_table.test.js.snap
+++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__tests__/__snapshots__/objects_table.test.js.snap
@@ -126,99 +126,101 @@ exports[`ObjectsTable should render normally 1`] = `
 <EuiPage
   restrictWidth={false}
 >
-  <EuiPageContent
-    horizontalPosition="center"
-    panelPaddingSize="l"
-    style={
-      Object {
-        "marginBottom": 16,
-        "marginTop": 16,
-        "maxWidth": 1000,
-      }
-    }
-    verticalPosition="center"
-  >
-    <Header
-      onExportAll={[Function]}
-      onImport={[Function]}
-      onRefresh={[Function]}
-      totalCount={4}
-    />
-    <EuiSpacer
-      size="xs"
-    />
-    <Table
-      filterOptions={
-        Array [
-          Object {
-            "name": "index-pattern",
-            "value": "index-pattern",
-            "view": "index-pattern (0)",
-          },
-          Object {
-            "name": "visualization",
-            "value": "visualization",
-            "view": "visualization (0)",
-          },
-          Object {
-            "name": "dashboard",
-            "value": "dashboard",
-            "view": "dashboard (0)",
-          },
-          Object {
-            "name": "search",
-            "value": "search",
-            "view": "search (0)",
-          },
-        ]
-      }
-      getEditUrl={[Function]}
-      goInApp={[Function]}
-      isSearching={false}
-      itemId="id"
-      items={
-        Array [
-          Object {
-            "icon": "indexPatternApp",
-            "id": "1",
-            "title": "MyIndexPattern*",
-            "type": "index-pattern",
-          },
-          Object {
-            "icon": "search",
-            "id": "2",
-            "title": "MySearch",
-            "type": "search",
-          },
-          Object {
-            "icon": "dashboardApp",
-            "id": "3",
-            "title": "MyDashboard",
-            "type": "dashboard",
-          },
-          Object {
-            "icon": "visualizeApp",
-            "id": "4",
-            "title": "MyViz",
-            "type": "visualization",
-          },
-        ]
-      }
-      onDelete={[Function]}
-      onExport={[Function]}
-      onQueryChange={[Function]}
-      onShowRelationships={[Function]}
-      onTableChange={[Function]}
-      pageIndex={0}
-      pageSize={15}
-      selectedSavedObjects={Array []}
-      selectionConfig={
+  <EuiPageBody>
+    <EuiPageContent
+      horizontalPosition="center"
+      panelPaddingSize="l"
+      style={
         Object {
-          "onSelectionChange": [Function],
+          "marginBottom": 16,
+          "marginTop": 16,
+          "maxWidth": 1000,
         }
       }
-      totalItemCount={4}
-    />
-  </EuiPageContent>
+      verticalPosition="center"
+    >
+      <Header
+        onExportAll={[Function]}
+        onImport={[Function]}
+        onRefresh={[Function]}
+        totalCount={4}
+      />
+      <EuiSpacer
+        size="xs"
+      />
+      <Table
+        filterOptions={
+          Array [
+            Object {
+              "name": "index-pattern",
+              "value": "index-pattern",
+              "view": "index-pattern (0)",
+            },
+            Object {
+              "name": "visualization",
+              "value": "visualization",
+              "view": "visualization (0)",
+            },
+            Object {
+              "name": "dashboard",
+              "value": "dashboard",
+              "view": "dashboard (0)",
+            },
+            Object {
+              "name": "search",
+              "value": "search",
+              "view": "search (0)",
+            },
+          ]
+        }
+        getEditUrl={[Function]}
+        goInApp={[Function]}
+        isSearching={false}
+        itemId="id"
+        items={
+          Array [
+            Object {
+              "icon": "indexPatternApp",
+              "id": "1",
+              "title": "MyIndexPattern*",
+              "type": "index-pattern",
+            },
+            Object {
+              "icon": "search",
+              "id": "2",
+              "title": "MySearch",
+              "type": "search",
+            },
+            Object {
+              "icon": "dashboardApp",
+              "id": "3",
+              "title": "MyDashboard",
+              "type": "dashboard",
+            },
+            Object {
+              "icon": "visualizeApp",
+              "id": "4",
+              "title": "MyViz",
+              "type": "visualization",
+            },
+          ]
+        }
+        onDelete={[Function]}
+        onExport={[Function]}
+        onQueryChange={[Function]}
+        onShowRelationships={[Function]}
+        onTableChange={[Function]}
+        pageIndex={0}
+        pageSize={15}
+        selectedSavedObjects={Array []}
+        selectionConfig={
+          Object {
+            "onSelectionChange": [Function],
+          }
+        }
+        totalItemCount={4}
+      />
+    </EuiPageContent>
+  </EuiPageBody>
 </EuiPage>
 `;
diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js
index c0d0c2980ff50..5de64332c8e2a 100644
--- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js
+++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js
@@ -37,6 +37,7 @@ import {
   EuiToolTip,
   EuiPage,
   EuiPageContent,
+  EuiPageBody,
 } from '@elastic/eui';
 import {
   retrieveAndExportDocs,
@@ -467,39 +468,41 @@ export class ObjectsTable extends Component {
 
     return (
       <EuiPage>
-        <EuiPageContent verticalPosition="center" horizontalPosition="center" style={{ maxWidth: 1000, marginTop: 16, marginBottom: 16 }}>
-          {this.renderFlyout()}
-          {this.renderRelationships()}
-          {this.renderDeleteConfirmModal()}
-          {this.renderExportAllOptionsModal()}
-          <Header
-            onExportAll={() =>
-              this.setState({ isShowingExportAllOptionsModal: true })
-            }
-            onImport={this.showImportFlyout}
-            onRefresh={this.refreshData}
-            totalCount={totalItemCount}
-          />
-          <EuiSpacer size="xs" />
-          <Table
-            itemId={'id'}
-            selectionConfig={selectionConfig}
-            selectedSavedObjects={selectedSavedObjects}
-            onQueryChange={this.onQueryChange}
-            onTableChange={this.onTableChange}
-            filterOptions={filterOptions}
-            onExport={this.onExport}
-            onDelete={this.onDelete}
-            getEditUrl={this.props.getEditUrl}
-            goInApp={this.props.goInApp}
-            pageIndex={page}
-            pageSize={perPage}
-            items={savedObjects}
-            totalItemCount={totalItemCount}
-            isSearching={isSearching}
-            onShowRelationships={this.onShowRelationships}
-          />
-        </EuiPageContent>
+        <EuiPageBody>
+          <EuiPageContent verticalPosition="center" horizontalPosition="center" style={{ maxWidth: 1000, marginTop: 16, marginBottom: 16 }}>
+            {this.renderFlyout()}
+            {this.renderRelationships()}
+            {this.renderDeleteConfirmModal()}
+            {this.renderExportAllOptionsModal()}
+            <Header
+              onExportAll={() =>
+                this.setState({ isShowingExportAllOptionsModal: true })
+              }
+              onImport={this.showImportFlyout}
+              onRefresh={this.refreshData}
+              totalCount={totalItemCount}
+            />
+            <EuiSpacer size="xs" />
+            <Table
+              itemId={'id'}
+              selectionConfig={selectionConfig}
+              selectedSavedObjects={selectedSavedObjects}
+              onQueryChange={this.onQueryChange}
+              onTableChange={this.onTableChange}
+              filterOptions={filterOptions}
+              onExport={this.onExport}
+              onDelete={this.onDelete}
+              getEditUrl={this.props.getEditUrl}
+              goInApp={this.props.goInApp}
+              pageIndex={page}
+              pageSize={perPage}
+              items={savedObjects}
+              totalItemCount={totalItemCount}
+              isSearching={isSearching}
+              onShowRelationships={this.onShowRelationships}
+            />
+          </EuiPageContent>
+        </EuiPageBody>
       </EuiPage>
     );
   }
diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js b/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js
index 056c7b8ad60d0..69005e262c077 100644
--- a/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js
+++ b/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js
@@ -31,7 +31,8 @@ import {
   EuiTableRowCell,
   EuiTableRowCellCheckbox,
   EuiTitle,
-  EuiText
+  EuiText,
+  EuiPageBody
 } from '@elastic/eui';
 
 import { IndexActionsContextMenu } from '../../components';
@@ -214,78 +215,80 @@ export class IndexTable extends Component {
 
     return (
       <EuiPage>
-        <EuiFlexGroup justifyContent="spaceBetween" alignItems="flexEnd">
-          <EuiFlexItem grow={false}>
-            <EuiTitle size="l">
-              <h1>Index management</h1>
-            </EuiTitle>
-            <EuiSpacer size="s" />
-            <EuiText>
-              <p>Update your Elasticsearch indices individually or in bulk</p>
-            </EuiText>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiSwitch
-              id="checkboxShowSystemIndices"
-              checked={showSystemIndices}
-              onChange={event => showSystemIndicesChanged(event.target.checked)}
-              label="Include system indices"
-            />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiSpacer />
-        <EuiFlexGroup gutterSize="l" alignItems="center">
-          {atLeastOneItemSelected ? (
+        <EuiPageBody>
+          <EuiFlexGroup justifyContent="spaceBetween" alignItems="flexEnd">
             <EuiFlexItem grow={false}>
-              <Route
-                key="menu"
-                render={() => (
-                  <IndexActionsContextMenu
-                    indexNames={Object.keys(selectedIndicesMap)}
-                    resetSelection={() => {
-                      this.setState({ selectedIndicesMap: {} });
-                    }}
-                  />
-                )}
+              <EuiTitle size="l">
+                <h1>Index management</h1>
+              </EuiTitle>
+              <EuiSpacer size="s" />
+              <EuiText>
+                <p>Update your Elasticsearch indices individually or in bulk</p>
+              </EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiSwitch
+                id="checkboxShowSystemIndices"
+                checked={showSystemIndices}
+                onChange={event => showSystemIndicesChanged(event.target.checked)}
+                label="Include system indices"
               />
             </EuiFlexItem>
-          ) : null}
-          <EuiFlexItem>
-            <EuiFieldSearch
-              fullWidth
-              value={filter}
-              onChange={event => {
-                filterChanged(event.target.value);
-              }}
-              data-test-subj="indexTableFilterInput"
-              placeholder="Search"
-              aria-label="Search indices"
-            />
-          </EuiFlexItem>
-        </EuiFlexGroup>
+          </EuiFlexGroup>
+          <EuiSpacer />
+          <EuiFlexGroup gutterSize="l" alignItems="center">
+            {atLeastOneItemSelected ? (
+              <EuiFlexItem grow={false}>
+                <Route
+                  key="menu"
+                  render={() => (
+                    <IndexActionsContextMenu
+                      indexNames={Object.keys(selectedIndicesMap)}
+                      resetSelection={() => {
+                        this.setState({ selectedIndicesMap: {} });
+                      }}
+                    />
+                  )}
+                />
+              </EuiFlexItem>
+            ) : null}
+            <EuiFlexItem>
+              <EuiFieldSearch
+                fullWidth
+                value={filter}
+                onChange={event => {
+                  filterChanged(event.target.value);
+                }}
+                data-test-subj="indexTableFilterInput"
+                placeholder="Search"
+                aria-label="Search indices"
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
 
-        <EuiSpacer size="m" />
+          <EuiSpacer size="m" />
 
-        {indices.length > 0 ? (
-          <EuiTable>
-            <EuiTableHeader>
-              <EuiTableHeaderCellCheckbox>
-                <EuiCheckbox
-                  id="selectAllIndexes"
-                  checked={this.areAllItemsSelected()}
-                  onChange={this.toggleAll}
-                  type="inList"
-                />
-              </EuiTableHeaderCellCheckbox>
-              {this.buildHeader()}
-            </EuiTableHeader>
-            <EuiTableBody>{this.buildRows()}</EuiTableBody>
-          </EuiTable>
-        ) : (
-          <NoMatch />
-        )}
-        <EuiSpacer size="m" />
-        {indices.length > 0 ? this.renderPager() : null}
+          {indices.length > 0 ? (
+            <EuiTable>
+              <EuiTableHeader>
+                <EuiTableHeaderCellCheckbox>
+                  <EuiCheckbox
+                    id="selectAllIndexes"
+                    checked={this.areAllItemsSelected()}
+                    onChange={this.toggleAll}
+                    type="inList"
+                  />
+                </EuiTableHeaderCellCheckbox>
+                {this.buildHeader()}
+              </EuiTableHeader>
+              <EuiTableBody>{this.buildRows()}</EuiTableBody>
+            </EuiTable>
+          ) : (
+            <NoMatch />
+          )}
+          <EuiSpacer size="m" />
+          {indices.length > 0 ? this.renderPager() : null}
+        </EuiPageBody>
       </EuiPage>
     );
   }
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
index 747407bf650c7..ba166d73e449b 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
@@ -11,27 +11,29 @@ import { LogstashPanel } from './logstash_panel';
 import { AlertsPanel } from './alerts_panel';
 import { BeatsPanel } from './beats_panel';
 
-import { EuiPage } from '@elastic/eui';
+import { EuiPage, EuiPageBody } from '@elastic/eui';
 
 export function Overview(props) {
   return (
     <EuiPage>
-      <AlertsPanel alerts={props.cluster.alerts} changeUrl={props.changeUrl} />
+      <EuiPageBody>
+        <AlertsPanel alerts={props.cluster.alerts} changeUrl={props.changeUrl} />
 
-      <ElasticsearchPanel
-        {...props.cluster.elasticsearch}
-        version={props.cluster.version}
-        ml={props.cluster.ml}
-        changeUrl={props.changeUrl}
-        license={props.cluster.license}
-        showLicenseExpiration={props.showLicenseExpiration}
-      />
+        <ElasticsearchPanel
+          {...props.cluster.elasticsearch}
+          version={props.cluster.version}
+          ml={props.cluster.ml}
+          changeUrl={props.changeUrl}
+          license={props.cluster.license}
+          showLicenseExpiration={props.showLicenseExpiration}
+        />
 
-      <KibanaPanel {...props.cluster.kibana} changeUrl={props.changeUrl} />
+        <KibanaPanel {...props.cluster.kibana} changeUrl={props.changeUrl} />
 
-      <LogstashPanel {...props.cluster.logstash} changeUrl={props.changeUrl} />
+        <LogstashPanel {...props.cluster.logstash} changeUrl={props.changeUrl} />
 
-      <BeatsPanel {...props.cluster.beats} changeUrl={props.changeUrl} />
+        <BeatsPanel {...props.cluster.beats} changeUrl={props.changeUrl} />
+      </EuiPageBody>
     </EuiPage>
   );
 }
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js
index e2b53a1ed0c81..47f24d14f85c9 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js
@@ -13,6 +13,7 @@ import {
   EuiSpacer,
   EuiPage,
   EuiPageContent,
+  EuiPageBody,
 } from '@elastic/eui';
 
 export class PipelineViewer extends React.Component {
@@ -70,34 +71,36 @@ export class PipelineViewer extends React.Component {
 
     return (
       <EuiPage>
-        <EuiPageContent verticalPosition="center" horizontalPosition="center" className="pipelineViewer">
-          <StatementSection
-            iconType="logstashInput"
-            headingText="Inputs"
-            elements={inputs}
-            onShowVertexDetails={this.onShowVertexDetails}
-            detailVertex={this.state.detailDrawer.vertex}
-          />
-          <EuiSpacer />
-          <Queue queue={queue} />
-          <EuiSpacer />
-          <StatementSection
-            iconType="logstashFilter"
-            headingText="Filters"
-            elements={filters}
-            onShowVertexDetails={this.onShowVertexDetails}
-            detailVertex={this.state.detailDrawer.vertex}
-          />
-          <EuiSpacer />
-          <StatementSection
-            iconType="logstashOutput"
-            headingText="Outputs"
-            elements={outputs}
-            onShowVertexDetails={this.onShowVertexDetails}
-            detailVertex={this.state.detailDrawer.vertex}
-          />
-          { this.renderDetailDrawer() }
-        </EuiPageContent>
+        <EuiPageBody>
+          <EuiPageContent verticalPosition="center" horizontalPosition="center" className="pipelineViewer">
+            <StatementSection
+              iconType="logstashInput"
+              headingText="Inputs"
+              elements={inputs}
+              onShowVertexDetails={this.onShowVertexDetails}
+              detailVertex={this.state.detailDrawer.vertex}
+            />
+            <EuiSpacer />
+            <Queue queue={queue} />
+            <EuiSpacer />
+            <StatementSection
+              iconType="logstashFilter"
+              headingText="Filters"
+              elements={filters}
+              onShowVertexDetails={this.onShowVertexDetails}
+              detailVertex={this.state.detailDrawer.vertex}
+            />
+            <EuiSpacer />
+            <StatementSection
+              iconType="logstashOutput"
+              headingText="Outputs"
+              elements={outputs}
+              onShowVertexDetails={this.onShowVertexDetails}
+              detailVertex={this.state.detailDrawer.vertex}
+            />
+            { this.renderDetailDrawer() }
+          </EuiPageContent>
+        </EuiPageBody>
       </EuiPage>
     );
   }