diff --git a/package.json b/package.json
index 23fc31f369b8d..46418e52d8548 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.0-rc.2",
     "@elastic/ems-client": "7.9.3",
-    "@elastic/eui": "27.4.0",
+    "@elastic/eui": "27.4.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index a37281cb2263f..531513481b1d4 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@elastic/charts": "19.8.1",
-    "@elastic/eui": "27.4.0",
+    "@elastic/eui": "27.4.1",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",
diff --git a/src/core/public/application/ui/app_router.tsx b/src/core/public/application/ui/app_router.tsx
index f2d2d1e6587ac..f1f22237c32db 100644
--- a/src/core/public/application/ui/app_router.tsx
+++ b/src/core/public/application/ui/app_router.tsx
@@ -64,9 +64,9 @@ export const AppRouter: FunctionComponent<Props> = ({
               key={mounter.appRoute}
               path={mounter.appRoute}
               exact={mounter.exactRoute}
-              render={({ match: { url } }) => (
+              render={({ match: { path } }) => (
                 <AppContainer
-                  appPath={url}
+                  appPath={path}
                   appStatus={appStatuses.get(appId) ?? AppStatus.inaccessible}
                   createScopedHistory={createScopedHistory}
                   {...{ appId, mounter, setAppLeaveHandler, setIsMounting }}
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 72d62730fa698..2cfe232bf5653 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -378,9 +378,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
       <Portal
         containerInfo={
           <div
-            aria-hidden="true"
             class="euiOverlayMask euiOverlayMask--belowHeader"
-            data-aria-hidden="true"
           />
         }
       />
@@ -389,4572 +387,1606 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
       clickOutsideDisables={true}
       disabled={false}
     >
-      <EuiOutsideClickDetector
-        isDisabled={false}
-        onOutsideClick={[Function]}
+      <div
+        data-eui="EuiFocusTrap"
       >
-        <OutsideEventDetector
-          handleEvent={[Function]}
-          onMouseDown={[Function]}
-          onMouseUp={[Function]}
-          onTouchEnd={[Function]}
-          onTouchStart={[Function]}
+        <nav
+          aria-label="Primary"
+          className="euiCollapsibleNav"
+          data-test-subj="collapsibleNav"
+          id="collapsibe-nav"
         >
-          <div
-            onMouseDown={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
+          <EuiFlexItem
+            grow={false}
+            style={
+              Object {
+                "flexShrink": 0,
+              }
+            }
           >
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
             >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
-              >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
+              <EuiCollapsibleNavGroup
+                background="light"
+                className="eui-yScroll"
+                style={
+                  Object {
+                    "maxHeight": "40vh",
                   }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  lockProps={
+                }
+              >
+                <div
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                  id="mockId"
+                  style={
                     Object {
-                      "allowPinchZoom": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
+                      "maxHeight": "40vh",
                     }
                   }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                  <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
+                    className="euiCollapsibleNavGroup__children"
+                  >
+                    <EuiListGroup
+                      color="text"
+                      gutterSize="none"
+                      listItems={
+                        Array [
+                          Object {
+                            "data-test-subj": "collapsibleNavCustomNavLink",
+                            "href": "Custom link",
+                            "icon": undefined,
+                            "iconType": undefined,
+                            "isActive": false,
+                            "isDisabled": undefined,
+                            "label": "Custom link",
+                            "onClick": [Function],
+                          },
+                        ]
                       }
-                    }
-                    tabIndex={1}
-                  />
-                  <RequireSideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
-                      <div
-                        data-focus-lock-disabled="false"
+                      maxWidth="none"
+                      size="s"
+                    >
+                      <ul
+                        className="euiListGroup"
+                        style={
+                          Object {
+                            "maxWidth": "none",
+                          }
+                        }
                       >
-                        <nav
-                          aria-label="Primary"
-                          class="euiCollapsibleNav"
-                          data-test-subj="collapsibleNav"
-                          id="collapsibe-nav"
+                        <EuiListGroupItem
+                          color="text"
+                          data-test-subj="collapsibleNavCustomNavLink"
+                          href="Custom link"
+                          isActive={false}
+                          key="title-0"
+                          label="Custom link"
+                          onClick={[Function]}
+                          showToolTip={false}
+                          size="s"
+                          wrapText={false}
                         >
-                          <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
-                            style="flex-shrink: 0;"
-                          >
-                            <div
-                              class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                              id="mockId"
-                              style="max-height: 40vh;"
-                            >
-                              <div
-                                class="euiCollapsibleNavGroup__children"
-                              >
-                                <ul
-                                  class="euiListGroup"
-                                  style="max-width: none;"
-                                >
-                                  <li
-                                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                  >
-                                    <a
-                                      class="euiListGroupItem__button"
-                                      data-test-subj="collapsibleNavCustomNavLink"
-                                      href="Custom link"
-                                      rel="noreferrer"
-                                    >
-                                      <span
-                                        class="euiListGroupItem__label"
-                                        title="Custom link"
-                                      >
-                                        Custom link
-                                      </span>
-                                    </a>
-                                  </li>
-                                </ul>
-                              </div>
-                            </div>
-                          </div>
-                          <hr
-                            class="euiHorizontalRule euiHorizontalRule--full"
-                          />
-                          <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
-                            style="flex-shrink: 0;"
-                          >
-                            <div
-                              class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                              id="mockId"
-                              style="max-height: 40vh;"
-                            >
-                              <div
-                                class="euiCollapsibleNavGroup__children"
-                              >
-                                <ul
-                                  aria-label="Pinned links"
-                                  class="euiListGroup"
-                                  style="max-width: none;"
-                                >
-                                  <li
-                                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                  >
-                                    <a
-                                      class="euiListGroupItem__button"
-                                      href="/"
-                                      rel="noreferrer"
-                                    >
-                                      <div
-                                        class="euiListGroupItem__icon"
-                                        data-euiicon-type="home"
-                                      />
-                                      <span
-                                        class="euiListGroupItem__label"
-                                        title="Home"
-                                      >
-                                        Home
-                                      </span>
-                                    </a>
-                                  </li>
-                                </ul>
-                              </div>
-                            </div>
-                          </div>
-                          <div
-                            class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                            data-test-subj="collapsibleNavGroup-recentlyViewed"
-                          >
-                            <div
-                              class="euiAccordion__triggerWrapper"
-                            >
-                              <button
-                                aria-controls="mockId"
-                                aria-expanded="true"
-                                class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                type="button"
-                              >
-                                <span
-                                  class="euiAccordion__iconWrapper"
-                                >
-                                  <div
-                                    class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                    data-euiicon-type="arrowRight"
-                                  />
-                                </span>
-                                <span
-                                  class="euiIEFlexWrapFix"
-                                >
-                                  <div
-                                    class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                  >
-                                    <div
-                                      class="euiFlexItem"
-                                    >
-                                      <h3
-                                        class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                        id="mockId__title"
-                                      >
-                                        Recently viewed
-                                      </h3>
-                                    </div>
-                                  </div>
-                                </span>
-                              </button>
-                            </div>
-                            <div
-                              class="euiAccordion__childWrapper"
-                              id="mockId"
-                            >
-                              <div>
-                                <div
-                                  class=""
-                                >
-                                  <div
-                                    class="euiCollapsibleNavGroup__children"
-                                  >
-                                    <ul
-                                      aria-label="Recently viewed links"
-                                      class="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                                      style="max-width: none;"
-                                    >
-                                      <li
-                                        class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                      >
-                                        <a
-                                          aria-label="recent 1"
-                                          class="euiListGroupItem__button"
-                                          data-test-subj="collapsibleNavAppLink--recent"
-                                          href="http://localhost/recent%201"
-                                          rel="noreferrer"
-                                          title="recent 1"
-                                        >
-                                          <span
-                                            class="euiListGroupItem__label"
-                                            title="recent 1"
-                                          >
-                                            recent 1
-                                          </span>
-                                        </a>
-                                      </li>
-                                      <li
-                                        class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                      >
-                                        <a
-                                          aria-label="recent 2"
-                                          class="euiListGroupItem__button"
-                                          data-test-subj="collapsibleNavAppLink--recent"
-                                          href="http://localhost/recent%202"
-                                          rel="noreferrer"
-                                          title="recent 2"
-                                        >
-                                          <span
-                                            class="euiListGroupItem__label"
-                                            title="recent 2"
-                                          >
-                                            recent 2
-                                          </span>
-                                        </a>
-                                      </li>
-                                    </ul>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <hr
-                            class="euiHorizontalRule euiHorizontalRule--full"
-                          />
-                          <div
-                            class="euiFlexItem eui-yScroll"
-                          >
-                            <div
-                              class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-kibana"
-                            >
-                              <div
-                                class="euiAccordion__triggerWrapper"
-                              >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded="true"
-                                  class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiAccordion__iconWrapper"
-                                  >
-                                    <div
-                                      class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      data-euiicon-type="arrowRight"
-                                    />
-                                  </span>
-                                  <span
-                                    class="euiIEFlexWrapFix"
-                                  >
-                                    <div
-                                      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                    >
-                                      <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
-                                      >
-                                        <div
-                                          data-euiicon-type="logoKibana"
-                                        />
-                                      </div>
-                                      <div
-                                        class="euiFlexItem"
-                                      >
-                                        <h3
-                                          class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Kibana
-                                        </h3>
-                                      </div>
-                                    </div>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiAccordion__childWrapper"
-                                id="mockId"
-                              >
-                                <div>
-                                  <div
-                                    class=""
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        aria-label="Primary navigation links, Kibana"
-                                        class="euiListGroup"
-                                        style="max-width: none;"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="discover"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="discover"
-                                            >
-                                              discover
-                                            </span>
-                                          </a>
-                                        </li>
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="visualize"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="visualize"
-                                            >
-                                              visualize
-                                            </span>
-                                          </a>
-                                        </li>
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="dashboard"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="dashboard"
-                                            >
-                                              dashboard
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <div
-                              class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-observability"
-                            >
-                              <div
-                                class="euiAccordion__triggerWrapper"
-                              >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded="true"
-                                  class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiAccordion__iconWrapper"
-                                  >
-                                    <div
-                                      class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      data-euiicon-type="arrowRight"
-                                    />
-                                  </span>
-                                  <span
-                                    class="euiIEFlexWrapFix"
-                                  >
-                                    <div
-                                      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                    >
-                                      <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
-                                      >
-                                        <div
-                                          data-euiicon-type="logoObservability"
-                                        />
-                                      </div>
-                                      <div
-                                        class="euiFlexItem"
-                                      >
-                                        <h3
-                                          class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Observability
-                                        </h3>
-                                      </div>
-                                    </div>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiAccordion__childWrapper"
-                                id="mockId"
-                              >
-                                <div>
-                                  <div
-                                    class=""
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        aria-label="Primary navigation links, Observability"
-                                        class="euiListGroup"
-                                        style="max-width: none;"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="metrics"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="metrics"
-                                            >
-                                              metrics
-                                            </span>
-                                          </a>
-                                        </li>
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="logs"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="logs"
-                                            >
-                                              logs
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <div
-                              class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-security"
-                            >
-                              <div
-                                class="euiAccordion__triggerWrapper"
-                              >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded="true"
-                                  class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiAccordion__iconWrapper"
-                                  >
-                                    <div
-                                      class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      data-euiicon-type="arrowRight"
-                                    />
-                                  </span>
-                                  <span
-                                    class="euiIEFlexWrapFix"
-                                  >
-                                    <div
-                                      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                    >
-                                      <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
-                                      >
-                                        <div
-                                          data-euiicon-type="logoSecurity"
-                                        />
-                                      </div>
-                                      <div
-                                        class="euiFlexItem"
-                                      >
-                                        <h3
-                                          class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Security
-                                        </h3>
-                                      </div>
-                                    </div>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiAccordion__childWrapper"
-                                id="mockId"
-                              >
-                                <div>
-                                  <div
-                                    class=""
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        aria-label="Primary navigation links, Security"
-                                        class="euiListGroup"
-                                        style="max-width: none;"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="siem"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="siem"
-                                            >
-                                              siem
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <div
-                              class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-management"
-                            >
-                              <div
-                                class="euiAccordion__triggerWrapper"
-                              >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded="true"
-                                  class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiAccordion__iconWrapper"
-                                  >
-                                    <div
-                                      class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      data-euiicon-type="arrowRight"
-                                    />
-                                  </span>
-                                  <span
-                                    class="euiIEFlexWrapFix"
-                                  >
-                                    <div
-                                      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                    >
-                                      <div
-                                        class="euiFlexItem"
-                                      >
-                                        <h3
-                                          class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Management
-                                        </h3>
-                                      </div>
-                                    </div>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiAccordion__childWrapper"
-                                id="mockId"
-                              >
-                                <div>
-                                  <div
-                                    class=""
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        aria-label="Primary navigation links, Management"
-                                        class="euiListGroup"
-                                        style="max-width: none;"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="monitoring"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="monitoring"
-                                            >
-                                              monitoring
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <div
-                              class="euiCollapsibleNavGroup"
-                              data-test-subj="collapsibleNavGroup-noCategory"
-                              id="mockId"
-                            >
-                              <div
-                                class="euiCollapsibleNavGroup__children"
-                              >
-                                <ul
-                                  class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                >
-                                  <li
-                                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                  >
-                                    <a
-                                      class="euiListGroupItem__button"
-                                      data-test-subj="collapsibleNavAppLink"
-                                      href="canvas"
-                                      rel="noreferrer"
-                                    >
-                                      <span
-                                        class="euiListGroupItem__label"
-                                        title="canvas"
-                                      >
-                                        canvas
-                                      </span>
-                                    </a>
-                                  </li>
-                                </ul>
-                              </div>
-                            </div>
-                            <div
-                              class="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                              id="mockId"
-                            >
-                              <div
-                                class="euiCollapsibleNavGroup__children"
-                              >
-                                <ul
-                                  class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                >
-                                  <li
-                                    class="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                  >
-                                    <button
-                                      aria-label="Dock primary navigation"
-                                      class="euiListGroupItem__button"
-                                      data-test-subj="collapsible-nav-lock"
-                                      type="button"
-                                    >
-                                      <div
-                                        class="euiListGroupItem__icon"
-                                        data-euiicon-type="lockOpen"
-                                      />
-                                      <span
-                                        class="euiListGroupItem__label"
-                                        title="Dock navigation"
-                                      >
-                                        Dock navigation
-                                      </span>
-                                    </button>
-                                  </li>
-                                </ul>
-                              </div>
-                            </div>
-                          </div>
-                          <button
-                            class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                            type="button"
+                          <li
+                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                           >
-                            <span
-                              class="euiButtonContent euiButtonEmpty__content"
+                            <a
+                              className="euiListGroupItem__button"
+                              data-test-subj="collapsibleNavCustomNavLink"
+                              href="Custom link"
+                              onClick={[Function]}
+                              rel="noreferrer"
                             >
-                              <div
-                                class="euiButtonContent__icon"
-                                data-euiicon-type="cross"
-                              />
                               <span
-                                class="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
+                                className="euiListGroupItem__label"
+                                title="Custom link"
                               >
-                                close
+                                Custom link
                               </span>
-                            </span>
-                          </button>
-                        </nav>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
+                            </a>
+                          </li>
+                        </EuiListGroupItem>
+                      </ul>
+                    </EuiListGroup>
+                  </div>
+                </div>
+              </EuiCollapsibleNavGroup>
+            </div>
+          </EuiFlexItem>
+          <EuiHorizontalRule
+            margin="none"
+          >
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full"
+            />
+          </EuiHorizontalRule>
+          <EuiFlexItem
+            grow={false}
+            style={
+              Object {
+                "flexShrink": 0,
+              }
+            }
+          >
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
+            >
+              <EuiCollapsibleNavGroup
+                background="light"
+                className="eui-yScroll"
+                style={
+                  Object {
+                    "maxHeight": "40vh",
+                  }
+                }
+              >
+                <div
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                  id="mockId"
+                  style={
+                    Object {
+                      "maxHeight": "40vh",
                     }
+                  }
+                >
+                  <div
+                    className="euiCollapsibleNavGroup__children"
                   >
-                    <SideCar
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
-                        <div
-                          data-focus-lock-disabled="false"
+                    <EuiListGroup
+                      aria-label="Pinned links"
+                      color="text"
+                      gutterSize="none"
+                      listItems={
+                        Array [
+                          Object {
+                            "href": "/",
+                            "iconType": "home",
+                            "label": "Home",
+                            "onClick": [Function],
+                          },
+                        ]
+                      }
+                      maxWidth="none"
+                      size="s"
+                    >
+                      <ul
+                        aria-label="Pinned links"
+                        className="euiListGroup"
+                        style={
+                          Object {
+                            "maxWidth": "none",
+                          }
+                        }
+                      >
+                        <EuiListGroupItem
+                          color="text"
+                          href="/"
+                          iconType="home"
+                          key="title-0"
+                          label="Home"
+                          onClick={[Function]}
+                          showToolTip={false}
+                          size="s"
+                          wrapText={false}
                         >
-                          <nav
-                            aria-label="Primary"
-                            class="euiCollapsibleNav"
-                            data-test-subj="collapsibleNav"
-                            id="collapsibe-nav"
+                          <li
+                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                           >
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                              style="flex-shrink: 0;"
+                            <a
+                              className="euiListGroupItem__button"
+                              href="/"
+                              onClick={[Function]}
+                              rel="noreferrer"
                             >
-                              <div
-                                class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                id="mockId"
-                                style="max-height: 40vh;"
+                              <EuiIcon
+                                className="euiListGroupItem__icon"
+                                type="home"
                               >
                                 <div
-                                  class="euiCollapsibleNavGroup__children"
-                                >
-                                  <ul
-                                    class="euiListGroup"
-                                    style="max-width: none;"
-                                  >
-                                    <li
-                                      class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                    >
-                                      <a
-                                        class="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavCustomNavLink"
-                                        href="Custom link"
-                                        rel="noreferrer"
-                                      >
-                                        <span
-                                          class="euiListGroupItem__label"
-                                          title="Custom link"
-                                        >
-                                          Custom link
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </ul>
-                                </div>
-                              </div>
-                            </div>
-                            <hr
-                              class="euiHorizontalRule euiHorizontalRule--full"
-                            />
-                            <div
-                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                              style="flex-shrink: 0;"
-                            >
-                              <div
-                                class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                id="mockId"
-                                style="max-height: 40vh;"
+                                  className="euiListGroupItem__icon"
+                                  data-euiicon-type="home"
+                                />
+                              </EuiIcon>
+                              <span
+                                className="euiListGroupItem__label"
+                                title="Home"
                               >
-                                <div
-                                  class="euiCollapsibleNavGroup__children"
-                                >
-                                  <ul
-                                    aria-label="Pinned links"
-                                    class="euiListGroup"
-                                    style="max-width: none;"
-                                  >
-                                    <li
-                                      class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                    >
-                                      <a
-                                        class="euiListGroupItem__button"
-                                        href="/"
-                                        rel="noreferrer"
-                                      >
-                                        <div
-                                          class="euiListGroupItem__icon"
-                                          data-euiicon-type="home"
-                                        />
-                                        <span
-                                          class="euiListGroupItem__label"
-                                          title="Home"
-                                        >
-                                          Home
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </ul>
-                                </div>
-                              </div>
-                            </div>
-                            <div
-                              class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-recentlyViewed"
-                            >
-                              <div
-                                class="euiAccordion__triggerWrapper"
-                              >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded="true"
-                                  class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiAccordion__iconWrapper"
-                                  >
-                                    <div
-                                      class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      data-euiicon-type="arrowRight"
-                                    />
-                                  </span>
-                                  <span
-                                    class="euiIEFlexWrapFix"
-                                  >
-                                    <div
-                                      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                    >
-                                      <div
-                                        class="euiFlexItem"
-                                      >
-                                        <h3
-                                          class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Recently viewed
-                                        </h3>
-                                      </div>
-                                    </div>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiAccordion__childWrapper"
-                                id="mockId"
-                              >
-                                <div>
-                                  <div
-                                    class=""
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        aria-label="Recently viewed links"
-                                        class="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                                        style="max-width: none;"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            aria-label="recent 1"
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink--recent"
-                                            href="http://localhost/recent%201"
-                                            rel="noreferrer"
-                                            title="recent 1"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="recent 1"
-                                            >
-                                              recent 1
-                                            </span>
-                                          </a>
-                                        </li>
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            aria-label="recent 2"
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink--recent"
-                                            href="http://localhost/recent%202"
-                                            rel="noreferrer"
-                                            title="recent 2"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="recent 2"
-                                            >
-                                              recent 2
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                            <hr
-                              class="euiHorizontalRule euiHorizontalRule--full"
-                            />
-                            <div
-                              class="euiFlexItem eui-yScroll"
-                            >
-                              <div
-                                class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-kibana"
-                              >
-                                <div
-                                  class="euiAccordion__triggerWrapper"
-                                >
-                                  <button
-                                    aria-controls="mockId"
-                                    aria-expanded="true"
-                                    class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                    type="button"
-                                  >
-                                    <span
-                                      class="euiAccordion__iconWrapper"
-                                    >
-                                      <div
-                                        class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                      />
-                                    </span>
-                                    <span
-                                      class="euiIEFlexWrapFix"
-                                    >
-                                      <div
-                                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                      >
-                                        <div
-                                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                                        >
-                                          <div
-                                            data-euiicon-type="logoKibana"
-                                          />
-                                        </div>
-                                        <div
-                                          class="euiFlexItem"
-                                        >
-                                          <h3
-                                            class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                            id="mockId__title"
-                                          >
-                                            Kibana
-                                          </h3>
-                                        </div>
-                                      </div>
-                                    </span>
-                                  </button>
-                                </div>
-                                <div
-                                  class="euiAccordion__childWrapper"
-                                  id="mockId"
-                                >
-                                  <div>
-                                    <div
-                                      class=""
-                                    >
-                                      <div
-                                        class="euiCollapsibleNavGroup__children"
-                                      >
-                                        <ul
-                                          aria-label="Primary navigation links, Kibana"
-                                          class="euiListGroup"
-                                          style="max-width: none;"
-                                        >
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink"
-                                              href="discover"
-                                              rel="noreferrer"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="discover"
-                                              >
-                                                discover
-                                              </span>
-                                            </a>
-                                          </li>
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink"
-                                              href="visualize"
-                                              rel="noreferrer"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="visualize"
-                                              >
-                                                visualize
-                                              </span>
-                                            </a>
-                                          </li>
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink"
-                                              href="dashboard"
-                                              rel="noreferrer"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="dashboard"
-                                              >
-                                                dashboard
-                                              </span>
-                                            </a>
-                                          </li>
-                                        </ul>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-observability"
-                              >
-                                <div
-                                  class="euiAccordion__triggerWrapper"
-                                >
-                                  <button
-                                    aria-controls="mockId"
-                                    aria-expanded="true"
-                                    class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                    type="button"
-                                  >
-                                    <span
-                                      class="euiAccordion__iconWrapper"
-                                    >
-                                      <div
-                                        class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                      />
-                                    </span>
-                                    <span
-                                      class="euiIEFlexWrapFix"
-                                    >
-                                      <div
-                                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                      >
-                                        <div
-                                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                                        >
-                                          <div
-                                            data-euiicon-type="logoObservability"
-                                          />
-                                        </div>
-                                        <div
-                                          class="euiFlexItem"
-                                        >
-                                          <h3
-                                            class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                            id="mockId__title"
-                                          >
-                                            Observability
-                                          </h3>
-                                        </div>
-                                      </div>
-                                    </span>
-                                  </button>
-                                </div>
-                                <div
-                                  class="euiAccordion__childWrapper"
-                                  id="mockId"
-                                >
-                                  <div>
-                                    <div
-                                      class=""
-                                    >
-                                      <div
-                                        class="euiCollapsibleNavGroup__children"
-                                      >
-                                        <ul
-                                          aria-label="Primary navigation links, Observability"
-                                          class="euiListGroup"
-                                          style="max-width: none;"
-                                        >
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink"
-                                              href="metrics"
-                                              rel="noreferrer"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="metrics"
-                                              >
-                                                metrics
-                                              </span>
-                                            </a>
-                                          </li>
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink"
-                                              href="logs"
-                                              rel="noreferrer"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="logs"
-                                              >
-                                                logs
-                                              </span>
-                                            </a>
-                                          </li>
-                                        </ul>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-security"
-                              >
-                                <div
-                                  class="euiAccordion__triggerWrapper"
-                                >
-                                  <button
-                                    aria-controls="mockId"
-                                    aria-expanded="true"
-                                    class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                    type="button"
-                                  >
-                                    <span
-                                      class="euiAccordion__iconWrapper"
-                                    >
-                                      <div
-                                        class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                      />
-                                    </span>
-                                    <span
-                                      class="euiIEFlexWrapFix"
-                                    >
-                                      <div
-                                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                      >
-                                        <div
-                                          class="euiFlexItem euiFlexItem--flexGrowZero"
-                                        >
-                                          <div
-                                            data-euiicon-type="logoSecurity"
-                                          />
-                                        </div>
-                                        <div
-                                          class="euiFlexItem"
-                                        >
-                                          <h3
-                                            class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                            id="mockId__title"
-                                          >
-                                            Security
-                                          </h3>
-                                        </div>
-                                      </div>
-                                    </span>
-                                  </button>
-                                </div>
-                                <div
-                                  class="euiAccordion__childWrapper"
-                                  id="mockId"
-                                >
-                                  <div>
-                                    <div
-                                      class=""
-                                    >
-                                      <div
-                                        class="euiCollapsibleNavGroup__children"
-                                      >
-                                        <ul
-                                          aria-label="Primary navigation links, Security"
-                                          class="euiListGroup"
-                                          style="max-width: none;"
-                                        >
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink"
-                                              href="siem"
-                                              rel="noreferrer"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="siem"
-                                              >
-                                                siem
-                                              </span>
-                                            </a>
-                                          </li>
-                                        </ul>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-management"
-                              >
-                                <div
-                                  class="euiAccordion__triggerWrapper"
-                                >
-                                  <button
-                                    aria-controls="mockId"
-                                    aria-expanded="true"
-                                    class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                    type="button"
-                                  >
-                                    <span
-                                      class="euiAccordion__iconWrapper"
-                                    >
-                                      <div
-                                        class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                      />
-                                    </span>
-                                    <span
-                                      class="euiIEFlexWrapFix"
-                                    >
-                                      <div
-                                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                      >
-                                        <div
-                                          class="euiFlexItem"
-                                        >
-                                          <h3
-                                            class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                            id="mockId__title"
-                                          >
-                                            Management
-                                          </h3>
-                                        </div>
-                                      </div>
-                                    </span>
-                                  </button>
-                                </div>
-                                <div
-                                  class="euiAccordion__childWrapper"
-                                  id="mockId"
-                                >
-                                  <div>
-                                    <div
-                                      class=""
-                                    >
-                                      <div
-                                        class="euiCollapsibleNavGroup__children"
-                                      >
-                                        <ul
-                                          aria-label="Primary navigation links, Management"
-                                          class="euiListGroup"
-                                          style="max-width: none;"
-                                        >
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink"
-                                              href="monitoring"
-                                              rel="noreferrer"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="monitoring"
-                                              >
-                                                monitoring
-                                              </span>
-                                            </a>
-                                          </li>
-                                        </ul>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="euiCollapsibleNavGroup"
-                                data-test-subj="collapsibleNavGroup-noCategory"
-                                id="mockId"
-                              >
-                                <div
-                                  class="euiCollapsibleNavGroup__children"
-                                >
-                                  <ul
-                                    class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                  >
-                                    <li
-                                      class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                    >
-                                      <a
-                                        class="euiListGroupItem__button"
-                                        data-test-subj="collapsibleNavAppLink"
-                                        href="canvas"
-                                        rel="noreferrer"
-                                      >
-                                        <span
-                                          class="euiListGroupItem__label"
-                                          title="canvas"
-                                        >
-                                          canvas
-                                        </span>
-                                      </a>
-                                    </li>
-                                  </ul>
-                                </div>
-                              </div>
-                              <div
-                                class="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                                id="mockId"
-                              >
-                                <div
-                                  class="euiCollapsibleNavGroup__children"
-                                >
-                                  <ul
-                                    class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                  >
-                                    <li
-                                      class="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                    >
-                                      <button
-                                        aria-label="Dock primary navigation"
-                                        class="euiListGroupItem__button"
-                                        data-test-subj="collapsible-nav-lock"
-                                        type="button"
-                                      >
-                                        <div
-                                          class="euiListGroupItem__icon"
-                                          data-euiicon-type="lockOpen"
-                                        />
-                                        <span
-                                          class="euiListGroupItem__label"
-                                          title="Dock navigation"
-                                        >
-                                          Dock navigation
-                                        </span>
-                                      </button>
-                                    </li>
-                                  </ul>
-                                </div>
-                              </div>
-                            </div>
-                            <button
-                              class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                              type="button"
-                            >
-                              <span
-                                class="euiButtonContent euiButtonEmpty__content"
-                              >
-                                <div
-                                  class="euiButtonContent__icon"
-                                  data-euiicon-type="cross"
-                                />
-                                <span
-                                  class="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                                >
-                                  close
-                                </span>
+                                Home
                               </span>
-                            </button>
-                          </nav>
-                        </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                      sideCar={
-                        Object {
-                          "assignMedium": [Function],
-                          "assignSyncMedium": [Function],
-                          "options": Object {
-                            "async": true,
-                            "ssr": false,
-                          },
-                          "read": [Function],
-                          "useMedium": [Function],
-                        }
-                      }
+                            </a>
+                          </li>
+                        </EuiListGroupItem>
+                      </ul>
+                    </EuiListGroup>
+                  </div>
+                </div>
+              </EuiCollapsibleNavGroup>
+            </div>
+          </EuiFlexItem>
+          <EuiCollapsibleNavGroup
+            background="light"
+            data-test-subj="collapsibleNavGroup-recentlyViewed"
+            initialIsOpen={true}
+            isCollapsible={true}
+            key="recentlyViewed"
+            onToggle={[Function]}
+            title="Recently viewed"
+          >
+            <EuiAccordion
+              arrowDisplay="right"
+              buttonClassName="euiCollapsibleNavGroup__heading"
+              buttonContent={
+                <EuiFlexGroup
+                  alignItems="center"
+                  gutterSize="m"
+                  responsive={false}
+                >
+                  <EuiFlexItem>
+                    <EuiTitle
+                      size="xxs"
                     >
-                      <SideEffect(FocusWatcher)
-                        autoFocus={true}
-                        crossFrame={true}
-                        disabled={false}
-                        id={Object {}}
-                        observed={
-                          <div
-                            data-focus-lock-disabled="false"
-                          >
-                            <nav
-                              aria-label="Primary"
-                              class="euiCollapsibleNav"
-                              data-test-subj="collapsibleNav"
-                              id="collapsibe-nav"
-                            >
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
-                                style="flex-shrink: 0;"
-                              >
-                                <div
-                                  class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                  id="mockId"
-                                  style="max-height: 40vh;"
-                                >
-                                  <div
-                                    class="euiCollapsibleNavGroup__children"
-                                  >
-                                    <ul
-                                      class="euiListGroup"
-                                      style="max-width: none;"
-                                    >
-                                      <li
-                                        class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                      >
-                                        <a
-                                          class="euiListGroupItem__button"
-                                          data-test-subj="collapsibleNavCustomNavLink"
-                                          href="Custom link"
-                                          rel="noreferrer"
-                                        >
-                                          <span
-                                            class="euiListGroupItem__label"
-                                            title="Custom link"
-                                          >
-                                            Custom link
-                                          </span>
-                                        </a>
-                                      </li>
-                                    </ul>
-                                  </div>
-                                </div>
-                              </div>
-                              <hr
-                                class="euiHorizontalRule euiHorizontalRule--full"
-                              />
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
-                                style="flex-shrink: 0;"
-                              >
-                                <div
-                                  class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                  id="mockId"
-                                  style="max-height: 40vh;"
-                                >
-                                  <div
-                                    class="euiCollapsibleNavGroup__children"
-                                  >
-                                    <ul
-                                      aria-label="Pinned links"
-                                      class="euiListGroup"
-                                      style="max-width: none;"
-                                    >
-                                      <li
-                                        class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                      >
-                                        <a
-                                          class="euiListGroupItem__button"
-                                          href="/"
-                                          rel="noreferrer"
-                                        >
-                                          <div
-                                            class="euiListGroupItem__icon"
-                                            data-euiicon-type="home"
-                                          />
-                                          <span
-                                            class="euiListGroupItem__label"
-                                            title="Home"
-                                          >
-                                            Home
-                                          </span>
-                                        </a>
-                                      </li>
-                                    </ul>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-recentlyViewed"
-                              >
-                                <div
-                                  class="euiAccordion__triggerWrapper"
-                                >
-                                  <button
-                                    aria-controls="mockId"
-                                    aria-expanded="true"
-                                    class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                    type="button"
-                                  >
-                                    <span
-                                      class="euiAccordion__iconWrapper"
-                                    >
-                                      <div
-                                        class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                      />
-                                    </span>
-                                    <span
-                                      class="euiIEFlexWrapFix"
-                                    >
-                                      <div
-                                        class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                      >
-                                        <div
-                                          class="euiFlexItem"
-                                        >
-                                          <h3
-                                            class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                            id="mockId__title"
-                                          >
-                                            Recently viewed
-                                          </h3>
-                                        </div>
-                                      </div>
-                                    </span>
-                                  </button>
-                                </div>
-                                <div
-                                  class="euiAccordion__childWrapper"
-                                  id="mockId"
-                                >
-                                  <div>
-                                    <div
-                                      class=""
-                                    >
-                                      <div
-                                        class="euiCollapsibleNavGroup__children"
-                                      >
-                                        <ul
-                                          aria-label="Recently viewed links"
-                                          class="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                                          style="max-width: none;"
-                                        >
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              aria-label="recent 1"
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink--recent"
-                                              href="http://localhost/recent%201"
-                                              rel="noreferrer"
-                                              title="recent 1"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="recent 1"
-                                              >
-                                                recent 1
-                                              </span>
-                                            </a>
-                                          </li>
-                                          <li
-                                            class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <a
-                                              aria-label="recent 2"
-                                              class="euiListGroupItem__button"
-                                              data-test-subj="collapsibleNavAppLink--recent"
-                                              href="http://localhost/recent%202"
-                                              rel="noreferrer"
-                                              title="recent 2"
-                                            >
-                                              <span
-                                                class="euiListGroupItem__label"
-                                                title="recent 2"
-                                              >
-                                                recent 2
-                                              </span>
-                                            </a>
-                                          </li>
-                                        </ul>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                              <hr
-                                class="euiHorizontalRule euiHorizontalRule--full"
-                              />
-                              <div
-                                class="euiFlexItem eui-yScroll"
-                              >
-                                <div
-                                  class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-kibana"
-                                >
-                                  <div
-                                    class="euiAccordion__triggerWrapper"
-                                  >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded="true"
-                                      class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      type="button"
-                                    >
-                                      <span
-                                        class="euiAccordion__iconWrapper"
-                                      >
-                                        <div
-                                          class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          data-euiicon-type="arrowRight"
-                                        />
-                                      </span>
-                                      <span
-                                        class="euiIEFlexWrapFix"
-                                      >
-                                        <div
-                                          class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                        >
-                                          <div
-                                            class="euiFlexItem euiFlexItem--flexGrowZero"
-                                          >
-                                            <div
-                                              data-euiicon-type="logoKibana"
-                                            />
-                                          </div>
-                                          <div
-                                            class="euiFlexItem"
-                                          >
-                                            <h3
-                                              class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                              id="mockId__title"
-                                            >
-                                              Kibana
-                                            </h3>
-                                          </div>
-                                        </div>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    class="euiAccordion__childWrapper"
-                                    id="mockId"
-                                  >
-                                    <div>
-                                      <div
-                                        class=""
-                                      >
-                                        <div
-                                          class="euiCollapsibleNavGroup__children"
-                                        >
-                                          <ul
-                                            aria-label="Primary navigation links, Kibana"
-                                            class="euiListGroup"
-                                            style="max-width: none;"
-                                          >
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                href="discover"
-                                                rel="noreferrer"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="discover"
-                                                >
-                                                  discover
-                                                </span>
-                                              </a>
-                                            </li>
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                href="visualize"
-                                                rel="noreferrer"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="visualize"
-                                                >
-                                                  visualize
-                                                </span>
-                                              </a>
-                                            </li>
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                href="dashboard"
-                                                rel="noreferrer"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="dashboard"
-                                                >
-                                                  dashboard
-                                                </span>
-                                              </a>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-observability"
-                                >
-                                  <div
-                                    class="euiAccordion__triggerWrapper"
-                                  >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded="true"
-                                      class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      type="button"
-                                    >
-                                      <span
-                                        class="euiAccordion__iconWrapper"
-                                      >
-                                        <div
-                                          class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          data-euiicon-type="arrowRight"
-                                        />
-                                      </span>
-                                      <span
-                                        class="euiIEFlexWrapFix"
-                                      >
-                                        <div
-                                          class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                        >
-                                          <div
-                                            class="euiFlexItem euiFlexItem--flexGrowZero"
-                                          >
-                                            <div
-                                              data-euiicon-type="logoObservability"
-                                            />
-                                          </div>
-                                          <div
-                                            class="euiFlexItem"
-                                          >
-                                            <h3
-                                              class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                              id="mockId__title"
-                                            >
-                                              Observability
-                                            </h3>
-                                          </div>
-                                        </div>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    class="euiAccordion__childWrapper"
-                                    id="mockId"
-                                  >
-                                    <div>
-                                      <div
-                                        class=""
-                                      >
-                                        <div
-                                          class="euiCollapsibleNavGroup__children"
-                                        >
-                                          <ul
-                                            aria-label="Primary navigation links, Observability"
-                                            class="euiListGroup"
-                                            style="max-width: none;"
-                                          >
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                href="metrics"
-                                                rel="noreferrer"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="metrics"
-                                                >
-                                                  metrics
-                                                </span>
-                                              </a>
-                                            </li>
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                href="logs"
-                                                rel="noreferrer"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="logs"
-                                                >
-                                                  logs
-                                                </span>
-                                              </a>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-security"
-                                >
-                                  <div
-                                    class="euiAccordion__triggerWrapper"
-                                  >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded="true"
-                                      class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      type="button"
-                                    >
-                                      <span
-                                        class="euiAccordion__iconWrapper"
-                                      >
-                                        <div
-                                          class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          data-euiicon-type="arrowRight"
-                                        />
-                                      </span>
-                                      <span
-                                        class="euiIEFlexWrapFix"
-                                      >
-                                        <div
-                                          class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                        >
-                                          <div
-                                            class="euiFlexItem euiFlexItem--flexGrowZero"
-                                          >
-                                            <div
-                                              data-euiicon-type="logoSecurity"
-                                            />
-                                          </div>
-                                          <div
-                                            class="euiFlexItem"
-                                          >
-                                            <h3
-                                              class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                              id="mockId__title"
-                                            >
-                                              Security
-                                            </h3>
-                                          </div>
-                                        </div>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    class="euiAccordion__childWrapper"
-                                    id="mockId"
-                                  >
-                                    <div>
-                                      <div
-                                        class=""
-                                      >
-                                        <div
-                                          class="euiCollapsibleNavGroup__children"
-                                        >
-                                          <ul
-                                            aria-label="Primary navigation links, Security"
-                                            class="euiListGroup"
-                                            style="max-width: none;"
-                                          >
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                href="siem"
-                                                rel="noreferrer"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="siem"
-                                                >
-                                                  siem
-                                                </span>
-                                              </a>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-management"
-                                >
-                                  <div
-                                    class="euiAccordion__triggerWrapper"
-                                  >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded="true"
-                                      class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      type="button"
-                                    >
-                                      <span
-                                        class="euiAccordion__iconWrapper"
-                                      >
-                                        <div
-                                          class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          data-euiicon-type="arrowRight"
-                                        />
-                                      </span>
-                                      <span
-                                        class="euiIEFlexWrapFix"
-                                      >
-                                        <div
-                                          class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                        >
-                                          <div
-                                            class="euiFlexItem"
-                                          >
-                                            <h3
-                                              class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                              id="mockId__title"
-                                            >
-                                              Management
-                                            </h3>
-                                          </div>
-                                        </div>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    class="euiAccordion__childWrapper"
-                                    id="mockId"
-                                  >
-                                    <div>
-                                      <div
-                                        class=""
-                                      >
-                                        <div
-                                          class="euiCollapsibleNavGroup__children"
-                                        >
-                                          <ul
-                                            aria-label="Primary navigation links, Management"
-                                            class="euiListGroup"
-                                            style="max-width: none;"
-                                          >
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                href="monitoring"
-                                                rel="noreferrer"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="monitoring"
-                                                >
-                                                  monitoring
-                                                </span>
-                                              </a>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiCollapsibleNavGroup"
-                                  data-test-subj="collapsibleNavGroup-noCategory"
-                                  id="mockId"
-                                >
-                                  <div
-                                    class="euiCollapsibleNavGroup__children"
-                                  >
-                                    <ul
-                                      class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                    >
-                                      <li
-                                        class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                      >
-                                        <a
-                                          class="euiListGroupItem__button"
-                                          data-test-subj="collapsibleNavAppLink"
-                                          href="canvas"
-                                          rel="noreferrer"
-                                        >
-                                          <span
-                                            class="euiListGroupItem__label"
-                                            title="canvas"
-                                          >
-                                            canvas
-                                          </span>
-                                        </a>
-                                      </li>
-                                    </ul>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                                  id="mockId"
-                                >
-                                  <div
-                                    class="euiCollapsibleNavGroup__children"
-                                  >
-                                    <ul
-                                      class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                    >
-                                      <li
-                                        class="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                      >
-                                        <button
-                                          aria-label="Dock primary navigation"
-                                          class="euiListGroupItem__button"
-                                          data-test-subj="collapsible-nav-lock"
-                                          type="button"
-                                        >
-                                          <div
-                                            class="euiListGroupItem__icon"
-                                            data-euiicon-type="lockOpen"
-                                          />
-                                          <span
-                                            class="euiListGroupItem__label"
-                                            title="Dock navigation"
-                                          >
-                                            Dock navigation
-                                          </span>
-                                        </button>
-                                      </li>
-                                    </ul>
-                                  </div>
-                                </div>
-                              </div>
-                              <button
-                                class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                                type="button"
-                              >
-                                <span
-                                  class="euiButtonContent euiButtonEmpty__content"
-                                >
-                                  <div
-                                    class="euiButtonContent__icon"
-                                    data-euiicon-type="cross"
-                                  />
-                                  <span
-                                    class="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                                  >
-                                    close
-                                  </span>
-                                </span>
-                              </button>
-                            </nav>
-                          </div>
-                        }
-                        onActivation={[Function]}
-                        onDeactivation={[Function]}
-                        persistentFocus={false}
-                        returnFocus={[Function]}
-                        shards={Array []}
+                      <h3
+                        className="euiCollapsibleNavGroup__title"
+                        id="mockId__title"
                       >
-                        <FocusWatcher
-                          autoFocus={true}
-                          crossFrame={true}
-                          disabled={false}
-                          id={Object {}}
-                          observed={
-                            <div
-                              data-focus-lock-disabled="false"
-                            >
-                              <nav
-                                aria-label="Primary"
-                                class="euiCollapsibleNav"
-                                data-test-subj="collapsibleNav"
-                                id="collapsibe-nav"
-                              >
-                                <div
-                                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                                  style="flex-shrink: 0;"
-                                >
-                                  <div
-                                    class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                    id="mockId"
-                                    style="max-height: 40vh;"
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        class="euiListGroup"
-                                        style="max-width: none;"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavCustomNavLink"
-                                            href="Custom link"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="Custom link"
-                                            >
-                                              Custom link
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                                <hr
-                                  class="euiHorizontalRule euiHorizontalRule--full"
-                                />
-                                <div
-                                  class="euiFlexItem euiFlexItem--flexGrowZero"
-                                  style="flex-shrink: 0;"
-                                >
-                                  <div
-                                    class="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                    id="mockId"
-                                    style="max-height: 40vh;"
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        aria-label="Pinned links"
-                                        class="euiListGroup"
-                                        style="max-width: none;"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            href="/"
-                                            rel="noreferrer"
-                                          >
-                                            <div
-                                              class="euiListGroupItem__icon"
-                                              data-euiicon-type="home"
-                                            />
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="Home"
-                                            >
-                                              Home
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-recentlyViewed"
-                                >
-                                  <div
-                                    class="euiAccordion__triggerWrapper"
-                                  >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded="true"
-                                      class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      type="button"
-                                    >
-                                      <span
-                                        class="euiAccordion__iconWrapper"
-                                      >
-                                        <div
-                                          class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          data-euiicon-type="arrowRight"
-                                        />
-                                      </span>
-                                      <span
-                                        class="euiIEFlexWrapFix"
-                                      >
-                                        <div
-                                          class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                        >
-                                          <div
-                                            class="euiFlexItem"
-                                          >
-                                            <h3
-                                              class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                              id="mockId__title"
-                                            >
-                                              Recently viewed
-                                            </h3>
-                                          </div>
-                                        </div>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    class="euiAccordion__childWrapper"
-                                    id="mockId"
-                                  >
-                                    <div>
-                                      <div
-                                        class=""
-                                      >
-                                        <div
-                                          class="euiCollapsibleNavGroup__children"
-                                        >
-                                          <ul
-                                            aria-label="Recently viewed links"
-                                            class="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                                            style="max-width: none;"
-                                          >
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                aria-label="recent 1"
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink--recent"
-                                                href="http://localhost/recent%201"
-                                                rel="noreferrer"
-                                                title="recent 1"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="recent 1"
-                                                >
-                                                  recent 1
-                                                </span>
-                                              </a>
-                                            </li>
-                                            <li
-                                              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                aria-label="recent 2"
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink--recent"
-                                                href="http://localhost/recent%202"
-                                                rel="noreferrer"
-                                                title="recent 2"
-                                              >
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="recent 2"
-                                                >
-                                                  recent 2
-                                                </span>
-                                              </a>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                                <hr
-                                  class="euiHorizontalRule euiHorizontalRule--full"
-                                />
-                                <div
-                                  class="euiFlexItem eui-yScroll"
-                                >
-                                  <div
-                                    class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                    data-test-subj="collapsibleNavGroup-kibana"
-                                  >
-                                    <div
-                                      class="euiAccordion__triggerWrapper"
-                                    >
-                                      <button
-                                        aria-controls="mockId"
-                                        aria-expanded="true"
-                                        class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                        type="button"
-                                      >
-                                        <span
-                                          class="euiAccordion__iconWrapper"
-                                        >
-                                          <div
-                                            class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                          />
-                                        </span>
-                                        <span
-                                          class="euiIEFlexWrapFix"
-                                        >
-                                          <div
-                                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <div
-                                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                                            >
-                                              <div
-                                                data-euiicon-type="logoKibana"
-                                              />
-                                            </div>
-                                            <div
-                                              class="euiFlexItem"
-                                            >
-                                              <h3
-                                                class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                id="mockId__title"
-                                              >
-                                                Kibana
-                                              </h3>
-                                            </div>
-                                          </div>
-                                        </span>
-                                      </button>
-                                    </div>
-                                    <div
-                                      class="euiAccordion__childWrapper"
-                                      id="mockId"
-                                    >
-                                      <div>
-                                        <div
-                                          class=""
-                                        >
-                                          <div
-                                            class="euiCollapsibleNavGroup__children"
-                                          >
-                                            <ul
-                                              aria-label="Primary navigation links, Kibana"
-                                              class="euiListGroup"
-                                              style="max-width: none;"
-                                            >
-                                              <li
-                                                class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  class="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="discover"
-                                                  rel="noreferrer"
-                                                >
-                                                  <span
-                                                    class="euiListGroupItem__label"
-                                                    title="discover"
-                                                  >
-                                                    discover
-                                                  </span>
-                                                </a>
-                                              </li>
-                                              <li
-                                                class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  class="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="visualize"
-                                                  rel="noreferrer"
-                                                >
-                                                  <span
-                                                    class="euiListGroupItem__label"
-                                                    title="visualize"
-                                                  >
-                                                    visualize
-                                                  </span>
-                                                </a>
-                                              </li>
-                                              <li
-                                                class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  class="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="dashboard"
-                                                  rel="noreferrer"
-                                                >
-                                                  <span
-                                                    class="euiListGroupItem__label"
-                                                    title="dashboard"
-                                                  >
-                                                    dashboard
-                                                  </span>
-                                                </a>
-                                              </li>
-                                            </ul>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div
-                                    class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                    data-test-subj="collapsibleNavGroup-observability"
-                                  >
-                                    <div
-                                      class="euiAccordion__triggerWrapper"
-                                    >
-                                      <button
-                                        aria-controls="mockId"
-                                        aria-expanded="true"
-                                        class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                        type="button"
-                                      >
-                                        <span
-                                          class="euiAccordion__iconWrapper"
-                                        >
-                                          <div
-                                            class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                          />
-                                        </span>
-                                        <span
-                                          class="euiIEFlexWrapFix"
-                                        >
-                                          <div
-                                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <div
-                                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                                            >
-                                              <div
-                                                data-euiicon-type="logoObservability"
-                                              />
-                                            </div>
-                                            <div
-                                              class="euiFlexItem"
-                                            >
-                                              <h3
-                                                class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                id="mockId__title"
-                                              >
-                                                Observability
-                                              </h3>
-                                            </div>
-                                          </div>
-                                        </span>
-                                      </button>
-                                    </div>
-                                    <div
-                                      class="euiAccordion__childWrapper"
-                                      id="mockId"
-                                    >
-                                      <div>
-                                        <div
-                                          class=""
-                                        >
-                                          <div
-                                            class="euiCollapsibleNavGroup__children"
-                                          >
-                                            <ul
-                                              aria-label="Primary navigation links, Observability"
-                                              class="euiListGroup"
-                                              style="max-width: none;"
-                                            >
-                                              <li
-                                                class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  class="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="metrics"
-                                                  rel="noreferrer"
-                                                >
-                                                  <span
-                                                    class="euiListGroupItem__label"
-                                                    title="metrics"
-                                                  >
-                                                    metrics
-                                                  </span>
-                                                </a>
-                                              </li>
-                                              <li
-                                                class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  class="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="logs"
-                                                  rel="noreferrer"
-                                                >
-                                                  <span
-                                                    class="euiListGroupItem__label"
-                                                    title="logs"
-                                                  >
-                                                    logs
-                                                  </span>
-                                                </a>
-                                              </li>
-                                            </ul>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div
-                                    class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                    data-test-subj="collapsibleNavGroup-security"
-                                  >
-                                    <div
-                                      class="euiAccordion__triggerWrapper"
-                                    >
-                                      <button
-                                        aria-controls="mockId"
-                                        aria-expanded="true"
-                                        class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                        type="button"
-                                      >
-                                        <span
-                                          class="euiAccordion__iconWrapper"
-                                        >
-                                          <div
-                                            class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                          />
-                                        </span>
-                                        <span
-                                          class="euiIEFlexWrapFix"
-                                        >
-                                          <div
-                                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <div
-                                              class="euiFlexItem euiFlexItem--flexGrowZero"
-                                            >
-                                              <div
-                                                data-euiicon-type="logoSecurity"
-                                              />
-                                            </div>
-                                            <div
-                                              class="euiFlexItem"
-                                            >
-                                              <h3
-                                                class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                id="mockId__title"
-                                              >
-                                                Security
-                                              </h3>
-                                            </div>
-                                          </div>
-                                        </span>
-                                      </button>
-                                    </div>
-                                    <div
-                                      class="euiAccordion__childWrapper"
-                                      id="mockId"
-                                    >
-                                      <div>
-                                        <div
-                                          class=""
-                                        >
-                                          <div
-                                            class="euiCollapsibleNavGroup__children"
-                                          >
-                                            <ul
-                                              aria-label="Primary navigation links, Security"
-                                              class="euiListGroup"
-                                              style="max-width: none;"
-                                            >
-                                              <li
-                                                class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  class="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="siem"
-                                                  rel="noreferrer"
-                                                >
-                                                  <span
-                                                    class="euiListGroupItem__label"
-                                                    title="siem"
-                                                  >
-                                                    siem
-                                                  </span>
-                                                </a>
-                                              </li>
-                                            </ul>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div
-                                    class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                    data-test-subj="collapsibleNavGroup-management"
-                                  >
-                                    <div
-                                      class="euiAccordion__triggerWrapper"
-                                    >
-                                      <button
-                                        aria-controls="mockId"
-                                        aria-expanded="true"
-                                        class="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                        type="button"
-                                      >
-                                        <span
-                                          class="euiAccordion__iconWrapper"
-                                        >
-                                          <div
-                                            class="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                          />
-                                        </span>
-                                        <span
-                                          class="euiIEFlexWrapFix"
-                                        >
-                                          <div
-                                            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <div
-                                              class="euiFlexItem"
-                                            >
-                                              <h3
-                                                class="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                id="mockId__title"
-                                              >
-                                                Management
-                                              </h3>
-                                            </div>
-                                          </div>
-                                        </span>
-                                      </button>
-                                    </div>
-                                    <div
-                                      class="euiAccordion__childWrapper"
-                                      id="mockId"
-                                    >
-                                      <div>
-                                        <div
-                                          class=""
-                                        >
-                                          <div
-                                            class="euiCollapsibleNavGroup__children"
-                                          >
-                                            <ul
-                                              aria-label="Primary navigation links, Management"
-                                              class="euiListGroup"
-                                              style="max-width: none;"
-                                            >
-                                              <li
-                                                class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  class="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="monitoring"
-                                                  rel="noreferrer"
-                                                >
-                                                  <span
-                                                    class="euiListGroupItem__label"
-                                                    title="monitoring"
-                                                  >
-                                                    monitoring
-                                                  </span>
-                                                </a>
-                                              </li>
-                                            </ul>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div
-                                    class="euiCollapsibleNavGroup"
-                                    data-test-subj="collapsibleNavGroup-noCategory"
-                                    id="mockId"
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="canvas"
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="canvas"
-                                            >
-                                              canvas
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                  <div
-                                    class="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                                    id="mockId"
-                                  >
-                                    <div
-                                      class="euiCollapsibleNavGroup__children"
-                                    >
-                                      <ul
-                                        class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                      >
-                                        <li
-                                          class="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                        >
-                                          <button
-                                            aria-label="Dock primary navigation"
-                                            class="euiListGroupItem__button"
-                                            data-test-subj="collapsible-nav-lock"
-                                            type="button"
-                                          >
-                                            <div
-                                              class="euiListGroupItem__icon"
-                                              data-euiicon-type="lockOpen"
-                                            />
-                                            <span
-                                              class="euiListGroupItem__label"
-                                              title="Dock navigation"
-                                            >
-                                              Dock navigation
-                                            </span>
-                                          </button>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                                <button
-                                  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                                  type="button"
+                        Recently viewed
+                      </h3>
+                    </EuiTitle>
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              }
+              className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+              data-test-subj="collapsibleNavGroup-recentlyViewed"
+              id="mockId"
+              initialIsOpen={true}
+              onToggle={[Function]}
+              paddingSize="none"
+            >
+              <div
+                className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+                data-test-subj="collapsibleNavGroup-recentlyViewed"
+                onToggle={[Function]}
+              >
+                <div
+                  className="euiAccordion__triggerWrapper"
+                >
+                  <button
+                    aria-controls="mockId"
+                    aria-expanded={true}
+                    className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                    onClick={[Function]}
+                    type="button"
+                  >
+                    <span
+                      className="euiAccordion__iconWrapper"
+                    >
+                      <EuiIcon
+                        className="euiAccordion__icon euiAccordion__icon-isOpen"
+                        size="m"
+                        type="arrowRight"
+                      >
+                        <div
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          data-euiicon-type="arrowRight"
+                          size="m"
+                        />
+                      </EuiIcon>
+                    </span>
+                    <span
+                      className="euiIEFlexWrapFix"
+                    >
+                      <EuiFlexGroup
+                        alignItems="center"
+                        gutterSize="m"
+                        responsive={false}
+                      >
+                        <div
+                          className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                        >
+                          <EuiFlexItem>
+                            <div
+                              className="euiFlexItem"
+                            >
+                              <EuiTitle
+                                size="xxs"
+                              >
+                                <h3
+                                  className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                  id="mockId__title"
                                 >
-                                  <span
-                                    class="euiButtonContent euiButtonEmpty__content"
-                                  >
-                                    <div
-                                      class="euiButtonContent__icon"
-                                      data-euiicon-type="cross"
-                                    />
-                                    <span
-                                      class="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                                    >
-                                      close
-                                    </span>
-                                  </span>
-                                </button>
-                              </nav>
+                                  Recently viewed
+                                </h3>
+                              </EuiTitle>
                             </div>
-                          }
-                          onActivation={[Function]}
-                          onDeactivation={[Function]}
-                          persistentFocus={false}
-                          returnFocus={[Function]}
-                          shards={Array []}
-                        />
-                      </SideEffect(FocusWatcher)>
-                    </SideCar>
-                  </RequireSideCar>
-                  <ForwardRef
-                    data-focus-lock-disabled={false}
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
+                          </EuiFlexItem>
+                        </div>
+                      </EuiFlexGroup>
+                    </span>
+                  </button>
+                </div>
+                <div
+                  className="euiAccordion__childWrapper"
+                  id="mockId"
+                >
+                  <EuiResizeObserver
+                    onResize={[Function]}
                   >
-                    <div
-                      data-focus-lock-disabled={false}
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
-                    >
-                      <nav
-                        aria-label="Primary"
-                        className="euiCollapsibleNav"
-                        data-test-subj="collapsibleNav"
-                        id="collapsibe-nav"
+                    <div>
+                      <div
+                        className=""
                       >
-                        <EuiFlexItem
-                          grow={false}
-                          style={
-                            Object {
-                              "flexShrink": 0,
-                            }
-                          }
+                        <div
+                          className="euiCollapsibleNavGroup__children"
                         >
-                          <div
-                            className="euiFlexItem euiFlexItem--flexGrowZero"
-                            style={
-                              Object {
-                                "flexShrink": 0,
-                              }
+                          <EuiListGroup
+                            aria-label="Recently viewed links"
+                            className="kbnCollapsibleNav__recentsListGroup"
+                            color="subdued"
+                            gutterSize="none"
+                            listItems={
+                              Array [
+                                Object {
+                                  "aria-label": "recent 1",
+                                  "data-test-subj": "collapsibleNavAppLink--recent",
+                                  "href": "http://localhost/recent%201",
+                                  "label": "recent 1",
+                                  "onClick": [Function],
+                                  "title": "recent 1",
+                                },
+                                Object {
+                                  "aria-label": "recent 2",
+                                  "data-test-subj": "collapsibleNavAppLink--recent",
+                                  "href": "http://localhost/recent%202",
+                                  "label": "recent 2",
+                                  "onClick": [Function],
+                                  "title": "recent 2",
+                                },
+                              ]
                             }
+                            maxWidth="none"
+                            size="s"
                           >
-                            <EuiCollapsibleNavGroup
-                              background="light"
-                              className="eui-yScroll"
+                            <ul
+                              aria-label="Recently viewed links"
+                              className="euiListGroup kbnCollapsibleNav__recentsListGroup"
                               style={
                                 Object {
-                                  "maxHeight": "40vh",
+                                  "maxWidth": "none",
                                 }
                               }
                             >
-                              <div
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                id="mockId"
-                                style={
-                                  Object {
-                                    "maxHeight": "40vh",
-                                  }
-                                }
+                              <EuiListGroupItem
+                                aria-label="recent 1"
+                                color="subdued"
+                                data-test-subj="collapsibleNavAppLink--recent"
+                                href="http://localhost/recent%201"
+                                key="title-0"
+                                label="recent 1"
+                                onClick={[Function]}
+                                showToolTip={false}
+                                size="s"
+                                title="recent 1"
+                                wrapText={false}
                               >
-                                <div
-                                  className="euiCollapsibleNavGroup__children"
+                                <li
+                                  className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                 >
-                                  <EuiListGroup
-                                    color="text"
-                                    gutterSize="none"
-                                    listItems={
-                                      Array [
-                                        Object {
-                                          "data-test-subj": "collapsibleNavCustomNavLink",
-                                          "href": "Custom link",
-                                          "icon": undefined,
-                                          "iconType": undefined,
-                                          "isActive": false,
-                                          "isDisabled": undefined,
-                                          "label": "Custom link",
-                                          "onClick": [Function],
-                                        },
-                                      ]
-                                    }
-                                    maxWidth="none"
-                                    size="s"
+                                  <a
+                                    aria-label="recent 1"
+                                    className="euiListGroupItem__button"
+                                    data-test-subj="collapsibleNavAppLink--recent"
+                                    href="http://localhost/recent%201"
+                                    onClick={[Function]}
+                                    rel="noreferrer"
+                                    title="recent 1"
                                   >
-                                    <ul
-                                      className="euiListGroup"
-                                      style={
-                                        Object {
-                                          "maxWidth": "none",
-                                        }
-                                      }
+                                    <span
+                                      className="euiListGroupItem__label"
+                                      title="recent 1"
                                     >
-                                      <EuiListGroupItem
-                                        color="text"
-                                        data-test-subj="collapsibleNavCustomNavLink"
-                                        href="Custom link"
-                                        isActive={false}
-                                        key="title-0"
-                                        label="Custom link"
-                                        onClick={[Function]}
-                                        showToolTip={false}
-                                        size="s"
-                                        wrapText={false}
-                                      >
-                                        <li
-                                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            className="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavCustomNavLink"
-                                            href="Custom link"
-                                            onClick={[Function]}
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              className="euiListGroupItem__label"
-                                              title="Custom link"
-                                            >
-                                              Custom link
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </EuiListGroupItem>
-                                    </ul>
-                                  </EuiListGroup>
-                                </div>
-                              </div>
-                            </EuiCollapsibleNavGroup>
-                          </div>
-                        </EuiFlexItem>
-                        <EuiHorizontalRule
-                          margin="none"
+                                      recent 1
+                                    </span>
+                                  </a>
+                                </li>
+                              </EuiListGroupItem>
+                              <EuiListGroupItem
+                                aria-label="recent 2"
+                                color="subdued"
+                                data-test-subj="collapsibleNavAppLink--recent"
+                                href="http://localhost/recent%202"
+                                key="title-1"
+                                label="recent 2"
+                                onClick={[Function]}
+                                showToolTip={false}
+                                size="s"
+                                title="recent 2"
+                                wrapText={false}
+                              >
+                                <li
+                                  className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                                >
+                                  <a
+                                    aria-label="recent 2"
+                                    className="euiListGroupItem__button"
+                                    data-test-subj="collapsibleNavAppLink--recent"
+                                    href="http://localhost/recent%202"
+                                    onClick={[Function]}
+                                    rel="noreferrer"
+                                    title="recent 2"
+                                  >
+                                    <span
+                                      className="euiListGroupItem__label"
+                                      title="recent 2"
+                                    >
+                                      recent 2
+                                    </span>
+                                  </a>
+                                </li>
+                              </EuiListGroupItem>
+                            </ul>
+                          </EuiListGroup>
+                        </div>
+                      </div>
+                    </div>
+                  </EuiResizeObserver>
+                </div>
+              </div>
+            </EuiAccordion>
+          </EuiCollapsibleNavGroup>
+          <EuiHorizontalRule
+            margin="none"
+          >
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full"
+            />
+          </EuiHorizontalRule>
+          <EuiFlexItem
+            className="eui-yScroll"
+          >
+            <div
+              className="euiFlexItem eui-yScroll"
+            >
+              <EuiCollapsibleNavGroup
+                data-test-subj="collapsibleNavGroup-kibana"
+                iconType="logoKibana"
+                initialIsOpen={true}
+                isCollapsible={true}
+                key="kibana"
+                onToggle={[Function]}
+                title="Kibana"
+              >
+                <EuiAccordion
+                  arrowDisplay="right"
+                  buttonClassName="euiCollapsibleNavGroup__heading"
+                  buttonContent={
+                    <EuiFlexGroup
+                      alignItems="center"
+                      gutterSize="m"
+                      responsive={false}
+                    >
+                      <EuiFlexItem
+                        grow={false}
+                      >
+                        <EuiIcon
+                          size="l"
+                          type="logoKibana"
+                        />
+                      </EuiFlexItem>
+                      <EuiFlexItem>
+                        <EuiTitle
+                          size="xxs"
                         >
-                          <hr
-                            className="euiHorizontalRule euiHorizontalRule--full"
-                          />
-                        </EuiHorizontalRule>
-                        <EuiFlexItem
-                          grow={false}
-                          style={
-                            Object {
-                              "flexShrink": 0,
-                            }
-                          }
+                          <h3
+                            className="euiCollapsibleNavGroup__title"
+                            id="mockId__title"
+                          >
+                            Kibana
+                          </h3>
+                        </EuiTitle>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  }
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                  data-test-subj="collapsibleNavGroup-kibana"
+                  id="mockId"
+                  initialIsOpen={true}
+                  onToggle={[Function]}
+                  paddingSize="none"
+                >
+                  <div
+                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                    data-test-subj="collapsibleNavGroup-kibana"
+                    onToggle={[Function]}
+                  >
+                    <div
+                      className="euiAccordion__triggerWrapper"
+                    >
+                      <button
+                        aria-controls="mockId"
+                        aria-expanded={true}
+                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <span
+                          className="euiAccordion__iconWrapper"
                         >
-                          <div
-                            className="euiFlexItem euiFlexItem--flexGrowZero"
-                            style={
-                              Object {
-                                "flexShrink": 0,
-                              }
-                            }
+                          <EuiIcon
+                            className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            size="m"
+                            type="arrowRight"
                           >
-                            <EuiCollapsibleNavGroup
-                              background="light"
-                              className="eui-yScroll"
-                              style={
-                                Object {
-                                  "maxHeight": "40vh",
-                                }
-                              }
+                            <div
+                              className="euiAccordion__icon euiAccordion__icon-isOpen"
+                              data-euiicon-type="arrowRight"
+                              size="m"
+                            />
+                          </EuiIcon>
+                        </span>
+                        <span
+                          className="euiIEFlexWrapFix"
+                        >
+                          <EuiFlexGroup
+                            alignItems="center"
+                            gutterSize="m"
+                            responsive={false}
+                          >
+                            <div
+                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                             >
-                              <div
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                id="mockId"
-                                style={
-                                  Object {
-                                    "maxHeight": "40vh",
-                                  }
-                                }
+                              <EuiFlexItem
+                                grow={false}
                               >
                                 <div
-                                  className="euiCollapsibleNavGroup__children"
+                                  className="euiFlexItem euiFlexItem--flexGrowZero"
                                 >
-                                  <EuiListGroup
-                                    aria-label="Pinned links"
-                                    color="text"
-                                    gutterSize="none"
-                                    listItems={
-                                      Array [
-                                        Object {
-                                          "href": "/",
-                                          "iconType": "home",
-                                          "label": "Home",
-                                          "onClick": [Function],
-                                        },
-                                      ]
-                                    }
-                                    maxWidth="none"
-                                    size="s"
+                                  <EuiIcon
+                                    size="l"
+                                    type="logoKibana"
                                   >
-                                    <ul
-                                      aria-label="Pinned links"
-                                      className="euiListGroup"
-                                      style={
-                                        Object {
-                                          "maxWidth": "none",
-                                        }
-                                      }
-                                    >
-                                      <EuiListGroupItem
-                                        color="text"
-                                        href="/"
-                                        iconType="home"
-                                        key="title-0"
-                                        label="Home"
-                                        onClick={[Function]}
-                                        showToolTip={false}
-                                        size="s"
-                                        wrapText={false}
-                                      >
-                                        <li
-                                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            className="euiListGroupItem__button"
-                                            href="/"
-                                            onClick={[Function]}
-                                            rel="noreferrer"
-                                          >
-                                            <EuiIcon
-                                              className="euiListGroupItem__icon"
-                                              type="home"
-                                            >
-                                              <div
-                                                className="euiListGroupItem__icon"
-                                                data-euiicon-type="home"
-                                              />
-                                            </EuiIcon>
-                                            <span
-                                              className="euiListGroupItem__label"
-                                              title="Home"
-                                            >
-                                              Home
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </EuiListGroupItem>
-                                    </ul>
-                                  </EuiListGroup>
+                                    <div
+                                      data-euiicon-type="logoKibana"
+                                      size="l"
+                                    />
+                                  </EuiIcon>
                                 </div>
-                              </div>
-                            </EuiCollapsibleNavGroup>
-                          </div>
-                        </EuiFlexItem>
-                        <EuiCollapsibleNavGroup
-                          background="light"
-                          data-test-subj="collapsibleNavGroup-recentlyViewed"
-                          initialIsOpen={true}
-                          isCollapsible={true}
-                          key="recentlyViewed"
-                          onToggle={[Function]}
-                          title="Recently viewed"
-                        >
-                          <EuiAccordion
-                            arrowDisplay="right"
-                            buttonClassName="euiCollapsibleNavGroup__heading"
-                            buttonContent={
-                              <EuiFlexGroup
-                                alignItems="center"
-                                gutterSize="m"
-                                responsive={false}
-                              >
-                                <EuiFlexItem>
+                              </EuiFlexItem>
+                              <EuiFlexItem>
+                                <div
+                                  className="euiFlexItem"
+                                >
                                   <EuiTitle
                                     size="xxs"
                                   >
                                     <h3
-                                      className="euiCollapsibleNavGroup__title"
+                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
                                       id="mockId__title"
                                     >
-                                      Recently viewed
+                                      Kibana
                                     </h3>
                                   </EuiTitle>
-                                </EuiFlexItem>
-                              </EuiFlexGroup>
-                            }
-                            className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                            data-test-subj="collapsibleNavGroup-recentlyViewed"
-                            id="mockId"
-                            initialIsOpen={true}
-                            onToggle={[Function]}
-                            paddingSize="none"
+                                </div>
+                              </EuiFlexItem>
+                            </div>
+                          </EuiFlexGroup>
+                        </span>
+                      </button>
+                    </div>
+                    <div
+                      className="euiAccordion__childWrapper"
+                      id="mockId"
+                    >
+                      <EuiResizeObserver
+                        onResize={[Function]}
+                      >
+                        <div>
+                          <div
+                            className=""
                           >
                             <div
-                              className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-recentlyViewed"
-                              onToggle={[Function]}
+                              className="euiCollapsibleNavGroup__children"
                             >
-                              <div
-                                className="euiAccordion__triggerWrapper"
+                              <EuiListGroup
+                                aria-label="Primary navigation links, Kibana"
+                                color="subdued"
+                                gutterSize="none"
+                                listItems={
+                                  Array [
+                                    Object {
+                                      "data-test-subj": "collapsibleNavAppLink",
+                                      "href": "discover",
+                                      "isActive": false,
+                                      "isDisabled": undefined,
+                                      "label": "discover",
+                                      "onClick": [Function],
+                                    },
+                                    Object {
+                                      "data-test-subj": "collapsibleNavAppLink",
+                                      "href": "visualize",
+                                      "isActive": false,
+                                      "isDisabled": undefined,
+                                      "label": "visualize",
+                                      "onClick": [Function],
+                                    },
+                                    Object {
+                                      "data-test-subj": "collapsibleNavAppLink",
+                                      "href": "dashboard",
+                                      "isActive": false,
+                                      "isDisabled": undefined,
+                                      "label": "dashboard",
+                                      "onClick": [Function],
+                                    },
+                                  ]
+                                }
+                                maxWidth="none"
+                                size="s"
                               >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded={true}
-                                  className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  onClick={[Function]}
-                                  type="button"
+                                <ul
+                                  aria-label="Primary navigation links, Kibana"
+                                  className="euiListGroup"
+                                  style={
+                                    Object {
+                                      "maxWidth": "none",
+                                    }
+                                  }
                                 >
-                                  <span
-                                    className="euiAccordion__iconWrapper"
+                                  <EuiListGroupItem
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink"
+                                    href="discover"
+                                    isActive={false}
+                                    key="title-0"
+                                    label="discover"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    wrapText={false}
                                   >
-                                    <EuiIcon
-                                      className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      size="m"
-                                      type="arrowRight"
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <div
-                                        className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                        size="m"
-                                      />
-                                    </EuiIcon>
-                                  </span>
-                                  <span
-                                    className="euiIEFlexWrapFix"
+                                      <a
+                                        className="euiListGroupItem__button"
+                                        data-test-subj="collapsibleNavAppLink"
+                                        href="discover"
+                                        onClick={[Function]}
+                                        rel="noreferrer"
+                                      >
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="discover"
+                                        >
+                                          discover
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                  <EuiListGroupItem
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink"
+                                    href="visualize"
+                                    isActive={false}
+                                    key="title-1"
+                                    label="visualize"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    wrapText={false}
                                   >
-                                    <EuiFlexGroup
-                                      alignItems="center"
-                                      gutterSize="m"
-                                      responsive={false}
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <div
-                                        className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                                      <a
+                                        className="euiListGroupItem__button"
+                                        data-test-subj="collapsibleNavAppLink"
+                                        href="visualize"
+                                        onClick={[Function]}
+                                        rel="noreferrer"
                                       >
-                                        <EuiFlexItem>
-                                          <div
-                                            className="euiFlexItem"
-                                          >
-                                            <EuiTitle
-                                              size="xxs"
-                                            >
-                                              <h3
-                                                className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                id="mockId__title"
-                                              >
-                                                Recently viewed
-                                              </h3>
-                                            </EuiTitle>
-                                          </div>
-                                        </EuiFlexItem>
-                                      </div>
-                                    </EuiFlexGroup>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                className="euiAccordion__childWrapper"
-                                id="mockId"
-                              >
-                                <EuiResizeObserver
-                                  onResize={[Function]}
-                                >
-                                  <div>
-                                    <div
-                                      className=""
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="visualize"
+                                        >
+                                          visualize
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                  <EuiListGroupItem
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink"
+                                    href="dashboard"
+                                    isActive={false}
+                                    key="title-2"
+                                    label="dashboard"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    wrapText={false}
+                                  >
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <div
-                                        className="euiCollapsibleNavGroup__children"
+                                      <a
+                                        className="euiListGroupItem__button"
+                                        data-test-subj="collapsibleNavAppLink"
+                                        href="dashboard"
+                                        onClick={[Function]}
+                                        rel="noreferrer"
                                       >
-                                        <EuiListGroup
-                                          aria-label="Recently viewed links"
-                                          className="kbnCollapsibleNav__recentsListGroup"
-                                          color="subdued"
-                                          gutterSize="none"
-                                          listItems={
-                                            Array [
-                                              Object {
-                                                "aria-label": "recent 1",
-                                                "data-test-subj": "collapsibleNavAppLink--recent",
-                                                "href": "http://localhost/recent%201",
-                                                "label": "recent 1",
-                                                "onClick": [Function],
-                                                "title": "recent 1",
-                                              },
-                                              Object {
-                                                "aria-label": "recent 2",
-                                                "data-test-subj": "collapsibleNavAppLink--recent",
-                                                "href": "http://localhost/recent%202",
-                                                "label": "recent 2",
-                                                "onClick": [Function],
-                                                "title": "recent 2",
-                                              },
-                                            ]
-                                          }
-                                          maxWidth="none"
-                                          size="s"
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="dashboard"
                                         >
-                                          <ul
-                                            aria-label="Recently viewed links"
-                                            className="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                                            style={
-                                              Object {
-                                                "maxWidth": "none",
-                                              }
-                                            }
-                                          >
-                                            <EuiListGroupItem
-                                              aria-label="recent 1"
-                                              color="subdued"
-                                              data-test-subj="collapsibleNavAppLink--recent"
-                                              href="http://localhost/recent%201"
-                                              key="title-0"
-                                              label="recent 1"
-                                              onClick={[Function]}
-                                              showToolTip={false}
-                                              size="s"
-                                              title="recent 1"
-                                              wrapText={false}
-                                            >
-                                              <li
-                                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  aria-label="recent 1"
-                                                  className="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink--recent"
-                                                  href="http://localhost/recent%201"
-                                                  onClick={[Function]}
-                                                  rel="noreferrer"
-                                                  title="recent 1"
-                                                >
-                                                  <span
-                                                    className="euiListGroupItem__label"
-                                                    title="recent 1"
-                                                  >
-                                                    recent 1
-                                                  </span>
-                                                </a>
-                                              </li>
-                                            </EuiListGroupItem>
-                                            <EuiListGroupItem
-                                              aria-label="recent 2"
-                                              color="subdued"
-                                              data-test-subj="collapsibleNavAppLink--recent"
-                                              href="http://localhost/recent%202"
-                                              key="title-1"
-                                              label="recent 2"
-                                              onClick={[Function]}
-                                              showToolTip={false}
-                                              size="s"
-                                              title="recent 2"
-                                              wrapText={false}
-                                            >
-                                              <li
-                                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <a
-                                                  aria-label="recent 2"
-                                                  className="euiListGroupItem__button"
-                                                  data-test-subj="collapsibleNavAppLink--recent"
-                                                  href="http://localhost/recent%202"
-                                                  onClick={[Function]}
-                                                  rel="noreferrer"
-                                                  title="recent 2"
-                                                >
-                                                  <span
-                                                    className="euiListGroupItem__label"
-                                                    title="recent 2"
-                                                  >
-                                                    recent 2
-                                                  </span>
-                                                </a>
-                                              </li>
-                                            </EuiListGroupItem>
-                                          </ul>
-                                        </EuiListGroup>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </EuiResizeObserver>
-                              </div>
+                                          dashboard
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                </ul>
+                              </EuiListGroup>
                             </div>
-                          </EuiAccordion>
-                        </EuiCollapsibleNavGroup>
-                        <EuiHorizontalRule
-                          margin="none"
+                          </div>
+                        </div>
+                      </EuiResizeObserver>
+                    </div>
+                  </div>
+                </EuiAccordion>
+              </EuiCollapsibleNavGroup>
+              <EuiCollapsibleNavGroup
+                data-test-subj="collapsibleNavGroup-observability"
+                iconType="logoObservability"
+                initialIsOpen={true}
+                isCollapsible={true}
+                key="observability"
+                onToggle={[Function]}
+                title="Observability"
+              >
+                <EuiAccordion
+                  arrowDisplay="right"
+                  buttonClassName="euiCollapsibleNavGroup__heading"
+                  buttonContent={
+                    <EuiFlexGroup
+                      alignItems="center"
+                      gutterSize="m"
+                      responsive={false}
+                    >
+                      <EuiFlexItem
+                        grow={false}
+                      >
+                        <EuiIcon
+                          size="l"
+                          type="logoObservability"
+                        />
+                      </EuiFlexItem>
+                      <EuiFlexItem>
+                        <EuiTitle
+                          size="xxs"
+                        >
+                          <h3
+                            className="euiCollapsibleNavGroup__title"
+                            id="mockId__title"
+                          >
+                            Observability
+                          </h3>
+                        </EuiTitle>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  }
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                  data-test-subj="collapsibleNavGroup-observability"
+                  id="mockId"
+                  initialIsOpen={true}
+                  onToggle={[Function]}
+                  paddingSize="none"
+                >
+                  <div
+                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                    data-test-subj="collapsibleNavGroup-observability"
+                    onToggle={[Function]}
+                  >
+                    <div
+                      className="euiAccordion__triggerWrapper"
+                    >
+                      <button
+                        aria-controls="mockId"
+                        aria-expanded={true}
+                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <span
+                          className="euiAccordion__iconWrapper"
                         >
-                          <hr
-                            className="euiHorizontalRule euiHorizontalRule--full"
-                          />
-                        </EuiHorizontalRule>
-                        <EuiFlexItem
-                          className="eui-yScroll"
+                          <EuiIcon
+                            className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            size="m"
+                            type="arrowRight"
+                          >
+                            <div
+                              className="euiAccordion__icon euiAccordion__icon-isOpen"
+                              data-euiicon-type="arrowRight"
+                              size="m"
+                            />
+                          </EuiIcon>
+                        </span>
+                        <span
+                          className="euiIEFlexWrapFix"
                         >
-                          <div
-                            className="euiFlexItem eui-yScroll"
+                          <EuiFlexGroup
+                            alignItems="center"
+                            gutterSize="m"
+                            responsive={false}
                           >
-                            <EuiCollapsibleNavGroup
-                              data-test-subj="collapsibleNavGroup-kibana"
-                              iconType="logoKibana"
-                              initialIsOpen={true}
-                              isCollapsible={true}
-                              key="kibana"
-                              onToggle={[Function]}
-                              title="Kibana"
+                            <div
+                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                             >
-                              <EuiAccordion
-                                arrowDisplay="right"
-                                buttonClassName="euiCollapsibleNavGroup__heading"
-                                buttonContent={
-                                  <EuiFlexGroup
-                                    alignItems="center"
-                                    gutterSize="m"
-                                    responsive={false}
-                                  >
-                                    <EuiFlexItem
-                                      grow={false}
-                                    >
-                                      <EuiIcon
-                                        size="l"
-                                        type="logoKibana"
-                                      />
-                                    </EuiFlexItem>
-                                    <EuiFlexItem>
-                                      <EuiTitle
-                                        size="xxs"
-                                      >
-                                        <h3
-                                          className="euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Kibana
-                                        </h3>
-                                      </EuiTitle>
-                                    </EuiFlexItem>
-                                  </EuiFlexGroup>
-                                }
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-kibana"
-                                id="mockId"
-                                initialIsOpen={true}
-                                onToggle={[Function]}
-                                paddingSize="none"
+                              <EuiFlexItem
+                                grow={false}
                               >
                                 <div
-                                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-kibana"
-                                  onToggle={[Function]}
+                                  className="euiFlexItem euiFlexItem--flexGrowZero"
                                 >
-                                  <div
-                                    className="euiAccordion__triggerWrapper"
+                                  <EuiIcon
+                                    size="l"
+                                    type="logoObservability"
                                   >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded={true}
-                                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      onClick={[Function]}
-                                      type="button"
-                                    >
-                                      <span
-                                        className="euiAccordion__iconWrapper"
-                                      >
-                                        <EuiIcon
-                                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          size="m"
-                                          type="arrowRight"
-                                        >
-                                          <div
-                                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                            size="m"
-                                          />
-                                        </EuiIcon>
-                                      </span>
-                                      <span
-                                        className="euiIEFlexWrapFix"
-                                      >
-                                        <EuiFlexGroup
-                                          alignItems="center"
-                                          gutterSize="m"
-                                          responsive={false}
-                                        >
-                                          <div
-                                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <EuiFlexItem
-                                              grow={false}
-                                            >
-                                              <div
-                                                className="euiFlexItem euiFlexItem--flexGrowZero"
-                                              >
-                                                <EuiIcon
-                                                  size="l"
-                                                  type="logoKibana"
-                                                >
-                                                  <div
-                                                    data-euiicon-type="logoKibana"
-                                                    size="l"
-                                                  />
-                                                </EuiIcon>
-                                              </div>
-                                            </EuiFlexItem>
-                                            <EuiFlexItem>
-                                              <div
-                                                className="euiFlexItem"
-                                              >
-                                                <EuiTitle
-                                                  size="xxs"
-                                                >
-                                                  <h3
-                                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                    id="mockId__title"
-                                                  >
-                                                    Kibana
-                                                  </h3>
-                                                </EuiTitle>
-                                              </div>
-                                            </EuiFlexItem>
-                                          </div>
-                                        </EuiFlexGroup>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    className="euiAccordion__childWrapper"
-                                    id="mockId"
+                                    <div
+                                      data-euiicon-type="logoObservability"
+                                      size="l"
+                                    />
+                                  </EuiIcon>
+                                </div>
+                              </EuiFlexItem>
+                              <EuiFlexItem>
+                                <div
+                                  className="euiFlexItem"
+                                >
+                                  <EuiTitle
+                                    size="xxs"
                                   >
-                                    <EuiResizeObserver
-                                      onResize={[Function]}
+                                    <h3
+                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                      id="mockId__title"
                                     >
-                                      <div>
-                                        <div
-                                          className=""
-                                        >
-                                          <div
-                                            className="euiCollapsibleNavGroup__children"
-                                          >
-                                            <EuiListGroup
-                                              aria-label="Primary navigation links, Kibana"
-                                              color="subdued"
-                                              gutterSize="none"
-                                              listItems={
-                                                Array [
-                                                  Object {
-                                                    "data-test-subj": "collapsibleNavAppLink",
-                                                    "href": "discover",
-                                                    "isActive": false,
-                                                    "isDisabled": undefined,
-                                                    "label": "discover",
-                                                    "onClick": [Function],
-                                                  },
-                                                  Object {
-                                                    "data-test-subj": "collapsibleNavAppLink",
-                                                    "href": "visualize",
-                                                    "isActive": false,
-                                                    "isDisabled": undefined,
-                                                    "label": "visualize",
-                                                    "onClick": [Function],
-                                                  },
-                                                  Object {
-                                                    "data-test-subj": "collapsibleNavAppLink",
-                                                    "href": "dashboard",
-                                                    "isActive": false,
-                                                    "isDisabled": undefined,
-                                                    "label": "dashboard",
-                                                    "onClick": [Function],
-                                                  },
-                                                ]
-                                              }
-                                              maxWidth="none"
-                                              size="s"
-                                            >
-                                              <ul
-                                                aria-label="Primary navigation links, Kibana"
-                                                className="euiListGroup"
-                                                style={
-                                                  Object {
-                                                    "maxWidth": "none",
-                                                  }
-                                                }
-                                              >
-                                                <EuiListGroupItem
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="discover"
-                                                  isActive={false}
-                                                  key="title-0"
-                                                  label="discover"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink"
-                                                      href="discover"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="discover"
-                                                      >
-                                                        discover
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                                <EuiListGroupItem
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="visualize"
-                                                  isActive={false}
-                                                  key="title-1"
-                                                  label="visualize"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink"
-                                                      href="visualize"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="visualize"
-                                                      >
-                                                        visualize
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                                <EuiListGroupItem
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="dashboard"
-                                                  isActive={false}
-                                                  key="title-2"
-                                                  label="dashboard"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink"
-                                                      href="dashboard"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="dashboard"
-                                                      >
-                                                        dashboard
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                              </ul>
-                                            </EuiListGroup>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </EuiResizeObserver>
-                                  </div>
+                                      Observability
+                                    </h3>
+                                  </EuiTitle>
                                 </div>
-                              </EuiAccordion>
-                            </EuiCollapsibleNavGroup>
-                            <EuiCollapsibleNavGroup
-                              data-test-subj="collapsibleNavGroup-observability"
-                              iconType="logoObservability"
-                              initialIsOpen={true}
-                              isCollapsible={true}
-                              key="observability"
-                              onToggle={[Function]}
-                              title="Observability"
+                              </EuiFlexItem>
+                            </div>
+                          </EuiFlexGroup>
+                        </span>
+                      </button>
+                    </div>
+                    <div
+                      className="euiAccordion__childWrapper"
+                      id="mockId"
+                    >
+                      <EuiResizeObserver
+                        onResize={[Function]}
+                      >
+                        <div>
+                          <div
+                            className=""
+                          >
+                            <div
+                              className="euiCollapsibleNavGroup__children"
                             >
-                              <EuiAccordion
-                                arrowDisplay="right"
-                                buttonClassName="euiCollapsibleNavGroup__heading"
-                                buttonContent={
-                                  <EuiFlexGroup
-                                    alignItems="center"
-                                    gutterSize="m"
-                                    responsive={false}
-                                  >
-                                    <EuiFlexItem
-                                      grow={false}
-                                    >
-                                      <EuiIcon
-                                        size="l"
-                                        type="logoObservability"
-                                      />
-                                    </EuiFlexItem>
-                                    <EuiFlexItem>
-                                      <EuiTitle
-                                        size="xxs"
-                                      >
-                                        <h3
-                                          className="euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Observability
-                                        </h3>
-                                      </EuiTitle>
-                                    </EuiFlexItem>
-                                  </EuiFlexGroup>
+                              <EuiListGroup
+                                aria-label="Primary navigation links, Observability"
+                                color="subdued"
+                                gutterSize="none"
+                                listItems={
+                                  Array [
+                                    Object {
+                                      "data-test-subj": "collapsibleNavAppLink",
+                                      "href": "metrics",
+                                      "isActive": false,
+                                      "isDisabled": undefined,
+                                      "label": "metrics",
+                                      "onClick": [Function],
+                                    },
+                                    Object {
+                                      "data-test-subj": "collapsibleNavAppLink",
+                                      "href": "logs",
+                                      "isActive": false,
+                                      "isDisabled": undefined,
+                                      "label": "logs",
+                                      "onClick": [Function],
+                                    },
+                                  ]
                                 }
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-observability"
-                                id="mockId"
-                                initialIsOpen={true}
-                                onToggle={[Function]}
-                                paddingSize="none"
+                                maxWidth="none"
+                                size="s"
                               >
-                                <div
-                                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-observability"
-                                  onToggle={[Function]}
+                                <ul
+                                  aria-label="Primary navigation links, Observability"
+                                  className="euiListGroup"
+                                  style={
+                                    Object {
+                                      "maxWidth": "none",
+                                    }
+                                  }
                                 >
-                                  <div
-                                    className="euiAccordion__triggerWrapper"
+                                  <EuiListGroupItem
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink"
+                                    href="metrics"
+                                    isActive={false}
+                                    key="title-0"
+                                    label="metrics"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    wrapText={false}
                                   >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded={true}
-                                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      onClick={[Function]}
-                                      type="button"
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <span
-                                        className="euiAccordion__iconWrapper"
-                                      >
-                                        <EuiIcon
-                                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          size="m"
-                                          type="arrowRight"
-                                        >
-                                          <div
-                                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                            size="m"
-                                          />
-                                        </EuiIcon>
-                                      </span>
-                                      <span
-                                        className="euiIEFlexWrapFix"
+                                      <a
+                                        className="euiListGroupItem__button"
+                                        data-test-subj="collapsibleNavAppLink"
+                                        href="metrics"
+                                        onClick={[Function]}
+                                        rel="noreferrer"
                                       >
-                                        <EuiFlexGroup
-                                          alignItems="center"
-                                          gutterSize="m"
-                                          responsive={false}
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="metrics"
                                         >
-                                          <div
-                                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <EuiFlexItem
-                                              grow={false}
-                                            >
-                                              <div
-                                                className="euiFlexItem euiFlexItem--flexGrowZero"
-                                              >
-                                                <EuiIcon
-                                                  size="l"
-                                                  type="logoObservability"
-                                                >
-                                                  <div
-                                                    data-euiicon-type="logoObservability"
-                                                    size="l"
-                                                  />
-                                                </EuiIcon>
-                                              </div>
-                                            </EuiFlexItem>
-                                            <EuiFlexItem>
-                                              <div
-                                                className="euiFlexItem"
-                                              >
-                                                <EuiTitle
-                                                  size="xxs"
-                                                >
-                                                  <h3
-                                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                    id="mockId__title"
-                                                  >
-                                                    Observability
-                                                  </h3>
-                                                </EuiTitle>
-                                              </div>
-                                            </EuiFlexItem>
-                                          </div>
-                                        </EuiFlexGroup>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    className="euiAccordion__childWrapper"
-                                    id="mockId"
+                                          metrics
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                  <EuiListGroupItem
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink"
+                                    href="logs"
+                                    isActive={false}
+                                    key="title-1"
+                                    label="logs"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    wrapText={false}
                                   >
-                                    <EuiResizeObserver
-                                      onResize={[Function]}
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <div>
-                                        <div
-                                          className=""
+                                      <a
+                                        className="euiListGroupItem__button"
+                                        data-test-subj="collapsibleNavAppLink"
+                                        href="logs"
+                                        onClick={[Function]}
+                                        rel="noreferrer"
+                                      >
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="logs"
                                         >
-                                          <div
-                                            className="euiCollapsibleNavGroup__children"
-                                          >
-                                            <EuiListGroup
-                                              aria-label="Primary navigation links, Observability"
-                                              color="subdued"
-                                              gutterSize="none"
-                                              listItems={
-                                                Array [
-                                                  Object {
-                                                    "data-test-subj": "collapsibleNavAppLink",
-                                                    "href": "metrics",
-                                                    "isActive": false,
-                                                    "isDisabled": undefined,
-                                                    "label": "metrics",
-                                                    "onClick": [Function],
-                                                  },
-                                                  Object {
-                                                    "data-test-subj": "collapsibleNavAppLink",
-                                                    "href": "logs",
-                                                    "isActive": false,
-                                                    "isDisabled": undefined,
-                                                    "label": "logs",
-                                                    "onClick": [Function],
-                                                  },
-                                                ]
-                                              }
-                                              maxWidth="none"
-                                              size="s"
-                                            >
-                                              <ul
-                                                aria-label="Primary navigation links, Observability"
-                                                className="euiListGroup"
-                                                style={
-                                                  Object {
-                                                    "maxWidth": "none",
-                                                  }
-                                                }
-                                              >
-                                                <EuiListGroupItem
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="metrics"
-                                                  isActive={false}
-                                                  key="title-0"
-                                                  label="metrics"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink"
-                                                      href="metrics"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="metrics"
-                                                      >
-                                                        metrics
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                                <EuiListGroupItem
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="logs"
-                                                  isActive={false}
-                                                  key="title-1"
-                                                  label="logs"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink"
-                                                      href="logs"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="logs"
-                                                      >
-                                                        logs
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                              </ul>
-                                            </EuiListGroup>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </EuiResizeObserver>
-                                  </div>
-                                </div>
-                              </EuiAccordion>
-                            </EuiCollapsibleNavGroup>
-                            <EuiCollapsibleNavGroup
-                              data-test-subj="collapsibleNavGroup-security"
-                              iconType="logoSecurity"
-                              initialIsOpen={true}
-                              isCollapsible={true}
-                              key="security"
-                              onToggle={[Function]}
-                              title="Security"
+                                          logs
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                </ul>
+                              </EuiListGroup>
+                            </div>
+                          </div>
+                        </div>
+                      </EuiResizeObserver>
+                    </div>
+                  </div>
+                </EuiAccordion>
+              </EuiCollapsibleNavGroup>
+              <EuiCollapsibleNavGroup
+                data-test-subj="collapsibleNavGroup-security"
+                iconType="logoSecurity"
+                initialIsOpen={true}
+                isCollapsible={true}
+                key="security"
+                onToggle={[Function]}
+                title="Security"
+              >
+                <EuiAccordion
+                  arrowDisplay="right"
+                  buttonClassName="euiCollapsibleNavGroup__heading"
+                  buttonContent={
+                    <EuiFlexGroup
+                      alignItems="center"
+                      gutterSize="m"
+                      responsive={false}
+                    >
+                      <EuiFlexItem
+                        grow={false}
+                      >
+                        <EuiIcon
+                          size="l"
+                          type="logoSecurity"
+                        />
+                      </EuiFlexItem>
+                      <EuiFlexItem>
+                        <EuiTitle
+                          size="xxs"
+                        >
+                          <h3
+                            className="euiCollapsibleNavGroup__title"
+                            id="mockId__title"
+                          >
+                            Security
+                          </h3>
+                        </EuiTitle>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  }
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                  data-test-subj="collapsibleNavGroup-security"
+                  id="mockId"
+                  initialIsOpen={true}
+                  onToggle={[Function]}
+                  paddingSize="none"
+                >
+                  <div
+                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                    data-test-subj="collapsibleNavGroup-security"
+                    onToggle={[Function]}
+                  >
+                    <div
+                      className="euiAccordion__triggerWrapper"
+                    >
+                      <button
+                        aria-controls="mockId"
+                        aria-expanded={true}
+                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <span
+                          className="euiAccordion__iconWrapper"
+                        >
+                          <EuiIcon
+                            className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            size="m"
+                            type="arrowRight"
+                          >
+                            <div
+                              className="euiAccordion__icon euiAccordion__icon-isOpen"
+                              data-euiicon-type="arrowRight"
+                              size="m"
+                            />
+                          </EuiIcon>
+                        </span>
+                        <span
+                          className="euiIEFlexWrapFix"
+                        >
+                          <EuiFlexGroup
+                            alignItems="center"
+                            gutterSize="m"
+                            responsive={false}
+                          >
+                            <div
+                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                             >
-                              <EuiAccordion
-                                arrowDisplay="right"
-                                buttonClassName="euiCollapsibleNavGroup__heading"
-                                buttonContent={
-                                  <EuiFlexGroup
-                                    alignItems="center"
-                                    gutterSize="m"
-                                    responsive={false}
-                                  >
-                                    <EuiFlexItem
-                                      grow={false}
-                                    >
-                                      <EuiIcon
-                                        size="l"
-                                        type="logoSecurity"
-                                      />
-                                    </EuiFlexItem>
-                                    <EuiFlexItem>
-                                      <EuiTitle
-                                        size="xxs"
-                                      >
-                                        <h3
-                                          className="euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Security
-                                        </h3>
-                                      </EuiTitle>
-                                    </EuiFlexItem>
-                                  </EuiFlexGroup>
-                                }
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-security"
-                                id="mockId"
-                                initialIsOpen={true}
-                                onToggle={[Function]}
-                                paddingSize="none"
+                              <EuiFlexItem
+                                grow={false}
                               >
                                 <div
-                                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-security"
-                                  onToggle={[Function]}
+                                  className="euiFlexItem euiFlexItem--flexGrowZero"
                                 >
-                                  <div
-                                    className="euiAccordion__triggerWrapper"
+                                  <EuiIcon
+                                    size="l"
+                                    type="logoSecurity"
                                   >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded={true}
-                                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      onClick={[Function]}
-                                      type="button"
-                                    >
-                                      <span
-                                        className="euiAccordion__iconWrapper"
-                                      >
-                                        <EuiIcon
-                                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          size="m"
-                                          type="arrowRight"
-                                        >
-                                          <div
-                                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                            size="m"
-                                          />
-                                        </EuiIcon>
-                                      </span>
-                                      <span
-                                        className="euiIEFlexWrapFix"
-                                      >
-                                        <EuiFlexGroup
-                                          alignItems="center"
-                                          gutterSize="m"
-                                          responsive={false}
-                                        >
-                                          <div
-                                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <EuiFlexItem
-                                              grow={false}
-                                            >
-                                              <div
-                                                className="euiFlexItem euiFlexItem--flexGrowZero"
-                                              >
-                                                <EuiIcon
-                                                  size="l"
-                                                  type="logoSecurity"
-                                                >
-                                                  <div
-                                                    data-euiicon-type="logoSecurity"
-                                                    size="l"
-                                                  />
-                                                </EuiIcon>
-                                              </div>
-                                            </EuiFlexItem>
-                                            <EuiFlexItem>
-                                              <div
-                                                className="euiFlexItem"
-                                              >
-                                                <EuiTitle
-                                                  size="xxs"
-                                                >
-                                                  <h3
-                                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                    id="mockId__title"
-                                                  >
-                                                    Security
-                                                  </h3>
-                                                </EuiTitle>
-                                              </div>
-                                            </EuiFlexItem>
-                                          </div>
-                                        </EuiFlexGroup>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    className="euiAccordion__childWrapper"
-                                    id="mockId"
+                                    <div
+                                      data-euiicon-type="logoSecurity"
+                                      size="l"
+                                    />
+                                  </EuiIcon>
+                                </div>
+                              </EuiFlexItem>
+                              <EuiFlexItem>
+                                <div
+                                  className="euiFlexItem"
+                                >
+                                  <EuiTitle
+                                    size="xxs"
                                   >
-                                    <EuiResizeObserver
-                                      onResize={[Function]}
+                                    <h3
+                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                      id="mockId__title"
                                     >
-                                      <div>
-                                        <div
-                                          className=""
-                                        >
-                                          <div
-                                            className="euiCollapsibleNavGroup__children"
-                                          >
-                                            <EuiListGroup
-                                              aria-label="Primary navigation links, Security"
-                                              color="subdued"
-                                              gutterSize="none"
-                                              listItems={
-                                                Array [
-                                                  Object {
-                                                    "data-test-subj": "collapsibleNavAppLink",
-                                                    "href": "siem",
-                                                    "isActive": false,
-                                                    "isDisabled": undefined,
-                                                    "label": "siem",
-                                                    "onClick": [Function],
-                                                  },
-                                                ]
-                                              }
-                                              maxWidth="none"
-                                              size="s"
-                                            >
-                                              <ul
-                                                aria-label="Primary navigation links, Security"
-                                                className="euiListGroup"
-                                                style={
-                                                  Object {
-                                                    "maxWidth": "none",
-                                                  }
-                                                }
-                                              >
-                                                <EuiListGroupItem
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="siem"
-                                                  isActive={false}
-                                                  key="title-0"
-                                                  label="siem"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink"
-                                                      href="siem"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="siem"
-                                                      >
-                                                        siem
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                              </ul>
-                                            </EuiListGroup>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </EuiResizeObserver>
-                                  </div>
+                                      Security
+                                    </h3>
+                                  </EuiTitle>
                                 </div>
-                              </EuiAccordion>
-                            </EuiCollapsibleNavGroup>
-                            <EuiCollapsibleNavGroup
-                              data-test-subj="collapsibleNavGroup-management"
-                              initialIsOpen={true}
-                              isCollapsible={true}
-                              key="management"
-                              onToggle={[Function]}
-                              title="Management"
+                              </EuiFlexItem>
+                            </div>
+                          </EuiFlexGroup>
+                        </span>
+                      </button>
+                    </div>
+                    <div
+                      className="euiAccordion__childWrapper"
+                      id="mockId"
+                    >
+                      <EuiResizeObserver
+                        onResize={[Function]}
+                      >
+                        <div>
+                          <div
+                            className=""
+                          >
+                            <div
+                              className="euiCollapsibleNavGroup__children"
                             >
-                              <EuiAccordion
-                                arrowDisplay="right"
-                                buttonClassName="euiCollapsibleNavGroup__heading"
-                                buttonContent={
-                                  <EuiFlexGroup
-                                    alignItems="center"
-                                    gutterSize="m"
-                                    responsive={false}
-                                  >
-                                    <EuiFlexItem>
-                                      <EuiTitle
-                                        size="xxs"
-                                      >
-                                        <h3
-                                          className="euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Management
-                                        </h3>
-                                      </EuiTitle>
-                                    </EuiFlexItem>
-                                  </EuiFlexGroup>
+                              <EuiListGroup
+                                aria-label="Primary navigation links, Security"
+                                color="subdued"
+                                gutterSize="none"
+                                listItems={
+                                  Array [
+                                    Object {
+                                      "data-test-subj": "collapsibleNavAppLink",
+                                      "href": "siem",
+                                      "isActive": false,
+                                      "isDisabled": undefined,
+                                      "label": "siem",
+                                      "onClick": [Function],
+                                    },
+                                  ]
                                 }
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-management"
-                                id="mockId"
-                                initialIsOpen={true}
-                                onToggle={[Function]}
-                                paddingSize="none"
+                                maxWidth="none"
+                                size="s"
                               >
-                                <div
-                                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-management"
-                                  onToggle={[Function]}
+                                <ul
+                                  aria-label="Primary navigation links, Security"
+                                  className="euiListGroup"
+                                  style={
+                                    Object {
+                                      "maxWidth": "none",
+                                    }
+                                  }
                                 >
-                                  <div
-                                    className="euiAccordion__triggerWrapper"
+                                  <EuiListGroupItem
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink"
+                                    href="siem"
+                                    isActive={false}
+                                    key="title-0"
+                                    label="siem"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    wrapText={false}
                                   >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded={true}
-                                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      onClick={[Function]}
-                                      type="button"
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <span
-                                        className="euiAccordion__iconWrapper"
-                                      >
-                                        <EuiIcon
-                                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          size="m"
-                                          type="arrowRight"
-                                        >
-                                          <div
-                                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                            size="m"
-                                          />
-                                        </EuiIcon>
-                                      </span>
-                                      <span
-                                        className="euiIEFlexWrapFix"
+                                      <a
+                                        className="euiListGroupItem__button"
+                                        data-test-subj="collapsibleNavAppLink"
+                                        href="siem"
+                                        onClick={[Function]}
+                                        rel="noreferrer"
                                       >
-                                        <EuiFlexGroup
-                                          alignItems="center"
-                                          gutterSize="m"
-                                          responsive={false}
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="siem"
                                         >
-                                          <div
-                                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <EuiFlexItem>
-                                              <div
-                                                className="euiFlexItem"
-                                              >
-                                                <EuiTitle
-                                                  size="xxs"
-                                                >
-                                                  <h3
-                                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                    id="mockId__title"
-                                                  >
-                                                    Management
-                                                  </h3>
-                                                </EuiTitle>
-                                              </div>
-                                            </EuiFlexItem>
-                                          </div>
-                                        </EuiFlexGroup>
-                                      </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    className="euiAccordion__childWrapper"
-                                    id="mockId"
+                                          siem
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                </ul>
+                              </EuiListGroup>
+                            </div>
+                          </div>
+                        </div>
+                      </EuiResizeObserver>
+                    </div>
+                  </div>
+                </EuiAccordion>
+              </EuiCollapsibleNavGroup>
+              <EuiCollapsibleNavGroup
+                data-test-subj="collapsibleNavGroup-management"
+                initialIsOpen={true}
+                isCollapsible={true}
+                key="management"
+                onToggle={[Function]}
+                title="Management"
+              >
+                <EuiAccordion
+                  arrowDisplay="right"
+                  buttonClassName="euiCollapsibleNavGroup__heading"
+                  buttonContent={
+                    <EuiFlexGroup
+                      alignItems="center"
+                      gutterSize="m"
+                      responsive={false}
+                    >
+                      <EuiFlexItem>
+                        <EuiTitle
+                          size="xxs"
+                        >
+                          <h3
+                            className="euiCollapsibleNavGroup__title"
+                            id="mockId__title"
+                          >
+                            Management
+                          </h3>
+                        </EuiTitle>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  }
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                  data-test-subj="collapsibleNavGroup-management"
+                  id="mockId"
+                  initialIsOpen={true}
+                  onToggle={[Function]}
+                  paddingSize="none"
+                >
+                  <div
+                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
+                    data-test-subj="collapsibleNavGroup-management"
+                    onToggle={[Function]}
+                  >
+                    <div
+                      className="euiAccordion__triggerWrapper"
+                    >
+                      <button
+                        aria-controls="mockId"
+                        aria-expanded={true}
+                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <span
+                          className="euiAccordion__iconWrapper"
+                        >
+                          <EuiIcon
+                            className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            size="m"
+                            type="arrowRight"
+                          >
+                            <div
+                              className="euiAccordion__icon euiAccordion__icon-isOpen"
+                              data-euiicon-type="arrowRight"
+                              size="m"
+                            />
+                          </EuiIcon>
+                        </span>
+                        <span
+                          className="euiIEFlexWrapFix"
+                        >
+                          <EuiFlexGroup
+                            alignItems="center"
+                            gutterSize="m"
+                            responsive={false}
+                          >
+                            <div
+                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                            >
+                              <EuiFlexItem>
+                                <div
+                                  className="euiFlexItem"
+                                >
+                                  <EuiTitle
+                                    size="xxs"
                                   >
-                                    <EuiResizeObserver
-                                      onResize={[Function]}
+                                    <h3
+                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                      id="mockId__title"
                                     >
-                                      <div>
-                                        <div
-                                          className=""
-                                        >
-                                          <div
-                                            className="euiCollapsibleNavGroup__children"
-                                          >
-                                            <EuiListGroup
-                                              aria-label="Primary navigation links, Management"
-                                              color="subdued"
-                                              gutterSize="none"
-                                              listItems={
-                                                Array [
-                                                  Object {
-                                                    "data-test-subj": "collapsibleNavAppLink",
-                                                    "href": "monitoring",
-                                                    "isActive": false,
-                                                    "isDisabled": undefined,
-                                                    "label": "monitoring",
-                                                    "onClick": [Function],
-                                                  },
-                                                ]
-                                              }
-                                              maxWidth="none"
-                                              size="s"
-                                            >
-                                              <ul
-                                                aria-label="Primary navigation links, Management"
-                                                className="euiListGroup"
-                                                style={
-                                                  Object {
-                                                    "maxWidth": "none",
-                                                  }
-                                                }
-                                              >
-                                                <EuiListGroupItem
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink"
-                                                  href="monitoring"
-                                                  isActive={false}
-                                                  key="title-0"
-                                                  label="monitoring"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink"
-                                                      href="monitoring"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="monitoring"
-                                                      >
-                                                        monitoring
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                              </ul>
-                                            </EuiListGroup>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </EuiResizeObserver>
-                                  </div>
+                                      Management
+                                    </h3>
+                                  </EuiTitle>
                                 </div>
-                              </EuiAccordion>
-                            </EuiCollapsibleNavGroup>
-                            <EuiCollapsibleNavGroup
-                              data-test-subj="collapsibleNavGroup-noCategory"
-                              key="0"
+                              </EuiFlexItem>
+                            </div>
+                          </EuiFlexGroup>
+                        </span>
+                      </button>
+                    </div>
+                    <div
+                      className="euiAccordion__childWrapper"
+                      id="mockId"
+                    >
+                      <EuiResizeObserver
+                        onResize={[Function]}
+                      >
+                        <div>
+                          <div
+                            className=""
+                          >
+                            <div
+                              className="euiCollapsibleNavGroup__children"
                             >
-                              <div
-                                className="euiCollapsibleNavGroup"
-                                data-test-subj="collapsibleNavGroup-noCategory"
-                                id="mockId"
+                              <EuiListGroup
+                                aria-label="Primary navigation links, Management"
+                                color="subdued"
+                                gutterSize="none"
+                                listItems={
+                                  Array [
+                                    Object {
+                                      "data-test-subj": "collapsibleNavAppLink",
+                                      "href": "monitoring",
+                                      "isActive": false,
+                                      "isDisabled": undefined,
+                                      "label": "monitoring",
+                                      "onClick": [Function],
+                                    },
+                                  ]
+                                }
+                                maxWidth="none"
+                                size="s"
                               >
-                                <div
-                                  className="euiCollapsibleNavGroup__children"
+                                <ul
+                                  aria-label="Primary navigation links, Management"
+                                  className="euiListGroup"
+                                  style={
+                                    Object {
+                                      "maxWidth": "none",
+                                    }
+                                  }
                                 >
-                                  <EuiListGroup
-                                    flush={true}
+                                  <EuiListGroupItem
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink"
+                                    href="monitoring"
+                                    isActive={false}
+                                    key="title-0"
+                                    label="monitoring"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    wrapText={false}
                                   >
-                                    <ul
-                                      className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <EuiListGroupItem
-                                        color="text"
+                                      <a
+                                        className="euiListGroupItem__button"
                                         data-test-subj="collapsibleNavAppLink"
-                                        href="canvas"
-                                        isActive={false}
-                                        label="canvas"
+                                        href="monitoring"
                                         onClick={[Function]}
-                                        size="s"
+                                        rel="noreferrer"
                                       >
-                                        <li
-                                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="monitoring"
                                         >
-                                          <a
-                                            className="euiListGroupItem__button"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            href="canvas"
-                                            onClick={[Function]}
-                                            rel="noreferrer"
-                                          >
-                                            <span
-                                              className="euiListGroupItem__label"
-                                              title="canvas"
-                                            >
-                                              canvas
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </EuiListGroupItem>
-                                    </ul>
-                                  </EuiListGroup>
-                                </div>
-                              </div>
-                            </EuiCollapsibleNavGroup>
-                            <EuiShowFor
-                              sizes={
-                                Array [
-                                  "l",
-                                  "xl",
-                                ]
-                              }
+                                          monitoring
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                </ul>
+                              </EuiListGroup>
+                            </div>
+                          </div>
+                        </div>
+                      </EuiResizeObserver>
+                    </div>
+                  </div>
+                </EuiAccordion>
+              </EuiCollapsibleNavGroup>
+              <EuiCollapsibleNavGroup
+                data-test-subj="collapsibleNavGroup-noCategory"
+                key="0"
+              >
+                <div
+                  className="euiCollapsibleNavGroup"
+                  data-test-subj="collapsibleNavGroup-noCategory"
+                  id="mockId"
+                >
+                  <div
+                    className="euiCollapsibleNavGroup__children"
+                  >
+                    <EuiListGroup
+                      flush={true}
+                    >
+                      <ul
+                        className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                      >
+                        <EuiListGroupItem
+                          color="text"
+                          data-test-subj="collapsibleNavAppLink"
+                          href="canvas"
+                          isActive={false}
+                          label="canvas"
+                          onClick={[Function]}
+                          size="s"
+                        >
+                          <li
+                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                          >
+                            <a
+                              className="euiListGroupItem__button"
+                              data-test-subj="collapsibleNavAppLink"
+                              href="canvas"
+                              onClick={[Function]}
+                              rel="noreferrer"
                             >
-                              <EuiCollapsibleNavGroup
-                                className="eui-showFor--l eui-showFor--xl"
-                                key=".0"
+                              <span
+                                className="euiListGroupItem__label"
+                                title="canvas"
                               >
-                                <div
-                                  className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                                  id="mockId"
+                                canvas
+                              </span>
+                            </a>
+                          </li>
+                        </EuiListGroupItem>
+                      </ul>
+                    </EuiListGroup>
+                  </div>
+                </div>
+              </EuiCollapsibleNavGroup>
+              <EuiShowFor
+                sizes={
+                  Array [
+                    "l",
+                    "xl",
+                  ]
+                }
+              >
+                <EuiCollapsibleNavGroup
+                  className="eui-showFor--l eui-showFor--xl"
+                  key=".0"
+                >
+                  <div
+                    className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
+                    id="mockId"
+                  >
+                    <div
+                      className="euiCollapsibleNavGroup__children"
+                    >
+                      <EuiListGroup
+                        flush={true}
+                      >
+                        <ul
+                          className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                        >
+                          <EuiListGroupItem
+                            aria-label="Dock primary navigation"
+                            buttonRef={
+                              Object {
+                                "current": <button
+                                  aria-label="Dock primary navigation"
+                                  class="euiListGroupItem__button"
+                                  data-test-subj="collapsible-nav-lock"
+                                  type="button"
                                 >
                                   <div
-                                    className="euiCollapsibleNavGroup__children"
+                                    class="euiListGroupItem__icon"
+                                    data-euiicon-type="lockOpen"
+                                  />
+                                  <span
+                                    class="euiListGroupItem__label"
+                                    title="Dock navigation"
                                   >
-                                    <EuiListGroup
-                                      flush={true}
-                                    >
-                                      <ul
-                                        className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                      >
-                                        <EuiListGroupItem
-                                          aria-label="Dock primary navigation"
-                                          buttonRef={
-                                            Object {
-                                              "current": <button
-                                                aria-label="Dock primary navigation"
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsible-nav-lock"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiListGroupItem__icon"
-                                                  data-euiicon-type="lockOpen"
-                                                />
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="Dock navigation"
-                                                >
-                                                  Dock navigation
-                                                </span>
-                                              </button>,
-                                            }
-                                          }
-                                          color="subdued"
-                                          data-test-subj="collapsible-nav-lock"
-                                          iconType="lockOpen"
-                                          label="Dock navigation"
-                                          onClick={[Function]}
-                                          size="xs"
-                                        >
-                                          <li
-                                            className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <button
-                                              aria-label="Dock primary navigation"
-                                              className="euiListGroupItem__button"
-                                              data-test-subj="collapsible-nav-lock"
-                                              disabled={false}
-                                              onClick={[Function]}
-                                              type="button"
-                                            >
-                                              <EuiIcon
-                                                className="euiListGroupItem__icon"
-                                                type="lockOpen"
-                                              >
-                                                <div
-                                                  className="euiListGroupItem__icon"
-                                                  data-euiicon-type="lockOpen"
-                                                />
-                                              </EuiIcon>
-                                              <span
-                                                className="euiListGroupItem__label"
-                                                title="Dock navigation"
-                                              >
-                                                Dock navigation
-                                              </span>
-                                            </button>
-                                          </li>
-                                        </EuiListGroupItem>
-                                      </ul>
-                                    </EuiListGroup>
-                                  </div>
-                                </div>
-                              </EuiCollapsibleNavGroup>
-                            </EuiShowFor>
-                          </div>
-                        </EuiFlexItem>
-                        <EuiScreenReaderOnly
-                          showOnFocus={true}
-                        >
-                          <EuiButtonEmpty
-                            className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                            iconType="cross"
-                            onClick={[Function]}
-                            size="xs"
-                            textProps={
-                              Object {
-                                "className": "euiCollapsibleNav__closeButtonText",
+                                    Dock navigation
+                                  </span>
+                                </button>,
                               }
                             }
+                            color="subdued"
+                            data-test-subj="collapsible-nav-lock"
+                            iconType="lockOpen"
+                            label="Dock navigation"
+                            onClick={[Function]}
+                            size="xs"
                           >
-                            <button
-                              className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                              onClick={[Function]}
-                              type="button"
+                            <li
+                              className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
                             >
-                              <EuiButtonContent
-                                className="euiButtonEmpty__content"
-                                iconSide="left"
-                                iconType="cross"
-                                textProps={
-                                  Object {
-                                    "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
-                                  }
-                                }
+                              <button
+                                aria-label="Dock primary navigation"
+                                className="euiListGroupItem__button"
+                                data-test-subj="collapsible-nav-lock"
+                                disabled={false}
+                                onClick={[Function]}
+                                type="button"
                               >
+                                <EuiIcon
+                                  className="euiListGroupItem__icon"
+                                  type="lockOpen"
+                                >
+                                  <div
+                                    className="euiListGroupItem__icon"
+                                    data-euiicon-type="lockOpen"
+                                  />
+                                </EuiIcon>
                                 <span
-                                  className="euiButtonContent euiButtonEmpty__content"
+                                  className="euiListGroupItem__label"
+                                  title="Dock navigation"
                                 >
-                                  <EuiIcon
-                                    className="euiButtonContent__icon"
-                                    size="m"
-                                    type="cross"
-                                  >
-                                    <div
-                                      className="euiButtonContent__icon"
-                                      data-euiicon-type="cross"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                  <span
-                                    className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                                  >
-                                    <EuiI18n
-                                      default="close"
-                                      token="euiCollapsibleNav.closeButtonLabel"
-                                    >
-                                      close
-                                    </EuiI18n>
-                                  </span>
+                                  Dock navigation
                                 </span>
-                              </EuiButtonContent>
-                            </button>
-                          </EuiButtonEmpty>
-                        </EuiScreenReaderOnly>
-                      </nav>
+                              </button>
+                            </li>
+                          </EuiListGroupItem>
+                        </ul>
+                      </EuiListGroup>
                     </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
+                  </div>
+                </EuiCollapsibleNavGroup>
+              </EuiShowFor>
+            </div>
+          </EuiFlexItem>
+          <EuiScreenReaderOnly
+            showOnFocus={true}
+          >
+            <EuiButtonEmpty
+              className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+              iconType="cross"
+              onClick={[Function]}
+              size="xs"
+              textProps={
+                Object {
+                  "className": "euiCollapsibleNav__closeButtonText",
+                }
+              }
+            >
+              <button
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+                onClick={[Function]}
+                type="button"
+              >
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="left"
+                  iconType="cross"
+                  textProps={
                     Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
+                      "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
                     }
                   }
                 >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
+                  <span
+                    className="euiButtonContent euiButtonEmpty__content"
                   >
-                    <Effect
-                      noIsolation={true}
-                      setLockProps={[Function]}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      size="m"
+                      type="cross"
                     >
-                      <Component>
-                        <Sheet
-                          styles="
- [data-focus-on-hidden] {
-   pointer-events: none !important;
- }
-"
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </div>
-        </OutsideEventDetector>
-      </EuiOutsideClickDetector>
+                      <div
+                        className="euiButtonContent__icon"
+                        data-euiicon-type="cross"
+                        size="m"
+                      />
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
+                    >
+                      <EuiI18n
+                        default="close"
+                        token="euiCollapsibleNav.closeButtonLabel"
+                      >
+                        close
+                      </EuiI18n>
+                    </span>
+                  </span>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiScreenReaderOnly>
+        </nav>
+      </div>
     </EuiFocusTrap>
   </EuiCollapsibleNav>
 </CollapsibleNav>
@@ -5439,621 +2471,442 @@ exports[`CollapsibleNav renders the default nav 2`] = `
       clickOutsideDisables={true}
       disabled={false}
     >
-      <EuiOutsideClickDetector
-        isDisabled={false}
-        onOutsideClick={[Function]}
+      <div
+        data-eui="EuiFocusTrap"
       >
-        <OutsideEventDetector
-          handleEvent={[Function]}
-          onMouseDown={[Function]}
-          onMouseUp={[Function]}
-          onTouchEnd={[Function]}
-          onTouchStart={[Function]}
+        <nav
+          aria-label="Primary"
+          className="euiCollapsibleNav"
+          data-test-subj="collapsibleNav"
+          id="collapsibe-nav"
         >
-          <div
-            onMouseDown={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
+          <EuiFlexItem
+            grow={false}
+            style={
+              Object {
+                "flexShrink": 0,
+              }
+            }
           >
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
             >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
-              >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
+              <EuiCollapsibleNavGroup
+                background="light"
+                className="eui-yScroll"
+                style={
+                  Object {
+                    "maxHeight": "40vh",
                   }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={true}
-                  lockProps={
+                }
+              >
+                <div
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                  id="mockId"
+                  style={
                     Object {
-                      "allowPinchZoom": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "shards": undefined,
-                      "sideCar": [Function],
+                      "maxHeight": "40vh",
                     }
                   }
-                  noFocusGuards={false}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={-1}
-                  />
-                  <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={-1}
-                  />
-                  <ForwardRef
-                    data-focus-lock-disabled="disabled"
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
+                    className="euiCollapsibleNavGroup__children"
                   >
-                    <div
-                      data-focus-lock-disabled="disabled"
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onWheelCapture={[Function]}
+                    <EuiListGroup
+                      aria-label="Pinned links"
+                      color="text"
+                      gutterSize="none"
+                      listItems={
+                        Array [
+                          Object {
+                            "href": "/",
+                            "iconType": "home",
+                            "label": "Home",
+                            "onClick": [Function],
+                          },
+                        ]
+                      }
+                      maxWidth="none"
+                      size="s"
                     >
-                      <nav
-                        aria-label="Primary"
-                        className="euiCollapsibleNav"
-                        data-test-subj="collapsibleNav"
-                        id="collapsibe-nav"
-                      >
-                        <EuiFlexItem
-                          grow={false}
-                          style={
-                            Object {
-                              "flexShrink": 0,
-                            }
+                      <ul
+                        aria-label="Pinned links"
+                        className="euiListGroup"
+                        style={
+                          Object {
+                            "maxWidth": "none",
                           }
+                        }
+                      >
+                        <EuiListGroupItem
+                          color="text"
+                          href="/"
+                          iconType="home"
+                          key="title-0"
+                          label="Home"
+                          onClick={[Function]}
+                          showToolTip={false}
+                          size="s"
+                          wrapText={false}
                         >
-                          <div
-                            className="euiFlexItem euiFlexItem--flexGrowZero"
-                            style={
-                              Object {
-                                "flexShrink": 0,
-                              }
-                            }
+                          <li
+                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                           >
-                            <EuiCollapsibleNavGroup
-                              background="light"
-                              className="eui-yScroll"
-                              style={
-                                Object {
-                                  "maxHeight": "40vh",
-                                }
-                              }
+                            <a
+                              className="euiListGroupItem__button"
+                              href="/"
+                              onClick={[Function]}
+                              rel="noreferrer"
                             >
-                              <div
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                id="mockId"
-                                style={
-                                  Object {
-                                    "maxHeight": "40vh",
-                                  }
-                                }
+                              <EuiIcon
+                                className="euiListGroupItem__icon"
+                                type="home"
                               >
                                 <div
-                                  className="euiCollapsibleNavGroup__children"
-                                >
-                                  <EuiListGroup
-                                    aria-label="Pinned links"
-                                    color="text"
-                                    gutterSize="none"
-                                    listItems={
-                                      Array [
-                                        Object {
-                                          "href": "/",
-                                          "iconType": "home",
-                                          "label": "Home",
-                                          "onClick": [Function],
-                                        },
-                                      ]
-                                    }
-                                    maxWidth="none"
-                                    size="s"
-                                  >
-                                    <ul
-                                      aria-label="Pinned links"
-                                      className="euiListGroup"
-                                      style={
-                                        Object {
-                                          "maxWidth": "none",
-                                        }
-                                      }
-                                    >
-                                      <EuiListGroupItem
-                                        color="text"
-                                        href="/"
-                                        iconType="home"
-                                        key="title-0"
-                                        label="Home"
-                                        onClick={[Function]}
-                                        showToolTip={false}
-                                        size="s"
-                                        wrapText={false}
-                                      >
-                                        <li
-                                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            className="euiListGroupItem__button"
-                                            href="/"
-                                            onClick={[Function]}
-                                            rel="noreferrer"
-                                          >
-                                            <EuiIcon
-                                              className="euiListGroupItem__icon"
-                                              type="home"
-                                            >
-                                              <div
-                                                className="euiListGroupItem__icon"
-                                                data-euiicon-type="home"
-                                              />
-                                            </EuiIcon>
-                                            <span
-                                              className="euiListGroupItem__label"
-                                              title="Home"
-                                            >
-                                              Home
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </EuiListGroupItem>
-                                    </ul>
-                                  </EuiListGroup>
-                                </div>
-                              </div>
-                            </EuiCollapsibleNavGroup>
-                          </div>
-                        </EuiFlexItem>
-                        <EuiCollapsibleNavGroup
-                          background="light"
-                          data-test-subj="collapsibleNavGroup-recentlyViewed"
-                          initialIsOpen={true}
-                          isCollapsible={true}
-                          key="recentlyViewed"
-                          onToggle={[Function]}
-                          title="Recently viewed"
-                        >
-                          <EuiAccordion
-                            arrowDisplay="right"
-                            buttonClassName="euiCollapsibleNavGroup__heading"
-                            buttonContent={
-                              <EuiFlexGroup
-                                alignItems="center"
-                                gutterSize="m"
-                                responsive={false}
+                                  className="euiListGroupItem__icon"
+                                  data-euiicon-type="home"
+                                />
+                              </EuiIcon>
+                              <span
+                                className="euiListGroupItem__label"
+                                title="Home"
                               >
-                                <EuiFlexItem>
-                                  <EuiTitle
-                                    size="xxs"
-                                  >
-                                    <h3
-                                      className="euiCollapsibleNavGroup__title"
-                                      id="mockId__title"
-                                    >
-                                      Recently viewed
-                                    </h3>
-                                  </EuiTitle>
-                                </EuiFlexItem>
-                              </EuiFlexGroup>
-                            }
-                            className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                            data-test-subj="collapsibleNavGroup-recentlyViewed"
-                            id="mockId"
-                            initialIsOpen={true}
-                            onToggle={[Function]}
-                            paddingSize="none"
-                          >
+                                Home
+                              </span>
+                            </a>
+                          </li>
+                        </EuiListGroupItem>
+                      </ul>
+                    </EuiListGroup>
+                  </div>
+                </div>
+              </EuiCollapsibleNavGroup>
+            </div>
+          </EuiFlexItem>
+          <EuiCollapsibleNavGroup
+            background="light"
+            data-test-subj="collapsibleNavGroup-recentlyViewed"
+            initialIsOpen={true}
+            isCollapsible={true}
+            key="recentlyViewed"
+            onToggle={[Function]}
+            title="Recently viewed"
+          >
+            <EuiAccordion
+              arrowDisplay="right"
+              buttonClassName="euiCollapsibleNavGroup__heading"
+              buttonContent={
+                <EuiFlexGroup
+                  alignItems="center"
+                  gutterSize="m"
+                  responsive={false}
+                >
+                  <EuiFlexItem>
+                    <EuiTitle
+                      size="xxs"
+                    >
+                      <h3
+                        className="euiCollapsibleNavGroup__title"
+                        id="mockId__title"
+                      >
+                        Recently viewed
+                      </h3>
+                    </EuiTitle>
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              }
+              className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+              data-test-subj="collapsibleNavGroup-recentlyViewed"
+              id="mockId"
+              initialIsOpen={true}
+              onToggle={[Function]}
+              paddingSize="none"
+            >
+              <div
+                className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+                data-test-subj="collapsibleNavGroup-recentlyViewed"
+                onToggle={[Function]}
+              >
+                <div
+                  className="euiAccordion__triggerWrapper"
+                >
+                  <button
+                    aria-controls="mockId"
+                    aria-expanded={true}
+                    className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                    onClick={[Function]}
+                    type="button"
+                  >
+                    <span
+                      className="euiAccordion__iconWrapper"
+                    >
+                      <EuiIcon
+                        className="euiAccordion__icon euiAccordion__icon-isOpen"
+                        size="m"
+                        type="arrowRight"
+                      >
+                        <div
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          data-euiicon-type="arrowRight"
+                          size="m"
+                        />
+                      </EuiIcon>
+                    </span>
+                    <span
+                      className="euiIEFlexWrapFix"
+                    >
+                      <EuiFlexGroup
+                        alignItems="center"
+                        gutterSize="m"
+                        responsive={false}
+                      >
+                        <div
+                          className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                        >
+                          <EuiFlexItem>
                             <div
-                              className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-recentlyViewed"
-                              onToggle={[Function]}
+                              className="euiFlexItem"
                             >
-                              <div
-                                className="euiAccordion__triggerWrapper"
-                              >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded={true}
-                                  className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  onClick={[Function]}
-                                  type="button"
-                                >
-                                  <span
-                                    className="euiAccordion__iconWrapper"
-                                  >
-                                    <EuiIcon
-                                      className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      size="m"
-                                      type="arrowRight"
-                                    >
-                                      <div
-                                        className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                        size="m"
-                                      />
-                                    </EuiIcon>
-                                  </span>
-                                  <span
-                                    className="euiIEFlexWrapFix"
-                                  >
-                                    <EuiFlexGroup
-                                      alignItems="center"
-                                      gutterSize="m"
-                                      responsive={false}
-                                    >
-                                      <div
-                                        className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                      >
-                                        <EuiFlexItem>
-                                          <div
-                                            className="euiFlexItem"
-                                          >
-                                            <EuiTitle
-                                              size="xxs"
-                                            >
-                                              <h3
-                                                className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                id="mockId__title"
-                                              >
-                                                Recently viewed
-                                              </h3>
-                                            </EuiTitle>
-                                          </div>
-                                        </EuiFlexItem>
-                                      </div>
-                                    </EuiFlexGroup>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                className="euiAccordion__childWrapper"
-                                id="mockId"
+                              <EuiTitle
+                                size="xxs"
                               >
-                                <EuiResizeObserver
-                                  onResize={[Function]}
+                                <h3
+                                  className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                  id="mockId__title"
                                 >
-                                  <div>
-                                    <div
-                                      className=""
-                                    >
-                                      <div
-                                        className="euiCollapsibleNavGroup__children"
-                                      >
-                                        <EuiText
-                                          color="subdued"
-                                          size="s"
-                                          style={
-                                            Object {
-                                              "padding": "0 8px 8px",
-                                            }
-                                          }
-                                        >
-                                          <div
-                                            className="euiText euiText--small"
-                                            style={
-                                              Object {
-                                                "padding": "0 8px 8px",
-                                              }
-                                            }
-                                          >
-                                            <EuiTextColor
-                                              color="subdued"
-                                              component="div"
-                                            >
-                                              <div
-                                                className="euiTextColor euiTextColor--subdued"
-                                              >
-                                                <p>
-                                                  No recently viewed items
-                                                </p>
-                                              </div>
-                                            </EuiTextColor>
-                                          </div>
-                                        </EuiText>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </EuiResizeObserver>
-                              </div>
+                                  Recently viewed
+                                </h3>
+                              </EuiTitle>
                             </div>
-                          </EuiAccordion>
-                        </EuiCollapsibleNavGroup>
-                        <EuiHorizontalRule
-                          margin="none"
-                        >
-                          <hr
-                            className="euiHorizontalRule euiHorizontalRule--full"
-                          />
-                        </EuiHorizontalRule>
-                        <EuiFlexItem
-                          className="eui-yScroll"
+                          </EuiFlexItem>
+                        </div>
+                      </EuiFlexGroup>
+                    </span>
+                  </button>
+                </div>
+                <div
+                  className="euiAccordion__childWrapper"
+                  id="mockId"
+                >
+                  <EuiResizeObserver
+                    onResize={[Function]}
+                  >
+                    <div>
+                      <div
+                        className=""
+                      >
+                        <div
+                          className="euiCollapsibleNavGroup__children"
                         >
-                          <div
-                            className="euiFlexItem eui-yScroll"
+                          <EuiText
+                            color="subdued"
+                            size="s"
+                            style={
+                              Object {
+                                "padding": "0 8px 8px",
+                              }
+                            }
                           >
-                            <EuiShowFor
-                              sizes={
-                                Array [
-                                  "l",
-                                  "xl",
-                                ]
+                            <div
+                              className="euiText euiText--small"
+                              style={
+                                Object {
+                                  "padding": "0 8px 8px",
+                                }
                               }
                             >
-                              <EuiCollapsibleNavGroup
-                                className="eui-showFor--l eui-showFor--xl"
-                                key=".0"
+                              <EuiTextColor
+                                color="subdued"
+                                component="div"
                               >
                                 <div
-                                  className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                                  id="mockId"
+                                  className="euiTextColor euiTextColor--subdued"
                                 >
-                                  <div
-                                    className="euiCollapsibleNavGroup__children"
-                                  >
-                                    <EuiListGroup
-                                      flush={true}
-                                    >
-                                      <ul
-                                        className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                      >
-                                        <EuiListGroupItem
-                                          aria-label="Dock primary navigation"
-                                          buttonRef={
-                                            Object {
-                                              "current": <button
-                                                aria-label="Dock primary navigation"
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsible-nav-lock"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiListGroupItem__icon"
-                                                  data-euiicon-type="lockOpen"
-                                                />
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="Dock navigation"
-                                                >
-                                                  Dock navigation
-                                                </span>
-                                              </button>,
-                                            }
-                                          }
-                                          color="subdued"
-                                          data-test-subj="collapsible-nav-lock"
-                                          iconType="lockOpen"
-                                          label="Dock navigation"
-                                          onClick={[Function]}
-                                          size="xs"
-                                        >
-                                          <li
-                                            className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <button
-                                              aria-label="Dock primary navigation"
-                                              className="euiListGroupItem__button"
-                                              data-test-subj="collapsible-nav-lock"
-                                              disabled={false}
-                                              onClick={[Function]}
-                                              type="button"
-                                            >
-                                              <EuiIcon
-                                                className="euiListGroupItem__icon"
-                                                type="lockOpen"
-                                              >
-                                                <div
-                                                  className="euiListGroupItem__icon"
-                                                  data-euiicon-type="lockOpen"
-                                                />
-                                              </EuiIcon>
-                                              <span
-                                                className="euiListGroupItem__label"
-                                                title="Dock navigation"
-                                              >
-                                                Dock navigation
-                                              </span>
-                                            </button>
-                                          </li>
-                                        </EuiListGroupItem>
-                                      </ul>
-                                    </EuiListGroup>
-                                  </div>
+                                  <p>
+                                    No recently viewed items
+                                  </p>
                                 </div>
-                              </EuiCollapsibleNavGroup>
-                            </EuiShowFor>
-                          </div>
-                        </EuiFlexItem>
-                        <EuiScreenReaderOnly
-                          showOnFocus={true}
+                              </EuiTextColor>
+                            </div>
+                          </EuiText>
+                        </div>
+                      </div>
+                    </div>
+                  </EuiResizeObserver>
+                </div>
+              </div>
+            </EuiAccordion>
+          </EuiCollapsibleNavGroup>
+          <EuiHorizontalRule
+            margin="none"
+          >
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full"
+            />
+          </EuiHorizontalRule>
+          <EuiFlexItem
+            className="eui-yScroll"
+          >
+            <div
+              className="euiFlexItem eui-yScroll"
+            >
+              <EuiShowFor
+                sizes={
+                  Array [
+                    "l",
+                    "xl",
+                  ]
+                }
+              >
+                <EuiCollapsibleNavGroup
+                  className="eui-showFor--l eui-showFor--xl"
+                  key=".0"
+                >
+                  <div
+                    className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
+                    id="mockId"
+                  >
+                    <div
+                      className="euiCollapsibleNavGroup__children"
+                    >
+                      <EuiListGroup
+                        flush={true}
+                      >
+                        <ul
+                          className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
                         >
-                          <EuiButtonEmpty
-                            className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                            iconType="cross"
-                            onClick={[Function]}
-                            size="xs"
-                            textProps={
+                          <EuiListGroupItem
+                            aria-label="Dock primary navigation"
+                            buttonRef={
                               Object {
-                                "className": "euiCollapsibleNav__closeButtonText",
+                                "current": <button
+                                  aria-label="Dock primary navigation"
+                                  class="euiListGroupItem__button"
+                                  data-test-subj="collapsible-nav-lock"
+                                  type="button"
+                                >
+                                  <div
+                                    class="euiListGroupItem__icon"
+                                    data-euiicon-type="lockOpen"
+                                  />
+                                  <span
+                                    class="euiListGroupItem__label"
+                                    title="Dock navigation"
+                                  >
+                                    Dock navigation
+                                  </span>
+                                </button>,
                               }
                             }
+                            color="subdued"
+                            data-test-subj="collapsible-nav-lock"
+                            iconType="lockOpen"
+                            label="Dock navigation"
+                            onClick={[Function]}
+                            size="xs"
                           >
-                            <button
-                              className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                              onClick={[Function]}
-                              type="button"
+                            <li
+                              className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
                             >
-                              <EuiButtonContent
-                                className="euiButtonEmpty__content"
-                                iconSide="left"
-                                iconType="cross"
-                                textProps={
-                                  Object {
-                                    "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
-                                  }
-                                }
+                              <button
+                                aria-label="Dock primary navigation"
+                                className="euiListGroupItem__button"
+                                data-test-subj="collapsible-nav-lock"
+                                disabled={false}
+                                onClick={[Function]}
+                                type="button"
                               >
+                                <EuiIcon
+                                  className="euiListGroupItem__icon"
+                                  type="lockOpen"
+                                >
+                                  <div
+                                    className="euiListGroupItem__icon"
+                                    data-euiicon-type="lockOpen"
+                                  />
+                                </EuiIcon>
                                 <span
-                                  className="euiButtonContent euiButtonEmpty__content"
+                                  className="euiListGroupItem__label"
+                                  title="Dock navigation"
                                 >
-                                  <EuiIcon
-                                    className="euiButtonContent__icon"
-                                    size="m"
-                                    type="cross"
-                                  >
-                                    <div
-                                      className="euiButtonContent__icon"
-                                      data-euiicon-type="cross"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                  <span
-                                    className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                                  >
-                                    <EuiI18n
-                                      default="close"
-                                      token="euiCollapsibleNav.closeButtonLabel"
-                                    >
-                                      close
-                                    </EuiI18n>
-                                  </span>
+                                  Dock navigation
                                 </span>
-                              </EuiButtonContent>
-                            </button>
-                          </EuiButtonEmpty>
-                        </EuiScreenReaderOnly>
-                      </nav>
+                              </button>
+                            </li>
+                          </EuiListGroupItem>
+                        </ul>
+                      </EuiListGroup>
                     </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={-1}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
+                  </div>
+                </EuiCollapsibleNavGroup>
+              </EuiShowFor>
+            </div>
+          </EuiFlexItem>
+          <EuiScreenReaderOnly
+            showOnFocus={true}
+          >
+            <EuiButtonEmpty
+              className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+              iconType="cross"
+              onClick={[Function]}
+              size="xs"
+              textProps={
+                Object {
+                  "className": "euiCollapsibleNav__closeButtonText",
+                }
+              }
+            >
+              <button
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+                onClick={[Function]}
+                type="button"
+              >
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="left"
+                  iconType="cross"
+                  textProps={
                     Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
+                      "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
                     }
                   }
                 >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
+                  <span
+                    className="euiButtonContent euiButtonEmpty__content"
                   >
-                    <Effect
-                      noIsolation={true}
-                      setLockProps={[Function]}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      size="m"
+                      type="cross"
                     >
-                      <Component>
-                        <Sheet
-                          styles="
- [data-focus-on-hidden] {
-   pointer-events: none !important;
- }
-"
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </div>
-        </OutsideEventDetector>
-      </EuiOutsideClickDetector>
+                      <div
+                        className="euiButtonContent__icon"
+                        data-euiicon-type="cross"
+                        size="m"
+                      />
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
+                    >
+                      <EuiI18n
+                        default="close"
+                        token="euiCollapsibleNav.closeButtonLabel"
+                      >
+                        close
+                      </EuiI18n>
+                    </span>
+                  </span>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiScreenReaderOnly>
+        </nav>
+      </div>
     </EuiFocusTrap>
   </EuiCollapsibleNav>
 </CollapsibleNav>
@@ -6299,581 +3152,442 @@ exports[`CollapsibleNav renders the default nav 3`] = `
       clickOutsideDisables={true}
       disabled={true}
     >
-      <EuiOutsideClickDetector
-        isDisabled={true}
-        onOutsideClick={[Function]}
+      <div
+        data-eui="EuiFocusTrap"
       >
-        <OutsideEventDetector
-          handleEvent={[Function]}
-          onMouseDown={[Function]}
-          onMouseUp={[Function]}
-          onTouchEnd={[Function]}
-          onTouchStart={[Function]}
+        <nav
+          aria-label="Primary"
+          className="euiCollapsibleNav euiCollapsibleNav--isDocked"
+          data-test-subj="collapsibleNav"
+          id="collapsibe-nav"
         >
-          <div
-            onMouseDown={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
+          <EuiFlexItem
+            grow={false}
+            style={
+              Object {
+                "flexShrink": 0,
+              }
+            }
           >
-            <ForwardRef
-              enabled={false}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
             >
-              <ForwardRef
-                enabled={false}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
-              >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
+              <EuiCollapsibleNavGroup
+                background="light"
+                className="eui-yScroll"
+                style={
+                  Object {
+                    "maxHeight": "40vh",
                   }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={true}
-                  lockProps={
+                }
+              >
+                <div
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                  id="mockId"
+                  style={
                     Object {
-                      "allowPinchZoom": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
+                      "maxHeight": "40vh",
                     }
                   }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={-1}
-                  />
-                  <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
+                    className="euiCollapsibleNavGroup__children"
+                  >
+                    <EuiListGroup
+                      aria-label="Pinned links"
+                      color="text"
+                      gutterSize="none"
+                      listItems={
+                        Array [
+                          Object {
+                            "href": "/",
+                            "iconType": "home",
+                            "label": "Home",
+                            "onClick": [Function],
+                          },
+                        ]
                       }
-                    }
-                    tabIndex={-1}
-                  />
-                  <ForwardRef
-                    data-focus-lock-disabled="disabled"
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
+                      maxWidth="none"
+                      size="s"
+                    >
+                      <ul
+                        aria-label="Pinned links"
+                        className="euiListGroup"
+                        style={
+                          Object {
+                            "maxWidth": "none",
+                          }
+                        }
+                      >
+                        <EuiListGroupItem
+                          color="text"
+                          href="/"
+                          iconType="home"
+                          key="title-0"
+                          label="Home"
+                          onClick={[Function]}
+                          showToolTip={false}
+                          size="s"
+                          wrapText={false}
+                        >
+                          <li
+                            className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                          >
+                            <a
+                              className="euiListGroupItem__button"
+                              href="/"
+                              onClick={[Function]}
+                              rel="noreferrer"
+                            >
+                              <EuiIcon
+                                className="euiListGroupItem__icon"
+                                type="home"
+                              >
+                                <div
+                                  className="euiListGroupItem__icon"
+                                  data-euiicon-type="home"
+                                />
+                              </EuiIcon>
+                              <span
+                                className="euiListGroupItem__label"
+                                title="Home"
+                              >
+                                Home
+                              </span>
+                            </a>
+                          </li>
+                        </EuiListGroupItem>
+                      </ul>
+                    </EuiListGroup>
+                  </div>
+                </div>
+              </EuiCollapsibleNavGroup>
+            </div>
+          </EuiFlexItem>
+          <EuiCollapsibleNavGroup
+            background="light"
+            data-test-subj="collapsibleNavGroup-recentlyViewed"
+            initialIsOpen={true}
+            isCollapsible={true}
+            key="recentlyViewed"
+            onToggle={[Function]}
+            title="Recently viewed"
+          >
+            <EuiAccordion
+              arrowDisplay="right"
+              buttonClassName="euiCollapsibleNavGroup__heading"
+              buttonContent={
+                <EuiFlexGroup
+                  alignItems="center"
+                  gutterSize="m"
+                  responsive={false}
+                >
+                  <EuiFlexItem>
+                    <EuiTitle
+                      size="xxs"
+                    >
+                      <h3
+                        className="euiCollapsibleNavGroup__title"
+                        id="mockId__title"
+                      >
+                        Recently viewed
+                      </h3>
+                    </EuiTitle>
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              }
+              className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+              data-test-subj="collapsibleNavGroup-recentlyViewed"
+              id="mockId"
+              initialIsOpen={true}
+              onToggle={[Function]}
+              paddingSize="none"
+            >
+              <div
+                className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+                data-test-subj="collapsibleNavGroup-recentlyViewed"
+                onToggle={[Function]}
+              >
+                <div
+                  className="euiAccordion__triggerWrapper"
+                >
+                  <button
+                    aria-controls="mockId"
+                    aria-expanded={true}
+                    className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                    onClick={[Function]}
+                    type="button"
                   >
-                    <div
-                      data-focus-lock-disabled="disabled"
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
+                    <span
+                      className="euiAccordion__iconWrapper"
                     >
-                      <nav
-                        aria-label="Primary"
-                        className="euiCollapsibleNav euiCollapsibleNav--isDocked"
-                        data-test-subj="collapsibleNav"
-                        id="collapsibe-nav"
+                      <EuiIcon
+                        className="euiAccordion__icon euiAccordion__icon-isOpen"
+                        size="m"
+                        type="arrowRight"
                       >
-                        <EuiFlexItem
-                          grow={false}
-                          style={
-                            Object {
-                              "flexShrink": 0,
-                            }
-                          }
+                        <div
+                          className="euiAccordion__icon euiAccordion__icon-isOpen"
+                          data-euiicon-type="arrowRight"
+                          size="m"
+                        />
+                      </EuiIcon>
+                    </span>
+                    <span
+                      className="euiIEFlexWrapFix"
+                    >
+                      <EuiFlexGroup
+                        alignItems="center"
+                        gutterSize="m"
+                        responsive={false}
+                      >
+                        <div
+                          className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                         >
-                          <div
-                            className="euiFlexItem euiFlexItem--flexGrowZero"
+                          <EuiFlexItem>
+                            <div
+                              className="euiFlexItem"
+                            >
+                              <EuiTitle
+                                size="xxs"
+                              >
+                                <h3
+                                  className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                  id="mockId__title"
+                                >
+                                  Recently viewed
+                                </h3>
+                              </EuiTitle>
+                            </div>
+                          </EuiFlexItem>
+                        </div>
+                      </EuiFlexGroup>
+                    </span>
+                  </button>
+                </div>
+                <div
+                  className="euiAccordion__childWrapper"
+                  id="mockId"
+                >
+                  <EuiResizeObserver
+                    onResize={[Function]}
+                  >
+                    <div>
+                      <div
+                        className=""
+                      >
+                        <div
+                          className="euiCollapsibleNavGroup__children"
+                        >
+                          <EuiText
+                            color="subdued"
+                            size="s"
                             style={
                               Object {
-                                "flexShrink": 0,
+                                "padding": "0 8px 8px",
                               }
                             }
                           >
-                            <EuiCollapsibleNavGroup
-                              background="light"
-                              className="eui-yScroll"
+                            <div
+                              className="euiText euiText--small"
                               style={
                                 Object {
-                                  "maxHeight": "40vh",
+                                  "padding": "0 8px 8px",
                                 }
                               }
                             >
-                              <div
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                id="mockId"
-                                style={
-                                  Object {
-                                    "maxHeight": "40vh",
-                                  }
-                                }
+                              <EuiTextColor
+                                color="subdued"
+                                component="div"
                               >
                                 <div
-                                  className="euiCollapsibleNavGroup__children"
+                                  className="euiTextColor euiTextColor--subdued"
                                 >
-                                  <EuiListGroup
-                                    aria-label="Pinned links"
-                                    color="text"
-                                    gutterSize="none"
-                                    listItems={
-                                      Array [
-                                        Object {
-                                          "href": "/",
-                                          "iconType": "home",
-                                          "label": "Home",
-                                          "onClick": [Function],
-                                        },
-                                      ]
-                                    }
-                                    maxWidth="none"
-                                    size="s"
-                                  >
-                                    <ul
-                                      aria-label="Pinned links"
-                                      className="euiListGroup"
-                                      style={
-                                        Object {
-                                          "maxWidth": "none",
-                                        }
-                                      }
-                                    >
-                                      <EuiListGroupItem
-                                        color="text"
-                                        href="/"
-                                        iconType="home"
-                                        key="title-0"
-                                        label="Home"
-                                        onClick={[Function]}
-                                        showToolTip={false}
-                                        size="s"
-                                        wrapText={false}
-                                      >
-                                        <li
-                                          className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                        >
-                                          <a
-                                            className="euiListGroupItem__button"
-                                            href="/"
-                                            onClick={[Function]}
-                                            rel="noreferrer"
-                                          >
-                                            <EuiIcon
-                                              className="euiListGroupItem__icon"
-                                              type="home"
-                                            >
-                                              <div
-                                                className="euiListGroupItem__icon"
-                                                data-euiicon-type="home"
-                                              />
-                                            </EuiIcon>
-                                            <span
-                                              className="euiListGroupItem__label"
-                                              title="Home"
-                                            >
-                                              Home
-                                            </span>
-                                          </a>
-                                        </li>
-                                      </EuiListGroupItem>
-                                    </ul>
-                                  </EuiListGroup>
+                                  <p>
+                                    No recently viewed items
+                                  </p>
                                 </div>
-                              </div>
-                            </EuiCollapsibleNavGroup>
-                          </div>
-                        </EuiFlexItem>
-                        <EuiCollapsibleNavGroup
-                          background="light"
-                          data-test-subj="collapsibleNavGroup-recentlyViewed"
-                          initialIsOpen={true}
-                          isCollapsible={true}
-                          key="recentlyViewed"
-                          onToggle={[Function]}
-                          title="Recently viewed"
+                              </EuiTextColor>
+                            </div>
+                          </EuiText>
+                        </div>
+                      </div>
+                    </div>
+                  </EuiResizeObserver>
+                </div>
+              </div>
+            </EuiAccordion>
+          </EuiCollapsibleNavGroup>
+          <EuiHorizontalRule
+            margin="none"
+          >
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full"
+            />
+          </EuiHorizontalRule>
+          <EuiFlexItem
+            className="eui-yScroll"
+          >
+            <div
+              className="euiFlexItem eui-yScroll"
+            >
+              <EuiShowFor
+                sizes={
+                  Array [
+                    "l",
+                    "xl",
+                  ]
+                }
+              >
+                <EuiCollapsibleNavGroup
+                  className="eui-showFor--l eui-showFor--xl"
+                  key=".0"
+                >
+                  <div
+                    className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
+                    id="mockId"
+                  >
+                    <div
+                      className="euiCollapsibleNavGroup__children"
+                    >
+                      <EuiListGroup
+                        flush={true}
+                      >
+                        <ul
+                          className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
                         >
-                          <EuiAccordion
-                            arrowDisplay="right"
-                            buttonClassName="euiCollapsibleNavGroup__heading"
-                            buttonContent={
-                              <EuiFlexGroup
-                                alignItems="center"
-                                gutterSize="m"
-                                responsive={false}
-                              >
-                                <EuiFlexItem>
-                                  <EuiTitle
-                                    size="xxs"
-                                  >
-                                    <h3
-                                      className="euiCollapsibleNavGroup__title"
-                                      id="mockId__title"
-                                    >
-                                      Recently viewed
-                                    </h3>
-                                  </EuiTitle>
-                                </EuiFlexItem>
-                              </EuiFlexGroup>
-                            }
-                            className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                            data-test-subj="collapsibleNavGroup-recentlyViewed"
-                            id="mockId"
-                            initialIsOpen={true}
-                            onToggle={[Function]}
-                            paddingSize="none"
-                          >
-                            <div
-                              className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                              data-test-subj="collapsibleNavGroup-recentlyViewed"
-                              onToggle={[Function]}
-                            >
-                              <div
-                                className="euiAccordion__triggerWrapper"
-                              >
-                                <button
-                                  aria-controls="mockId"
-                                  aria-expanded={true}
-                                  className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                  onClick={[Function]}
+                          <EuiListGroupItem
+                            aria-label="Undock primary navigation"
+                            buttonRef={
+                              Object {
+                                "current": <button
+                                  aria-label="Undock primary navigation"
+                                  class="euiListGroupItem__button"
+                                  data-test-subj="collapsible-nav-lock"
                                   type="button"
                                 >
+                                  <div
+                                    class="euiListGroupItem__icon"
+                                    data-euiicon-type="lock"
+                                  />
                                   <span
-                                    className="euiAccordion__iconWrapper"
-                                  >
-                                    <EuiIcon
-                                      className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                      size="m"
-                                      type="arrowRight"
-                                    >
-                                      <div
-                                        className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                        data-euiicon-type="arrowRight"
-                                        size="m"
-                                      />
-                                    </EuiIcon>
-                                  </span>
-                                  <span
-                                    className="euiIEFlexWrapFix"
+                                    class="euiListGroupItem__label"
+                                    title="Undock navigation"
                                   >
-                                    <EuiFlexGroup
-                                      alignItems="center"
-                                      gutterSize="m"
-                                      responsive={false}
-                                    >
-                                      <div
-                                        className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                      >
-                                        <EuiFlexItem>
-                                          <div
-                                            className="euiFlexItem"
-                                          >
-                                            <EuiTitle
-                                              size="xxs"
-                                            >
-                                              <h3
-                                                className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                id="mockId__title"
-                                              >
-                                                Recently viewed
-                                              </h3>
-                                            </EuiTitle>
-                                          </div>
-                                        </EuiFlexItem>
-                                      </div>
-                                    </EuiFlexGroup>
+                                    Undock navigation
                                   </span>
-                                </button>
-                              </div>
-                              <div
-                                className="euiAccordion__childWrapper"
-                                id="mockId"
-                              >
-                                <EuiResizeObserver
-                                  onResize={[Function]}
-                                >
-                                  <div>
-                                    <div
-                                      className=""
-                                    >
-                                      <div
-                                        className="euiCollapsibleNavGroup__children"
-                                      >
-                                        <EuiText
-                                          color="subdued"
-                                          size="s"
-                                          style={
-                                            Object {
-                                              "padding": "0 8px 8px",
-                                            }
-                                          }
-                                        >
-                                          <div
-                                            className="euiText euiText--small"
-                                            style={
-                                              Object {
-                                                "padding": "0 8px 8px",
-                                              }
-                                            }
-                                          >
-                                            <EuiTextColor
-                                              color="subdued"
-                                              component="div"
-                                            >
-                                              <div
-                                                className="euiTextColor euiTextColor--subdued"
-                                              >
-                                                <p>
-                                                  No recently viewed items
-                                                </p>
-                                              </div>
-                                            </EuiTextColor>
-                                          </div>
-                                        </EuiText>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </EuiResizeObserver>
-                              </div>
-                            </div>
-                          </EuiAccordion>
-                        </EuiCollapsibleNavGroup>
-                        <EuiHorizontalRule
-                          margin="none"
-                        >
-                          <hr
-                            className="euiHorizontalRule euiHorizontalRule--full"
-                          />
-                        </EuiHorizontalRule>
-                        <EuiFlexItem
-                          className="eui-yScroll"
-                        >
-                          <div
-                            className="euiFlexItem eui-yScroll"
-                          >
-                            <EuiShowFor
-                              sizes={
-                                Array [
-                                  "l",
-                                  "xl",
-                                ]
+                                </button>,
                               }
-                            >
-                              <EuiCollapsibleNavGroup
-                                className="eui-showFor--l eui-showFor--xl"
-                                key=".0"
-                              >
-                                <div
-                                  className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                                  id="mockId"
-                                >
-                                  <div
-                                    className="euiCollapsibleNavGroup__children"
-                                  >
-                                    <EuiListGroup
-                                      flush={true}
-                                    >
-                                      <ul
-                                        className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                      >
-                                        <EuiListGroupItem
-                                          aria-label="Undock primary navigation"
-                                          buttonRef={
-                                            Object {
-                                              "current": <button
-                                                aria-label="Undock primary navigation"
-                                                class="euiListGroupItem__button"
-                                                data-test-subj="collapsible-nav-lock"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiListGroupItem__icon"
-                                                  data-euiicon-type="lock"
-                                                />
-                                                <span
-                                                  class="euiListGroupItem__label"
-                                                  title="Undock navigation"
-                                                >
-                                                  Undock navigation
-                                                </span>
-                                              </button>,
-                                            }
-                                          }
-                                          color="subdued"
-                                          data-test-subj="collapsible-nav-lock"
-                                          iconType="lock"
-                                          label="Undock navigation"
-                                          onClick={[Function]}
-                                          size="xs"
-                                        >
-                                          <li
-                                            className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                          >
-                                            <button
-                                              aria-label="Undock primary navigation"
-                                              className="euiListGroupItem__button"
-                                              data-test-subj="collapsible-nav-lock"
-                                              disabled={false}
-                                              onClick={[Function]}
-                                              type="button"
-                                            >
-                                              <EuiIcon
-                                                className="euiListGroupItem__icon"
-                                                type="lock"
-                                              >
-                                                <div
-                                                  className="euiListGroupItem__icon"
-                                                  data-euiicon-type="lock"
-                                                />
-                                              </EuiIcon>
-                                              <span
-                                                className="euiListGroupItem__label"
-                                                title="Undock navigation"
-                                              >
-                                                Undock navigation
-                                              </span>
-                                            </button>
-                                          </li>
-                                        </EuiListGroupItem>
-                                      </ul>
-                                    </EuiListGroup>
-                                  </div>
-                                </div>
-                              </EuiCollapsibleNavGroup>
-                            </EuiShowFor>
-                          </div>
-                        </EuiFlexItem>
-                        <EuiScreenReaderOnly
-                          showOnFocus={true}
-                        >
-                          <EuiButtonEmpty
-                            className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                            iconType="cross"
+                            }
+                            color="subdued"
+                            data-test-subj="collapsible-nav-lock"
+                            iconType="lock"
+                            label="Undock navigation"
                             onClick={[Function]}
                             size="xs"
-                            textProps={
-                              Object {
-                                "className": "euiCollapsibleNav__closeButtonText",
-                              }
-                            }
                           >
-                            <button
-                              className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                              onClick={[Function]}
-                              type="button"
+                            <li
+                              className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
                             >
-                              <EuiButtonContent
-                                className="euiButtonEmpty__content"
-                                iconSide="left"
-                                iconType="cross"
-                                textProps={
-                                  Object {
-                                    "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
-                                  }
-                                }
+                              <button
+                                aria-label="Undock primary navigation"
+                                className="euiListGroupItem__button"
+                                data-test-subj="collapsible-nav-lock"
+                                disabled={false}
+                                onClick={[Function]}
+                                type="button"
                               >
+                                <EuiIcon
+                                  className="euiListGroupItem__icon"
+                                  type="lock"
+                                >
+                                  <div
+                                    className="euiListGroupItem__icon"
+                                    data-euiicon-type="lock"
+                                  />
+                                </EuiIcon>
                                 <span
-                                  className="euiButtonContent euiButtonEmpty__content"
+                                  className="euiListGroupItem__label"
+                                  title="Undock navigation"
                                 >
-                                  <EuiIcon
-                                    className="euiButtonContent__icon"
-                                    size="m"
-                                    type="cross"
-                                  >
-                                    <div
-                                      className="euiButtonContent__icon"
-                                      data-euiicon-type="cross"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                  <span
-                                    className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                                  >
-                                    <EuiI18n
-                                      default="close"
-                                      token="euiCollapsibleNav.closeButtonLabel"
-                                    >
-                                      close
-                                    </EuiI18n>
-                                  </span>
+                                  Undock navigation
                                 </span>
-                              </EuiButtonContent>
-                            </button>
-                          </EuiButtonEmpty>
-                        </EuiScreenReaderOnly>
-                      </nav>
+                              </button>
+                            </li>
+                          </EuiListGroupItem>
+                        </ul>
+                      </EuiListGroup>
                     </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
+                  </div>
+                </EuiCollapsibleNavGroup>
+              </EuiShowFor>
+            </div>
+          </EuiFlexItem>
+          <EuiScreenReaderOnly
+            showOnFocus={true}
+          >
+            <EuiButtonEmpty
+              className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+              iconType="cross"
+              onClick={[Function]}
+              size="xs"
+              textProps={
+                Object {
+                  "className": "euiCollapsibleNav__closeButtonText",
+                }
+              }
+            >
+              <button
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+                onClick={[Function]}
+                type="button"
+              >
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="left"
+                  iconType="cross"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
                     }
-                    tabIndex={-1}
-                  />
-                </ForwardRef>
-              </ForwardRef>
-            </ForwardRef>
-          </div>
-        </OutsideEventDetector>
-      </EuiOutsideClickDetector>
+                  }
+                >
+                  <span
+                    className="euiButtonContent euiButtonEmpty__content"
+                  >
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      size="m"
+                      type="cross"
+                    >
+                      <div
+                        className="euiButtonContent__icon"
+                        data-euiicon-type="cross"
+                        size="m"
+                      />
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
+                    >
+                      <EuiI18n
+                        default="close"
+                        token="euiCollapsibleNav.closeButtonLabel"
+                      >
+                        close
+                      </EuiI18n>
+                    </span>
+                  </span>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiScreenReaderOnly>
+        </nav>
+      </div>
     </EuiFocusTrap>
   </EuiCollapsibleNav>
 </CollapsibleNav>
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index a1920154d9f71..c02a763c40101 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -8999,766 +8999,635 @@ exports[`Header renders 3`] = `
           clickOutsideDisables={true}
           disabled={true}
         >
-          <EuiOutsideClickDetector
-            isDisabled={true}
-            onOutsideClick={[Function]}
+          <div
+            data-eui="EuiFocusTrap"
           >
-            <OutsideEventDetector
-              handleEvent={[Function]}
-              onMouseDown={[Function]}
-              onMouseUp={[Function]}
-              onTouchEnd={[Function]}
-              onTouchStart={[Function]}
+            <nav
+              aria-label="Primary"
+              className="euiCollapsibleNav euiCollapsibleNav--isDocked"
+              data-test-subj="collapsibleNav"
+              id="mockId"
             >
-              <div
-                onMouseDown={[Function]}
-                onMouseUp={[Function]}
-                onTouchEnd={[Function]}
-                onTouchStart={[Function]}
+              <EuiFlexItem
+                grow={false}
+                style={
+                  Object {
+                    "flexShrink": 0,
+                  }
+                }
               >
-                <ForwardRef
-                  enabled={false}
-                  noIsolation={true}
-                  returnFocus={true}
-                  scrollLock={false}
+                <div
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                  style={
+                    Object {
+                      "flexShrink": 0,
+                    }
+                  }
                 >
-                  <ForwardRef
-                    enabled={false}
-                    noIsolation={true}
-                    returnFocus={true}
-                    scrollLock={false}
-                    sideCar={[Function]}
-                  >
-                    <ForwardRef
-                      as={
-                        Object {
-                          "$$typeof": Symbol(react.forward_ref),
-                          "classNames": Object {
-                            "fullWidth": "width-before-scroll-bar",
-                            "zeroRight": "right-scroll-bar-position",
-                          },
-                          "defaultProps": Object {
-                            "enabled": true,
-                            "inert": false,
-                            "removeScrollBar": true,
-                          },
-                          "render": [Function],
-                        }
+                  <EuiCollapsibleNavGroup
+                    background="light"
+                    className="eui-yScroll"
+                    style={
+                      Object {
+                        "maxHeight": "40vh",
                       }
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={true}
-                      lockProps={
+                    }
+                  >
+                    <div
+                      className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                      id="mockId"
+                      style={
                         Object {
-                          "allowPinchZoom": undefined,
-                          "enabled": false,
-                          "inert": undefined,
-                          "shards": undefined,
-                          "sideCar": [Function],
+                          "maxHeight": "40vh",
                         }
                       }
-                      noFocusGuards={false}
-                      persistentFocus={false}
-                      returnFocus={true}
-                      sideCar={[Function]}
                     >
                       <div
-                        data-focus-guard={true}
-                        key="guard-first"
-                        style={
-                          Object {
-                            "height": "0px",
-                            "left": "1px",
-                            "overflow": "hidden",
-                            "padding": 0,
-                            "position": "fixed",
-                            "top": "1px",
-                            "width": "1px",
+                        className="euiCollapsibleNavGroup__children"
+                      >
+                        <EuiListGroup
+                          color="text"
+                          gutterSize="none"
+                          listItems={
+                            Array [
+                              Object {
+                                "data-test-subj": "collapsibleNavCustomNavLink",
+                                "href": undefined,
+                                "icon": undefined,
+                                "iconType": undefined,
+                                "isActive": false,
+                                "isDisabled": undefined,
+                                "label": "Manage cloud deployment",
+                                "onClick": [Function],
+                              },
+                            ]
                           }
+                          maxWidth="none"
+                          size="s"
+                        >
+                          <ul
+                            className="euiListGroup"
+                            style={
+                              Object {
+                                "maxWidth": "none",
+                              }
+                            }
+                          >
+                            <EuiListGroupItem
+                              color="text"
+                              data-test-subj="collapsibleNavCustomNavLink"
+                              isActive={false}
+                              key="title-0"
+                              label="Manage cloud deployment"
+                              onClick={[Function]}
+                              showToolTip={false}
+                              size="s"
+                              wrapText={false}
+                            >
+                              <li
+                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+                              >
+                                <button
+                                  className="euiListGroupItem__button"
+                                  data-test-subj="collapsibleNavCustomNavLink"
+                                  disabled={false}
+                                  onClick={[Function]}
+                                  type="button"
+                                >
+                                  <span
+                                    className="euiListGroupItem__label"
+                                    title="Manage cloud deployment"
+                                  >
+                                    Manage cloud deployment
+                                  </span>
+                                </button>
+                              </li>
+                            </EuiListGroupItem>
+                          </ul>
+                        </EuiListGroup>
+                      </div>
+                    </div>
+                  </EuiCollapsibleNavGroup>
+                </div>
+              </EuiFlexItem>
+              <EuiHorizontalRule
+                margin="none"
+              >
+                <hr
+                  className="euiHorizontalRule euiHorizontalRule--full"
+                />
+              </EuiHorizontalRule>
+              <EuiFlexItem
+                grow={false}
+                style={
+                  Object {
+                    "flexShrink": 0,
+                  }
+                }
+              >
+                <div
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                  style={
+                    Object {
+                      "flexShrink": 0,
+                    }
+                  }
+                >
+                  <EuiCollapsibleNavGroup
+                    background="light"
+                    className="eui-yScroll"
+                    style={
+                      Object {
+                        "maxHeight": "40vh",
+                      }
+                    }
+                  >
+                    <div
+                      className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
+                      id="mockId"
+                      style={
+                        Object {
+                          "maxHeight": "40vh",
                         }
-                        tabIndex={-1}
-                      />
+                      }
+                    >
                       <div
-                        data-focus-guard={true}
-                        key="guard-nearest"
-                        style={
-                          Object {
-                            "height": "0px",
-                            "left": "1px",
-                            "overflow": "hidden",
-                            "padding": 0,
-                            "position": "fixed",
-                            "top": "1px",
-                            "width": "1px",
-                          }
-                        }
-                        tabIndex={-1}
-                      />
-                      <ForwardRef
-                        data-focus-lock-disabled="disabled"
-                        enabled={false}
-                        inert={false}
-                        onBlur={[Function]}
-                        onFocus={[Function]}
-                        removeScrollBar={true}
-                        sideCar={[Function]}
+                        className="euiCollapsibleNavGroup__children"
                       >
-                        <div
-                          data-focus-lock-disabled="disabled"
-                          onBlur={[Function]}
-                          onFocus={[Function]}
-                          onScrollCapture={[Function]}
-                          onTouchMoveCapture={[Function]}
-                          onWheelCapture={[Function]}
+                        <EuiListGroup
+                          aria-label="Pinned links"
+                          color="text"
+                          gutterSize="none"
+                          listItems={
+                            Array [
+                              Object {
+                                "href": "/",
+                                "iconType": "home",
+                                "label": "Home",
+                                "onClick": [Function],
+                              },
+                            ]
+                          }
+                          maxWidth="none"
+                          size="s"
                         >
-                          <nav
-                            aria-label="Primary"
-                            className="euiCollapsibleNav euiCollapsibleNav--isDocked"
-                            data-test-subj="collapsibleNav"
-                            id="mockId"
-                          >
-                            <EuiFlexItem
-                              grow={false}
-                              style={
-                                Object {
-                                  "flexShrink": 0,
-                                }
+                          <ul
+                            aria-label="Pinned links"
+                            className="euiListGroup"
+                            style={
+                              Object {
+                                "maxWidth": "none",
                               }
+                            }
+                          >
+                            <EuiListGroupItem
+                              color="text"
+                              href="/"
+                              iconType="home"
+                              key="title-0"
+                              label="Home"
+                              onClick={[Function]}
+                              showToolTip={false}
+                              size="s"
+                              wrapText={false}
                             >
-                              <div
-                                className="euiFlexItem euiFlexItem--flexGrowZero"
-                                style={
-                                  Object {
-                                    "flexShrink": 0,
-                                  }
-                                }
+                              <li
+                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                               >
-                                <EuiCollapsibleNavGroup
-                                  background="light"
-                                  className="eui-yScroll"
-                                  style={
-                                    Object {
-                                      "maxHeight": "40vh",
-                                    }
-                                  }
+                                <a
+                                  className="euiListGroupItem__button"
+                                  href="/"
+                                  onClick={[Function]}
+                                  rel="noreferrer"
                                 >
-                                  <div
-                                    className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                    id="mockId"
-                                    style={
-                                      Object {
-                                        "maxHeight": "40vh",
-                                      }
-                                    }
+                                  <EuiIcon
+                                    className="euiListGroupItem__icon"
+                                    type="home"
                                   >
                                     <div
-                                      className="euiCollapsibleNavGroup__children"
-                                    >
-                                      <EuiListGroup
-                                        color="text"
-                                        gutterSize="none"
-                                        listItems={
-                                          Array [
-                                            Object {
-                                              "data-test-subj": "collapsibleNavCustomNavLink",
-                                              "href": undefined,
-                                              "icon": undefined,
-                                              "iconType": undefined,
-                                              "isActive": false,
-                                              "isDisabled": undefined,
-                                              "label": "Manage cloud deployment",
-                                              "onClick": [Function],
-                                            },
-                                          ]
-                                        }
-                                        maxWidth="none"
-                                        size="s"
-                                      >
-                                        <ul
-                                          className="euiListGroup"
-                                          style={
-                                            Object {
-                                              "maxWidth": "none",
-                                            }
-                                          }
-                                        >
-                                          <EuiListGroupItem
-                                            color="text"
-                                            data-test-subj="collapsibleNavCustomNavLink"
-                                            isActive={false}
-                                            key="title-0"
-                                            label="Manage cloud deployment"
-                                            onClick={[Function]}
-                                            showToolTip={false}
-                                            size="s"
-                                            wrapText={false}
-                                          >
-                                            <li
-                                              className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                            >
-                                              <button
-                                                className="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavCustomNavLink"
-                                                disabled={false}
-                                                onClick={[Function]}
-                                                type="button"
-                                              >
-                                                <span
-                                                  className="euiListGroupItem__label"
-                                                  title="Manage cloud deployment"
-                                                >
-                                                  Manage cloud deployment
-                                                </span>
-                                              </button>
-                                            </li>
-                                          </EuiListGroupItem>
-                                        </ul>
-                                      </EuiListGroup>
-                                    </div>
-                                  </div>
-                                </EuiCollapsibleNavGroup>
-                              </div>
-                            </EuiFlexItem>
-                            <EuiHorizontalRule
-                              margin="none"
+                                      className="euiListGroupItem__icon"
+                                      data-euiicon-type="home"
+                                    />
+                                  </EuiIcon>
+                                  <span
+                                    className="euiListGroupItem__label"
+                                    title="Home"
+                                  >
+                                    Home
+                                  </span>
+                                </a>
+                              </li>
+                            </EuiListGroupItem>
+                          </ul>
+                        </EuiListGroup>
+                      </div>
+                    </div>
+                  </EuiCollapsibleNavGroup>
+                </div>
+              </EuiFlexItem>
+              <EuiCollapsibleNavGroup
+                background="light"
+                data-test-subj="collapsibleNavGroup-recentlyViewed"
+                initialIsOpen={true}
+                isCollapsible={true}
+                key="recentlyViewed"
+                onToggle={[Function]}
+                title="Recently viewed"
+              >
+                <EuiAccordion
+                  arrowDisplay="right"
+                  buttonClassName="euiCollapsibleNavGroup__heading"
+                  buttonContent={
+                    <EuiFlexGroup
+                      alignItems="center"
+                      gutterSize="m"
+                      responsive={false}
+                    >
+                      <EuiFlexItem>
+                        <EuiTitle
+                          size="xxs"
+                        >
+                          <h3
+                            className="euiCollapsibleNavGroup__title"
+                            id="mockId__title"
+                          >
+                            Recently viewed
+                          </h3>
+                        </EuiTitle>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  }
+                  className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+                  data-test-subj="collapsibleNavGroup-recentlyViewed"
+                  id="mockId"
+                  initialIsOpen={true}
+                  onToggle={[Function]}
+                  paddingSize="none"
+                >
+                  <div
+                    className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
+                    data-test-subj="collapsibleNavGroup-recentlyViewed"
+                    onToggle={[Function]}
+                  >
+                    <div
+                      className="euiAccordion__triggerWrapper"
+                    >
+                      <button
+                        aria-controls="mockId"
+                        aria-expanded={true}
+                        className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <span
+                          className="euiAccordion__iconWrapper"
+                        >
+                          <EuiIcon
+                            className="euiAccordion__icon euiAccordion__icon-isOpen"
+                            size="m"
+                            type="arrowRight"
+                          >
+                            <div
+                              className="euiAccordion__icon euiAccordion__icon-isOpen"
+                              data-euiicon-type="arrowRight"
+                              size="m"
+                            />
+                          </EuiIcon>
+                        </span>
+                        <span
+                          className="euiIEFlexWrapFix"
+                        >
+                          <EuiFlexGroup
+                            alignItems="center"
+                            gutterSize="m"
+                            responsive={false}
+                          >
+                            <div
+                              className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
                             >
-                              <hr
-                                className="euiHorizontalRule euiHorizontalRule--full"
-                              />
-                            </EuiHorizontalRule>
-                            <EuiFlexItem
-                              grow={false}
-                              style={
-                                Object {
-                                  "flexShrink": 0,
-                                }
-                              }
+                              <EuiFlexItem>
+                                <div
+                                  className="euiFlexItem"
+                                >
+                                  <EuiTitle
+                                    size="xxs"
+                                  >
+                                    <h3
+                                      className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
+                                      id="mockId__title"
+                                    >
+                                      Recently viewed
+                                    </h3>
+                                  </EuiTitle>
+                                </div>
+                              </EuiFlexItem>
+                            </div>
+                          </EuiFlexGroup>
+                        </span>
+                      </button>
+                    </div>
+                    <div
+                      className="euiAccordion__childWrapper"
+                      id="mockId"
+                    >
+                      <EuiResizeObserver
+                        onResize={[Function]}
+                      >
+                        <div>
+                          <div
+                            className=""
+                          >
+                            <div
+                              className="euiCollapsibleNavGroup__children"
                             >
-                              <div
-                                className="euiFlexItem euiFlexItem--flexGrowZero"
-                                style={
-                                  Object {
-                                    "flexShrink": 0,
-                                  }
+                              <EuiListGroup
+                                aria-label="Recently viewed links"
+                                className="kbnCollapsibleNav__recentsListGroup"
+                                color="subdued"
+                                gutterSize="none"
+                                listItems={
+                                  Array [
+                                    Object {
+                                      "aria-label": "dashboard, type: kibana",
+                                      "data-test-subj": "collapsibleNavAppLink--recent",
+                                      "href": "http://localhost/",
+                                      "label": "dashboard",
+                                      "onClick": [Function],
+                                      "title": "dashboard, type: kibana",
+                                    },
+                                  ]
                                 }
+                                maxWidth="none"
+                                size="s"
                               >
-                                <EuiCollapsibleNavGroup
-                                  background="light"
-                                  className="eui-yScroll"
+                                <ul
+                                  aria-label="Recently viewed links"
+                                  className="euiListGroup kbnCollapsibleNav__recentsListGroup"
                                   style={
                                     Object {
-                                      "maxHeight": "40vh",
+                                      "maxWidth": "none",
                                     }
                                   }
                                 >
-                                  <div
-                                    className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light eui-yScroll"
-                                    id="mockId"
-                                    style={
-                                      Object {
-                                        "maxHeight": "40vh",
-                                      }
-                                    }
+                                  <EuiListGroupItem
+                                    aria-label="dashboard, type: kibana"
+                                    color="subdued"
+                                    data-test-subj="collapsibleNavAppLink--recent"
+                                    href="http://localhost/"
+                                    key="title-0"
+                                    label="dashboard"
+                                    onClick={[Function]}
+                                    showToolTip={false}
+                                    size="s"
+                                    title="dashboard, type: kibana"
+                                    wrapText={false}
                                   >
-                                    <div
-                                      className="euiCollapsibleNavGroup__children"
+                                    <li
+                                      className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
                                     >
-                                      <EuiListGroup
-                                        aria-label="Pinned links"
-                                        color="text"
-                                        gutterSize="none"
-                                        listItems={
-                                          Array [
-                                            Object {
-                                              "href": "/",
-                                              "iconType": "home",
-                                              "label": "Home",
-                                              "onClick": [Function],
-                                            },
-                                          ]
-                                        }
-                                        maxWidth="none"
-                                        size="s"
+                                      <a
+                                        aria-label="dashboard, type: kibana"
+                                        className="euiListGroupItem__button"
+                                        data-test-subj="collapsibleNavAppLink--recent"
+                                        href="http://localhost/"
+                                        onClick={[Function]}
+                                        rel="noreferrer"
+                                        title="dashboard, type: kibana"
                                       >
-                                        <ul
-                                          aria-label="Pinned links"
-                                          className="euiListGroup"
-                                          style={
-                                            Object {
-                                              "maxWidth": "none",
-                                            }
-                                          }
+                                        <span
+                                          className="euiListGroupItem__label"
+                                          title="dashboard"
                                         >
-                                          <EuiListGroupItem
-                                            color="text"
-                                            href="/"
-                                            iconType="home"
-                                            key="title-0"
-                                            label="Home"
-                                            onClick={[Function]}
-                                            showToolTip={false}
-                                            size="s"
-                                            wrapText={false}
-                                          >
-                                            <li
-                                              className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                            >
-                                              <a
-                                                className="euiListGroupItem__button"
-                                                href="/"
-                                                onClick={[Function]}
-                                                rel="noreferrer"
-                                              >
-                                                <EuiIcon
-                                                  className="euiListGroupItem__icon"
-                                                  type="home"
-                                                >
-                                                  <div
-                                                    className="euiListGroupItem__icon"
-                                                    data-euiicon-type="home"
-                                                  />
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiListGroupItem__label"
-                                                  title="Home"
-                                                >
-                                                  Home
-                                                </span>
-                                              </a>
-                                            </li>
-                                          </EuiListGroupItem>
-                                        </ul>
-                                      </EuiListGroup>
-                                    </div>
-                                  </div>
-                                </EuiCollapsibleNavGroup>
-                              </div>
-                            </EuiFlexItem>
-                            <EuiCollapsibleNavGroup
-                              background="light"
-                              data-test-subj="collapsibleNavGroup-recentlyViewed"
-                              initialIsOpen={true}
-                              isCollapsible={true}
-                              key="recentlyViewed"
-                              onToggle={[Function]}
-                              title="Recently viewed"
+                                          dashboard
+                                        </span>
+                                      </a>
+                                    </li>
+                                  </EuiListGroupItem>
+                                </ul>
+                              </EuiListGroup>
+                            </div>
+                          </div>
+                        </div>
+                      </EuiResizeObserver>
+                    </div>
+                  </div>
+                </EuiAccordion>
+              </EuiCollapsibleNavGroup>
+              <EuiHorizontalRule
+                margin="none"
+              >
+                <hr
+                  className="euiHorizontalRule euiHorizontalRule--full"
+                />
+              </EuiHorizontalRule>
+              <EuiFlexItem
+                className="eui-yScroll"
+              >
+                <div
+                  className="euiFlexItem eui-yScroll"
+                >
+                  <EuiCollapsibleNavGroup
+                    data-test-subj="collapsibleNavGroup-noCategory"
+                    key="0"
+                  >
+                    <div
+                      className="euiCollapsibleNavGroup"
+                      data-test-subj="collapsibleNavGroup-noCategory"
+                      id="mockId"
+                    >
+                      <div
+                        className="euiCollapsibleNavGroup__children"
+                      >
+                        <EuiListGroup
+                          flush={true}
+                        >
+                          <ul
+                            className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                          >
+                            <EuiListGroupItem
+                              color="text"
+                              data-test-subj="collapsibleNavAppLink"
+                              isActive={false}
+                              label="kibana"
+                              onClick={[Function]}
+                              size="s"
                             >
-                              <EuiAccordion
-                                arrowDisplay="right"
-                                buttonClassName="euiCollapsibleNavGroup__heading"
-                                buttonContent={
-                                  <EuiFlexGroup
-                                    alignItems="center"
-                                    gutterSize="m"
-                                    responsive={false}
-                                  >
-                                    <EuiFlexItem>
-                                      <EuiTitle
-                                        size="xxs"
-                                      >
-                                        <h3
-                                          className="euiCollapsibleNavGroup__title"
-                                          id="mockId__title"
-                                        >
-                                          Recently viewed
-                                        </h3>
-                                      </EuiTitle>
-                                    </EuiFlexItem>
-                                  </EuiFlexGroup>
-                                }
-                                className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                                data-test-subj="collapsibleNavGroup-recentlyViewed"
-                                id="mockId"
-                                initialIsOpen={true}
-                                onToggle={[Function]}
-                                paddingSize="none"
+                              <li
+                                className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
                               >
-                                <div
-                                  className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
-                                  data-test-subj="collapsibleNavGroup-recentlyViewed"
-                                  onToggle={[Function]}
+                                <button
+                                  className="euiListGroupItem__button"
+                                  data-test-subj="collapsibleNavAppLink"
+                                  disabled={false}
+                                  onClick={[Function]}
+                                  type="button"
                                 >
-                                  <div
-                                    className="euiAccordion__triggerWrapper"
+                                  <span
+                                    className="euiListGroupItem__label"
+                                    title="kibana"
                                   >
-                                    <button
-                                      aria-controls="mockId"
-                                      aria-expanded={true}
-                                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
-                                      onClick={[Function]}
+                                    kibana
+                                  </span>
+                                </button>
+                              </li>
+                            </EuiListGroupItem>
+                          </ul>
+                        </EuiListGroup>
+                      </div>
+                    </div>
+                  </EuiCollapsibleNavGroup>
+                  <EuiShowFor
+                    sizes={
+                      Array [
+                        "l",
+                        "xl",
+                      ]
+                    }
+                  >
+                    <EuiCollapsibleNavGroup
+                      className="eui-showFor--l eui-showFor--xl"
+                      key=".0"
+                    >
+                      <div
+                        className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
+                        id="mockId"
+                      >
+                        <div
+                          className="euiCollapsibleNavGroup__children"
+                        >
+                          <EuiListGroup
+                            flush={true}
+                          >
+                            <ul
+                              className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+                            >
+                              <EuiListGroupItem
+                                aria-label="Undock primary navigation"
+                                buttonRef={
+                                  Object {
+                                    "current": <button
+                                      aria-label="Undock primary navigation"
+                                      class="euiListGroupItem__button"
+                                      data-test-subj="collapsible-nav-lock"
                                       type="button"
                                     >
+                                      <div
+                                        class="euiListGroupItem__icon"
+                                        data-euiicon-type="lock"
+                                      />
                                       <span
-                                        className="euiAccordion__iconWrapper"
-                                      >
-                                        <EuiIcon
-                                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                          size="m"
-                                          type="arrowRight"
-                                        >
-                                          <div
-                                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                                            data-euiicon-type="arrowRight"
-                                            size="m"
-                                          />
-                                        </EuiIcon>
-                                      </span>
-                                      <span
-                                        className="euiIEFlexWrapFix"
+                                        class="euiListGroupItem__label"
+                                        title="Undock navigation"
                                       >
-                                        <EuiFlexGroup
-                                          alignItems="center"
-                                          gutterSize="m"
-                                          responsive={false}
-                                        >
-                                          <div
-                                            className="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                                          >
-                                            <EuiFlexItem>
-                                              <div
-                                                className="euiFlexItem"
-                                              >
-                                                <EuiTitle
-                                                  size="xxs"
-                                                >
-                                                  <h3
-                                                    className="euiTitle euiTitle--xxsmall euiCollapsibleNavGroup__title"
-                                                    id="mockId__title"
-                                                  >
-                                                    Recently viewed
-                                                  </h3>
-                                                </EuiTitle>
-                                              </div>
-                                            </EuiFlexItem>
-                                          </div>
-                                        </EuiFlexGroup>
+                                        Undock navigation
                                       </span>
-                                    </button>
-                                  </div>
-                                  <div
-                                    className="euiAccordion__childWrapper"
-                                    id="mockId"
-                                  >
-                                    <EuiResizeObserver
-                                      onResize={[Function]}
-                                    >
-                                      <div>
-                                        <div
-                                          className=""
-                                        >
-                                          <div
-                                            className="euiCollapsibleNavGroup__children"
-                                          >
-                                            <EuiListGroup
-                                              aria-label="Recently viewed links"
-                                              className="kbnCollapsibleNav__recentsListGroup"
-                                              color="subdued"
-                                              gutterSize="none"
-                                              listItems={
-                                                Array [
-                                                  Object {
-                                                    "aria-label": "dashboard, type: kibana",
-                                                    "data-test-subj": "collapsibleNavAppLink--recent",
-                                                    "href": "http://localhost/",
-                                                    "label": "dashboard",
-                                                    "onClick": [Function],
-                                                    "title": "dashboard, type: kibana",
-                                                  },
-                                                ]
-                                              }
-                                              maxWidth="none"
-                                              size="s"
-                                            >
-                                              <ul
-                                                aria-label="Recently viewed links"
-                                                className="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                                                style={
-                                                  Object {
-                                                    "maxWidth": "none",
-                                                  }
-                                                }
-                                              >
-                                                <EuiListGroupItem
-                                                  aria-label="dashboard, type: kibana"
-                                                  color="subdued"
-                                                  data-test-subj="collapsibleNavAppLink--recent"
-                                                  href="http://localhost/"
-                                                  key="title-0"
-                                                  label="dashboard"
-                                                  onClick={[Function]}
-                                                  showToolTip={false}
-                                                  size="s"
-                                                  title="dashboard, type: kibana"
-                                                  wrapText={false}
-                                                >
-                                                  <li
-                                                    className="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                                  >
-                                                    <a
-                                                      aria-label="dashboard, type: kibana"
-                                                      className="euiListGroupItem__button"
-                                                      data-test-subj="collapsibleNavAppLink--recent"
-                                                      href="http://localhost/"
-                                                      onClick={[Function]}
-                                                      rel="noreferrer"
-                                                      title="dashboard, type: kibana"
-                                                    >
-                                                      <span
-                                                        className="euiListGroupItem__label"
-                                                        title="dashboard"
-                                                      >
-                                                        dashboard
-                                                      </span>
-                                                    </a>
-                                                  </li>
-                                                </EuiListGroupItem>
-                                              </ul>
-                                            </EuiListGroup>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </EuiResizeObserver>
-                                  </div>
-                                </div>
-                              </EuiAccordion>
-                            </EuiCollapsibleNavGroup>
-                            <EuiHorizontalRule
-                              margin="none"
-                            >
-                              <hr
-                                className="euiHorizontalRule euiHorizontalRule--full"
-                              />
-                            </EuiHorizontalRule>
-                            <EuiFlexItem
-                              className="eui-yScroll"
-                            >
-                              <div
-                                className="euiFlexItem eui-yScroll"
-                              >
-                                <EuiCollapsibleNavGroup
-                                  data-test-subj="collapsibleNavGroup-noCategory"
-                                  key="0"
-                                >
-                                  <div
-                                    className="euiCollapsibleNavGroup"
-                                    data-test-subj="collapsibleNavGroup-noCategory"
-                                    id="mockId"
-                                  >
-                                    <div
-                                      className="euiCollapsibleNavGroup__children"
-                                    >
-                                      <EuiListGroup
-                                        flush={true}
-                                      >
-                                        <ul
-                                          className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                        >
-                                          <EuiListGroupItem
-                                            color="text"
-                                            data-test-subj="collapsibleNavAppLink"
-                                            isActive={false}
-                                            label="kibana"
-                                            onClick={[Function]}
-                                            size="s"
-                                          >
-                                            <li
-                                              className="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
-                                            >
-                                              <button
-                                                className="euiListGroupItem__button"
-                                                data-test-subj="collapsibleNavAppLink"
-                                                disabled={false}
-                                                onClick={[Function]}
-                                                type="button"
-                                              >
-                                                <span
-                                                  className="euiListGroupItem__label"
-                                                  title="kibana"
-                                                >
-                                                  kibana
-                                                </span>
-                                              </button>
-                                            </li>
-                                          </EuiListGroupItem>
-                                        </ul>
-                                      </EuiListGroup>
-                                    </div>
-                                  </div>
-                                </EuiCollapsibleNavGroup>
-                                <EuiShowFor
-                                  sizes={
-                                    Array [
-                                      "l",
-                                      "xl",
-                                    ]
+                                    </button>,
                                   }
-                                >
-                                  <EuiCollapsibleNavGroup
-                                    className="eui-showFor--l eui-showFor--xl"
-                                    key=".0"
-                                  >
-                                    <div
-                                      className="euiCollapsibleNavGroup eui-showFor--l eui-showFor--xl"
-                                      id="mockId"
-                                    >
-                                      <div
-                                        className="euiCollapsibleNavGroup__children"
-                                      >
-                                        <EuiListGroup
-                                          flush={true}
-                                        >
-                                          <ul
-                                            className="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
-                                          >
-                                            <EuiListGroupItem
-                                              aria-label="Undock primary navigation"
-                                              buttonRef={
-                                                Object {
-                                                  "current": <button
-                                                    aria-label="Undock primary navigation"
-                                                    class="euiListGroupItem__button"
-                                                    data-test-subj="collapsible-nav-lock"
-                                                    type="button"
-                                                  >
-                                                    <div
-                                                      class="euiListGroupItem__icon"
-                                                      data-euiicon-type="lock"
-                                                    />
-                                                    <span
-                                                      class="euiListGroupItem__label"
-                                                      title="Undock navigation"
-                                                    >
-                                                      Undock navigation
-                                                    </span>
-                                                  </button>,
-                                                }
-                                              }
-                                              color="subdued"
-                                              data-test-subj="collapsible-nav-lock"
-                                              iconType="lock"
-                                              label="Undock navigation"
-                                              onClick={[Function]}
-                                              size="xs"
-                                            >
-                                              <li
-                                                className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
-                                              >
-                                                <button
-                                                  aria-label="Undock primary navigation"
-                                                  className="euiListGroupItem__button"
-                                                  data-test-subj="collapsible-nav-lock"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  type="button"
-                                                >
-                                                  <EuiIcon
-                                                    className="euiListGroupItem__icon"
-                                                    type="lock"
-                                                  >
-                                                    <div
-                                                      className="euiListGroupItem__icon"
-                                                      data-euiicon-type="lock"
-                                                    />
-                                                  </EuiIcon>
-                                                  <span
-                                                    className="euiListGroupItem__label"
-                                                    title="Undock navigation"
-                                                  >
-                                                    Undock navigation
-                                                  </span>
-                                                </button>
-                                              </li>
-                                            </EuiListGroupItem>
-                                          </ul>
-                                        </EuiListGroup>
-                                      </div>
-                                    </div>
-                                  </EuiCollapsibleNavGroup>
-                                </EuiShowFor>
-                              </div>
-                            </EuiFlexItem>
-                            <EuiScreenReaderOnly
-                              showOnFocus={true}
-                            >
-                              <EuiButtonEmpty
-                                className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                                iconType="cross"
+                                }
+                                color="subdued"
+                                data-test-subj="collapsible-nav-lock"
+                                iconType="lock"
+                                label="Undock navigation"
                                 onClick={[Function]}
                                 size="xs"
-                                textProps={
-                                  Object {
-                                    "className": "euiCollapsibleNav__closeButtonText",
-                                  }
-                                }
                               >
-                                <button
-                                  className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
-                                  onClick={[Function]}
-                                  type="button"
+                                <li
+                                  className="euiListGroupItem euiListGroupItem--xSmall euiListGroupItem--subdued euiListGroupItem-isClickable"
                                 >
-                                  <EuiButtonContent
-                                    className="euiButtonEmpty__content"
-                                    iconSide="left"
-                                    iconType="cross"
-                                    textProps={
-                                      Object {
-                                        "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
-                                      }
-                                    }
+                                  <button
+                                    aria-label="Undock primary navigation"
+                                    className="euiListGroupItem__button"
+                                    data-test-subj="collapsible-nav-lock"
+                                    disabled={false}
+                                    onClick={[Function]}
+                                    type="button"
                                   >
+                                    <EuiIcon
+                                      className="euiListGroupItem__icon"
+                                      type="lock"
+                                    >
+                                      <div
+                                        className="euiListGroupItem__icon"
+                                        data-euiicon-type="lock"
+                                      />
+                                    </EuiIcon>
                                     <span
-                                      className="euiButtonContent euiButtonEmpty__content"
+                                      className="euiListGroupItem__label"
+                                      title="Undock navigation"
                                     >
-                                      <EuiIcon
-                                        className="euiButtonContent__icon"
-                                        size="m"
-                                        type="cross"
-                                      >
-                                        <div
-                                          className="euiButtonContent__icon"
-                                          data-euiicon-type="cross"
-                                          size="m"
-                                        />
-                                      </EuiIcon>
-                                      <span
-                                        className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
-                                      >
-                                        <EuiI18n
-                                          default="close"
-                                          token="euiCollapsibleNav.closeButtonLabel"
-                                        >
-                                          close
-                                        </EuiI18n>
-                                      </span>
+                                      Undock navigation
                                     </span>
-                                  </EuiButtonContent>
-                                </button>
-                              </EuiButtonEmpty>
-                            </EuiScreenReaderOnly>
-                          </nav>
+                                  </button>
+                                </li>
+                              </EuiListGroupItem>
+                            </ul>
+                          </EuiListGroup>
                         </div>
-                      </ForwardRef>
-                      <div
-                        data-focus-guard={true}
-                        style={
-                          Object {
-                            "height": "0px",
-                            "left": "1px",
-                            "overflow": "hidden",
-                            "padding": 0,
-                            "position": "fixed",
-                            "top": "1px",
-                            "width": "1px",
-                          }
+                      </div>
+                    </EuiCollapsibleNavGroup>
+                  </EuiShowFor>
+                </div>
+              </EuiFlexItem>
+              <EuiScreenReaderOnly
+                showOnFocus={true}
+              >
+                <EuiButtonEmpty
+                  className="euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+                  iconType="cross"
+                  onClick={[Function]}
+                  size="xs"
+                  textProps={
+                    Object {
+                      "className": "euiCollapsibleNav__closeButtonText",
+                    }
+                  }
+                >
+                  <button
+                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiScreenReaderOnly--showOnFocus euiCollapsibleNav__closeButton"
+                    onClick={[Function]}
+                    type="button"
+                  >
+                    <EuiButtonContent
+                      className="euiButtonEmpty__content"
+                      iconSide="left"
+                      iconType="cross"
+                      textProps={
+                        Object {
+                          "className": "euiButtonEmpty__text euiCollapsibleNav__closeButtonText",
                         }
-                        tabIndex={-1}
-                      />
-                    </ForwardRef>
-                  </ForwardRef>
-                </ForwardRef>
-              </div>
-            </OutsideEventDetector>
-          </EuiOutsideClickDetector>
+                      }
+                    >
+                      <span
+                        className="euiButtonContent euiButtonEmpty__content"
+                      >
+                        <EuiIcon
+                          className="euiButtonContent__icon"
+                          size="m"
+                          type="cross"
+                        >
+                          <div
+                            className="euiButtonContent__icon"
+                            data-euiicon-type="cross"
+                            size="m"
+                          />
+                        </EuiIcon>
+                        <span
+                          className="euiButtonEmpty__text euiCollapsibleNav__closeButtonText"
+                        >
+                          <EuiI18n
+                            default="close"
+                            token="euiCollapsibleNav.closeButtonLabel"
+                          >
+                            close
+                          </EuiI18n>
+                        </span>
+                      </span>
+                    </EuiButtonContent>
+                  </button>
+                </EuiButtonEmpty>
+              </EuiScreenReaderOnly>
+            </nav>
+          </div>
         </EuiFocusTrap>
       </EuiCollapsibleNav>
     </CollapsibleNav>
diff --git a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
index fa83b34e06b81..a5c1d46f74709 100644
--- a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
+++ b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
@@ -26,7 +26,7 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"false\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div>"`;
+exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div>"`;
 
 exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 1`] = `
 Array [
@@ -59,4 +59,4 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"false\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div>"`;
+exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div>"`;
diff --git a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
index fb00ddc38c6dc..aea52eb8e7ab7 100644
--- a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
@@ -31,7 +31,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"<div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"false\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div>"`;
+exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
 
 exports[`ModalService openConfirm() renders a string confirm message 1`] = `
 Array [
@@ -53,7 +53,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openConfirm() renders a string confirm message 2`] = `"<div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"false\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><p>Some message</p></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div>"`;
+exports[`ModalService openConfirm() renders a string confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><p>Some message</p></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
 
 exports[`ModalService openConfirm() with a currently active confirm replaces the current confirm with the new one 1`] = `
 Array [
@@ -145,7 +145,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"false\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div>"`;
+exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div>"`;
 
 exports[`ModalService openModal() with a currently active confirm replaces the current confirm with the new one 1`] = `
 Array [
diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
index d46b955f6668d..74e1ec5e2b4ed 100644
--- a/src/dev/jest/config.js
+++ b/src/dev/jest/config.js
@@ -78,7 +78,6 @@ export default {
   setupFilesAfterEnv: [
     '<rootDir>/src/dev/jest/setup/mocks.js',
     '<rootDir>/src/dev/jest/setup/react_testing_library.js',
-    '<rootDir>/src/dev/jest/setup/default_timeout.js',
   ],
   coverageDirectory: '<rootDir>/target/kibana-coverage/jest',
   coverageReporters: !!process.env.CODE_COVERAGE ? ['json'] : ['html', 'text'],
diff --git a/src/dev/jest/setup/default_timeout.js b/src/dev/jest/setup/default_timeout.js
deleted file mode 100644
index eea38e745b960..0000000000000
--- a/src/dev/jest/setup/default_timeout.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* eslint-env jest */
-
-/**
- * Set the default timeout for the unit tests to 30 seconds, temporarily
- */
-jest.setTimeout(30 * 1000);
diff --git a/src/plugins/data/server/search/collectors/fetch.ts b/src/plugins/data/server/search/collectors/fetch.ts
index ee29607b63ede..3551767eab017 100644
--- a/src/plugins/data/server/search/collectors/fetch.ts
+++ b/src/plugins/data/server/search/collectors/fetch.ts
@@ -19,14 +19,18 @@
 
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
-import { LegacyAPICaller, SharedGlobalConfig } from '../../../../../core/server';
+import { LegacyAPICaller, SharedGlobalConfig } from 'kibana/server';
 import { Usage } from './register';
 
+interface SearchTelemetrySavedObject {
+  'search-telemetry': Usage;
+}
+
 export function fetchProvider(config$: Observable<SharedGlobalConfig>) {
   return async (callCluster: LegacyAPICaller): Promise<Usage> => {
     const config = await config$.pipe(first()).toPromise();
 
-    const response = await callCluster('search', {
+    const response = await callCluster<SearchTelemetrySavedObject>('search', {
       index: config.kibana.index,
       body: {
         query: { term: { type: { value: 'search-telemetry' } } },
@@ -35,7 +39,7 @@ export function fetchProvider(config$: Observable<SharedGlobalConfig>) {
     });
 
     return response.hits.hits.length
-      ? (response.hits.hits[0]._source as Usage)
+      ? response.hits.hits[0]._source['search-telemetry']
       : {
           successCount: 0,
           errorCount: 0,
diff --git a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index a27dfa13e743e..6aed16e937713 100644
--- a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -142,21 +142,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
           class="euiOverlayMask euiOverlayMask--aboveHeader"
         >
           <div
-            aria-hidden="true"
-            data-aria-hidden="true"
-            data-focus-guard="true"
-            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-            tabindex="0"
-          />
-          <div
-            aria-hidden="true"
-            data-aria-hidden="true"
-            data-focus-guard="true"
-            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-            tabindex="1"
-          />
-          <div
-            data-focus-lock-disabled="false"
+            data-eui="EuiFocusTrap"
           >
             <div
               aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
@@ -402,13 +388,6 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
               </div>
             </div>
           </div>
-          <div
-            aria-hidden="true"
-            data-aria-hidden="true"
-            data-focus-guard="true"
-            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-            tabindex="0"
-          />
         </div>
       }
     >
@@ -419,3912 +398,1491 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
         role="menu"
       >
         <EuiFocusTrap>
-          <ForwardRef
-            enabled={true}
-            noIsolation={true}
-            returnFocus={true}
-            scrollLock={false}
+          <div
+            data-eui="EuiFocusTrap"
           >
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
-              sideCar={[Function]}
+            <div
+              aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
+              className="euiModal euiModal--maxWidth-default visNewVisDialog"
+              onKeyDown={[Function]}
+              role="menu"
+              tabIndex={0}
             >
-              <ForwardRef
-                as={
-                  Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "classNames": Object {
-                      "fullWidth": "width-before-scroll-bar",
-                      "zeroRight": "right-scroll-bar-position",
-                    },
-                    "defaultProps": Object {
-                      "enabled": true,
-                      "inert": false,
-                      "removeScrollBar": true,
-                    },
-                    "render": [Function],
-                  }
-                }
-                autoFocus={true}
-                crossFrame={true}
-                disabled={false}
-                lockProps={
-                  Object {
-                    "allowPinchZoom": undefined,
-                    "enabled": false,
-                    "inert": undefined,
-                    "onMouseDown": [Function],
-                    "onTouchStart": [Function],
-                    "shards": undefined,
-                    "sideCar": [Function],
-                  }
-                }
-                noFocusGuards={false}
-                onActivation={[Function]}
-                onDeactivation={[Function]}
-                persistentFocus={false}
-                returnFocus={true}
-                sideCar={[Function]}
+              <EuiI18n
+                default="Closes this modal window"
+                token="euiModal.closeModal"
               >
-                <div
-                  data-focus-guard={true}
-                  key="guard-first"
-                  style={
-                    Object {
-                      "height": "0px",
-                      "left": "1px",
-                      "overflow": "hidden",
-                      "padding": 0,
-                      "position": "fixed",
-                      "top": "1px",
-                      "width": "1px",
-                    }
-                  }
-                  tabIndex={0}
-                />
-                <div
-                  data-focus-guard={true}
-                  key="guard-nearest"
-                  style={
+                <EuiButtonIcon
+                  aria-label="Closes this modal window"
+                  className="euiModal__closeIcon"
+                  color="text"
+                  iconType="cross"
+                  onClick={[Function]}
+                >
+                  <button
+                    aria-label="Closes this modal window"
+                    className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                    onClick={[Function]}
+                    type="button"
+                  >
+                    <EuiIcon
+                      aria-hidden="true"
+                      className="euiButtonIcon__icon"
+                      size="m"
+                      type="cross"
+                    >
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="cross"
+                        size="m"
+                      />
+                    </EuiIcon>
+                  </button>
+                </EuiButtonIcon>
+              </EuiI18n>
+              <div
+                className="euiModal__flex"
+              >
+                <TypeSelection
+                  addBasePath={[Function]}
+                  onVisTypeSelected={[Function]}
+                  visTypesRegistry={
                     Object {
-                      "height": "0px",
-                      "left": "1px",
-                      "overflow": "hidden",
-                      "padding": 0,
-                      "position": "fixed",
-                      "top": "1px",
-                      "width": "1px",
+                      "all": [Function],
+                      "get": [Function],
+                      "getAliases": [Function],
                     }
                   }
-                  tabIndex={1}
-                />
-                <RequireSideCar
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  id={Object {}}
-                  observed={
+                >
+                  <EuiModalHeader>
                     <div
-                      data-focus-lock-disabled="false"
+                      className="euiModalHeader"
                     >
-                      <div
-                        aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                        class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                        role="menu"
-                        tabindex="0"
-                      >
-                        <button
-                          aria-label="Closes this modal window"
-                          class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                          type="button"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="euiButtonIcon__icon"
-                            data-euiicon-type="cross"
-                          />
-                        </button>
+                      <EuiModalHeaderTitle>
                         <div
-                          class="euiModal__flex"
+                          className="euiModalHeader__title"
                         >
-                          <div
-                            class="euiModalHeader"
+                          <FormattedMessage
+                            defaultMessage="New Visualization"
+                            id="visualizations.newVisWizard.title"
+                            values={Object {}}
                           >
-                            <div
-                              class="euiModalHeader__title"
-                            >
-                              New Visualization
-                            </div>
-                          </div>
+                            New Visualization
+                          </FormattedMessage>
+                        </div>
+                      </EuiModalHeaderTitle>
+                    </div>
+                  </EuiModalHeader>
+                  <div
+                    className="visNewVisDialog__body"
+                  >
+                    <EuiFlexGroup
+                      gutterSize="xl"
+                    >
+                      <div
+                        className="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                      >
+                        <EuiFlexItem>
                           <div
-                            class="visNewVisDialog__body"
+                            className="euiFlexItem"
                           >
-                            <div
-                              class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                            <EuiFlexGroup
+                              className="visNewVisDialog__list"
+                              direction="column"
+                              gutterSize="none"
+                              responsive={false}
                             >
                               <div
-                                class="euiFlexItem"
+                                className="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
                               >
-                                <div
-                                  class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
+                                <EuiFlexItem
+                                  className="visNewVisDialog__searchWrapper"
+                                  grow={false}
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
+                                    className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
                                   >
-                                    <div
-                                      class="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                    <EuiFieldSearch
+                                      aria-label="Filter for a visualization type"
+                                      compressed={false}
+                                      data-test-subj="filterVisType"
+                                      fullWidth={true}
+                                      incremental={false}
+                                      isClearable={true}
+                                      isLoading={false}
+                                      onChange={[Function]}
+                                      placeholder="Filter"
+                                      value="with"
                                     >
-                                      <div
-                                        class="euiFormControlLayout__childrenWrapper"
+                                      <EuiFormControlLayout
+                                        clear={
+                                          Object {
+                                            "onClick": [Function],
+                                          }
+                                        }
+                                        compressed={false}
+                                        fullWidth={true}
+                                        icon="search"
+                                        isLoading={false}
                                       >
-                                        <input
-                                          aria-label="Filter for a visualization type"
-                                          class="euiFieldSearch euiFieldSearch--fullWidth"
-                                          data-test-subj="filterVisType"
-                                          placeholder="Filter"
-                                          type="search"
-                                          value="with"
-                                        />
                                         <div
-                                          class="euiFormControlLayoutIcons"
+                                          className="euiFormControlLayout euiFormControlLayout--fullWidth"
                                         >
-                                          <span
-                                            class="euiFormControlLayoutCustomIcon"
-                                          >
-                                            <div
-                                              aria-hidden="true"
-                                              class="euiFormControlLayoutCustomIcon__icon"
-                                              data-euiicon-type="search"
-                                            />
-                                          </span>
-                                        </div>
-                                        <div
-                                          class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                                        >
-                                          <button
-                                            aria-label="Clear input"
-                                            class="euiFormControlLayoutClearButton"
-                                            type="button"
+                                          <div
+                                            className="euiFormControlLayout__childrenWrapper"
                                           >
-                                            <div
-                                              class="euiFormControlLayoutClearButton__icon"
-                                              data-euiicon-type="cross"
-                                            />
-                                          </button>
+                                            <EuiValidatableControl>
+                                              <input
+                                                aria-label="Filter for a visualization type"
+                                                className="euiFieldSearch euiFieldSearch--fullWidth"
+                                                data-test-subj="filterVisType"
+                                                onChange={[Function]}
+                                                onKeyUp={[Function]}
+                                                placeholder="Filter"
+                                                type="search"
+                                                value="with"
+                                              />
+                                            </EuiValidatableControl>
+                                            <EuiFormControlLayoutIcons
+                                              clear={
+                                                Object {
+                                                  "onClick": [Function],
+                                                }
+                                              }
+                                              icon="search"
+                                              isLoading={false}
+                                            >
+                                              <div
+                                                className="euiFormControlLayoutIcons"
+                                              >
+                                                <EuiFormControlLayoutCustomIcon
+                                                  type="search"
+                                                >
+                                                  <span
+                                                    className="euiFormControlLayoutCustomIcon"
+                                                  >
+                                                    <EuiIcon
+                                                      aria-hidden="true"
+                                                      className="euiFormControlLayoutCustomIcon__icon"
+                                                      type="search"
+                                                    >
+                                                      <div
+                                                        aria-hidden="true"
+                                                        className="euiFormControlLayoutCustomIcon__icon"
+                                                        data-euiicon-type="search"
+                                                      />
+                                                    </EuiIcon>
+                                                  </span>
+                                                </EuiFormControlLayoutCustomIcon>
+                                              </div>
+                                              <div
+                                                className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+                                              >
+                                                <EuiFormControlLayoutClearButton
+                                                  onClick={[Function]}
+                                                >
+                                                  <EuiI18n
+                                                    default="Clear input"
+                                                    token="euiFormControlLayoutClearButton.label"
+                                                  >
+                                                    <button
+                                                      aria-label="Clear input"
+                                                      className="euiFormControlLayoutClearButton"
+                                                      onClick={[Function]}
+                                                      type="button"
+                                                    >
+                                                      <EuiIcon
+                                                        className="euiFormControlLayoutClearButton__icon"
+                                                        type="cross"
+                                                      >
+                                                        <div
+                                                          className="euiFormControlLayoutClearButton__icon"
+                                                          data-euiicon-type="cross"
+                                                        />
+                                                      </EuiIcon>
+                                                    </button>
+                                                  </EuiI18n>
+                                                </EuiFormControlLayoutClearButton>
+                                              </div>
+                                            </EuiFormControlLayoutIcons>
+                                          </div>
                                         </div>
-                                      </div>
-                                    </div>
+                                      </EuiFormControlLayout>
+                                    </EuiFieldSearch>
                                   </div>
+                                </EuiFlexItem>
+                                <EuiFlexItem
+                                  className="visNewVisDialog__typesWrapper"
+                                  grow={1}
+                                >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
+                                    className="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
                                   >
-                                    <span
-                                      aria-live="polite"
-                                      class="euiScreenReaderOnly"
-                                    >
-                                      2 types found
-                                    </span>
-                                    <ul
-                                      class="euiKeyPadMenu visNewVisDialog__types"
+                                    <EuiScreenReaderOnly>
+                                      <span
+                                        aria-live="polite"
+                                        className="euiScreenReaderOnly"
+                                      >
+                                        <FormattedMessage
+                                          defaultMessage="{resultCount} {resultCount, plural, one {type} other {types} } found"
+                                          id="visualizations.newVisWizard.resultsFound"
+                                          values={
+                                            Object {
+                                              "resultCount": 2,
+                                            }
+                                          }
+                                        >
+                                          2 types found
+                                        </FormattedMessage>
+                                      </span>
+                                    </EuiScreenReaderOnly>
+                                    <EuiKeyPadMenu
+                                      className="visNewVisDialog__types"
                                       data-test-subj="visNewDialogTypes"
                                     >
-                                      <li>
-                                        <button
-                                          aria-describedby="visTypeDescription-visWithAliasUrl"
-                                          class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                          data-test-subj="visType-visWithAliasUrl"
-                                          data-vis-stage="alias"
-                                          role="menuitem"
-                                          type="button"
+                                      <ul
+                                        className="euiKeyPadMenu visNewVisDialog__types"
+                                        data-test-subj="visNewDialogTypes"
+                                      >
+                                        <li
+                                          key=".$visWithAliasUrl"
                                         >
-                                          <div
-                                            class="euiKeyPadMenuItem__inner"
-                                          >
-                                            <span
-                                              class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                            >
-                                              <span
-                                                class="euiToolTipAnchor"
-                                              >
-                                                <span
-                                                  class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                  tabindex="0"
-                                                >
-                                                  <div
-                                                    aria-hidden="true"
-                                                    class="euiBetaBadge__icon"
-                                                    data-euiicon-type="popout"
-                                                  />
-                                                </span>
-                                              </span>
-                                            </span>
-                                            <div
-                                              class="euiKeyPadMenuItem__icon"
-                                            >
-                                              <div
-                                                color="secondary"
-                                                data-euiicon-type="empty"
-                                              />
-                                            </div>
-                                            <p
-                                              class="euiKeyPadMenuItem__label"
-                                            >
+                                          <EuiKeyPadMenuItem
+                                            aria-describedby="visTypeDescription-visWithAliasUrl"
+                                            betaBadgeIconType="popout"
+                                            betaBadgeLabel="Kibana application"
+                                            betaBadgeTooltipContent="Opens a Kibana application that is outside of Visualize."
+                                            className="visNewVisDialog__type"
+                                            data-test-subj="visType-visWithAliasUrl"
+                                            data-vis-stage="alias"
+                                            disabled={false}
+                                            key="visWithAliasUrl"
+                                            label={
                                               <span
                                                 data-test-subj="visTypeTitle"
                                               >
                                                 Vis with alias Url
                                               </span>
-                                            </p>
-                                          </div>
-                                        </button>
-                                      </li>
-                                      <li>
-                                        <button
-                                          aria-describedby="visTypeDescription-visWithSearch"
-                                          class="euiKeyPadMenuItem visNewVisDialog__type"
-                                          data-test-subj="visType-visWithSearch"
-                                          data-vis-stage="production"
-                                          role="menuitem"
-                                          type="button"
-                                        >
-                                          <div
-                                            class="euiKeyPadMenuItem__inner"
+                                            }
+                                            onBlur={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onMouseEnter={[Function]}
+                                            onMouseLeave={[Function]}
+                                            role="menuitem"
                                           >
-                                            <div
-                                              class="euiKeyPadMenuItem__icon"
+                                            <button
+                                              aria-describedby="visTypeDescription-visWithAliasUrl"
+                                              className="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
+                                              data-test-subj="visType-visWithAliasUrl"
+                                              data-vis-stage="alias"
+                                              disabled={false}
+                                              onBlur={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onMouseEnter={[Function]}
+                                              onMouseLeave={[Function]}
+                                              role="menuitem"
+                                              type="button"
                                             >
                                               <div
-                                                color="secondary"
-                                                data-euiicon-type="empty"
-                                              />
-                                            </div>
-                                            <p
-                                              class="euiKeyPadMenuItem__label"
-                                            >
+                                                className="euiKeyPadMenuItem__inner"
+                                              >
+                                                <span
+                                                  className="euiKeyPadMenuItem__betaBadgeWrapper"
+                                                >
+                                                  <EuiBetaBadge
+                                                    className="euiKeyPadMenuItem__betaBadge"
+                                                    iconType="popout"
+                                                    label="Kibana application"
+                                                    tooltipContent="Opens a Kibana application that is outside of Visualize."
+                                                  >
+                                                    <EuiToolTip
+                                                      content="Opens a Kibana application that is outside of Visualize."
+                                                      delay="regular"
+                                                      position="top"
+                                                      title="Kibana application"
+                                                    >
+                                                      <span
+                                                        className="euiToolTipAnchor"
+                                                        onKeyUp={[Function]}
+                                                        onMouseOut={[Function]}
+                                                        onMouseOver={[Function]}
+                                                      >
+                                                        <span
+                                                          className="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
+                                                          onBlur={[Function]}
+                                                          onFocus={[Function]}
+                                                          tabIndex={0}
+                                                        >
+                                                          <EuiIcon
+                                                            aria-hidden="true"
+                                                            className="euiBetaBadge__icon"
+                                                            size="m"
+                                                            type="popout"
+                                                          >
+                                                            <div
+                                                              aria-hidden="true"
+                                                              className="euiBetaBadge__icon"
+                                                              data-euiicon-type="popout"
+                                                              size="m"
+                                                            />
+                                                          </EuiIcon>
+                                                        </span>
+                                                      </span>
+                                                    </EuiToolTip>
+                                                  </EuiBetaBadge>
+                                                </span>
+                                                <div
+                                                  className="euiKeyPadMenuItem__icon"
+                                                >
+                                                  <VisTypeIcon>
+                                                    <EuiIcon
+                                                      color="secondary"
+                                                      size="l"
+                                                      type="empty"
+                                                    >
+                                                      <div
+                                                        color="secondary"
+                                                        data-euiicon-type="empty"
+                                                        size="l"
+                                                      />
+                                                    </EuiIcon>
+                                                  </VisTypeIcon>
+                                                </div>
+                                                <p
+                                                  className="euiKeyPadMenuItem__label"
+                                                >
+                                                  <span
+                                                    data-test-subj="visTypeTitle"
+                                                  >
+                                                    Vis with alias Url
+                                                  </span>
+                                                </p>
+                                              </div>
+                                            </button>
+                                          </EuiKeyPadMenuItem>
+                                        </li>
+                                        <li
+                                          key=".$visWithSearch"
+                                        >
+                                          <EuiKeyPadMenuItem
+                                            aria-describedby="visTypeDescription-visWithSearch"
+                                            className="visNewVisDialog__type"
+                                            data-test-subj="visType-visWithSearch"
+                                            data-vis-stage="production"
+                                            disabled={false}
+                                            key="visWithSearch"
+                                            label={
                                               <span
                                                 data-test-subj="visTypeTitle"
                                               >
                                                 Vis with search
                                               </span>
-                                            </p>
-                                          </div>
-                                        </button>
-                                      </li>
-                                      <li>
-                                        <button
-                                          aria-describedby="visTypeDescription-vis"
-                                          class="euiKeyPadMenuItem visNewVisDialog__type"
-                                          data-test-subj="visType-vis"
-                                          data-vis-stage="production"
-                                          disabled=""
-                                          role="menuitem"
-                                          type="button"
-                                        >
-                                          <div
-                                            class="euiKeyPadMenuItem__inner"
+                                            }
+                                            onBlur={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onMouseEnter={[Function]}
+                                            onMouseLeave={[Function]}
+                                            role="menuitem"
                                           >
-                                            <div
-                                              class="euiKeyPadMenuItem__icon"
+                                            <button
+                                              aria-describedby="visTypeDescription-visWithSearch"
+                                              className="euiKeyPadMenuItem visNewVisDialog__type"
+                                              data-test-subj="visType-visWithSearch"
+                                              data-vis-stage="production"
+                                              disabled={false}
+                                              onBlur={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onMouseEnter={[Function]}
+                                              onMouseLeave={[Function]}
+                                              role="menuitem"
+                                              type="button"
                                             >
                                               <div
-                                                color="secondary"
-                                                data-euiicon-type="empty"
-                                              />
-                                            </div>
-                                            <p
-                                              class="euiKeyPadMenuItem__label"
-                                            >
+                                                className="euiKeyPadMenuItem__inner"
+                                              >
+                                                <div
+                                                  className="euiKeyPadMenuItem__icon"
+                                                >
+                                                  <VisTypeIcon>
+                                                    <EuiIcon
+                                                      color="secondary"
+                                                      size="l"
+                                                      type="empty"
+                                                    >
+                                                      <div
+                                                        color="secondary"
+                                                        data-euiicon-type="empty"
+                                                        size="l"
+                                                      />
+                                                    </EuiIcon>
+                                                  </VisTypeIcon>
+                                                </div>
+                                                <p
+                                                  className="euiKeyPadMenuItem__label"
+                                                >
+                                                  <span
+                                                    data-test-subj="visTypeTitle"
+                                                  >
+                                                    Vis with search
+                                                  </span>
+                                                </p>
+                                              </div>
+                                            </button>
+                                          </EuiKeyPadMenuItem>
+                                        </li>
+                                        <li
+                                          key=".$vis"
+                                        >
+                                          <EuiKeyPadMenuItem
+                                            aria-describedby="visTypeDescription-vis"
+                                            className="visNewVisDialog__type"
+                                            data-test-subj="visType-vis"
+                                            data-vis-stage="production"
+                                            disabled={true}
+                                            key="vis"
+                                            label={
                                               <span
                                                 data-test-subj="visTypeTitle"
                                               >
                                                 Vis Type 1
                                               </span>
-                                            </p>
-                                          </div>
-                                        </button>
-                                      </li>
-                                    </ul>
+                                            }
+                                            onBlur={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onMouseEnter={[Function]}
+                                            onMouseLeave={[Function]}
+                                            role="menuitem"
+                                          >
+                                            <button
+                                              aria-describedby="visTypeDescription-vis"
+                                              className="euiKeyPadMenuItem visNewVisDialog__type"
+                                              data-test-subj="visType-vis"
+                                              data-vis-stage="production"
+                                              disabled={true}
+                                              onBlur={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onMouseEnter={[Function]}
+                                              onMouseLeave={[Function]}
+                                              role="menuitem"
+                                              type="button"
+                                            >
+                                              <div
+                                                className="euiKeyPadMenuItem__inner"
+                                              >
+                                                <div
+                                                  className="euiKeyPadMenuItem__icon"
+                                                >
+                                                  <VisTypeIcon>
+                                                    <EuiIcon
+                                                      color="secondary"
+                                                      size="l"
+                                                      type="empty"
+                                                    >
+                                                      <div
+                                                        color="secondary"
+                                                        data-euiicon-type="empty"
+                                                        size="l"
+                                                      />
+                                                    </EuiIcon>
+                                                  </VisTypeIcon>
+                                                </div>
+                                                <p
+                                                  className="euiKeyPadMenuItem__label"
+                                                >
+                                                  <span
+                                                    data-test-subj="visTypeTitle"
+                                                  >
+                                                    Vis Type 1
+                                                  </span>
+                                                </p>
+                                              </div>
+                                            </button>
+                                          </EuiKeyPadMenuItem>
+                                        </li>
+                                      </ul>
+                                    </EuiKeyPadMenu>
                                   </div>
-                                </div>
+                                </EuiFlexItem>
                               </div>
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
+                            </EuiFlexGroup>
+                          </div>
+                        </EuiFlexItem>
+                        <EuiFlexItem
+                          className="visNewVisDialog__description"
+                          grow={false}
+                        >
+                          <div
+                            className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
+                          >
+                            <EuiTitle
+                              size="s"
+                            >
+                              <h2
+                                className="euiTitle euiTitle--small"
                               >
-                                <h2
-                                  class="euiTitle euiTitle--small"
+                                <FormattedMessage
+                                  defaultMessage="Select a visualization type"
+                                  id="visualizations.newVisWizard.selectVisType"
+                                  values={Object {}}
                                 >
                                   Select a visualization type
-                                </h2>
-                                <div
-                                  class="euiSpacer euiSpacer--m"
-                                />
+                                </FormattedMessage>
+                              </h2>
+                            </EuiTitle>
+                            <EuiSpacer
+                              size="m"
+                            >
+                              <div
+                                className="euiSpacer euiSpacer--m"
+                              />
+                            </EuiSpacer>
+                            <NewVisHelp
+                              onPromotionClicked={[Function]}
+                              promotedTypes={Array []}
+                            >
+                              <EuiText>
                                 <div
-                                  class="euiText euiText--medium"
+                                  className="euiText euiText--medium"
                                 >
                                   <p>
-                                    Start creating your visualization by selecting a type for that visualization.
+                                    <FormattedMessage
+                                      defaultMessage="Start creating your visualization by selecting a type for that visualization."
+                                      id="visualizations.newVisWizard.helpText"
+                                      values={Object {}}
+                                    >
+                                      Start creating your visualization by selecting a type for that visualization.
+                                    </FormattedMessage>
                                   </p>
                                 </div>
-                              </div>
-                            </div>
+                              </EuiText>
+                            </NewVisHelp>
                           </div>
-                        </div>
-                      </div>
-                    </div>
-                  }
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={[Function]}
-                  shards={Array []}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <SideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
-                      <div
-                        data-focus-lock-disabled="false"
-                      >
-                        <div
-                          aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                          class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                          role="menu"
-                          tabindex="0"
-                        >
-                          <button
-                            aria-label="Closes this modal window"
-                            class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              class="euiButtonIcon__icon"
-                              data-euiicon-type="cross"
-                            />
-                          </button>
-                          <div
-                            class="euiModal__flex"
-                          >
-                            <div
-                              class="euiModalHeader"
-                            >
-                              <div
-                                class="euiModalHeader__title"
-                              >
-                                New Visualization
-                              </div>
-                            </div>
-                            <div
-                              class="visNewVisDialog__body"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                              >
-                                <div
-                                  class="euiFlexItem"
-                                >
-                                  <div
-                                    class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                                  >
-                                    <div
-                                      class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                    >
-                                      <div
-                                        class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                      >
-                                        <div
-                                          class="euiFormControlLayout__childrenWrapper"
-                                        >
-                                          <input
-                                            aria-label="Filter for a visualization type"
-                                            class="euiFieldSearch euiFieldSearch--fullWidth"
-                                            data-test-subj="filterVisType"
-                                            placeholder="Filter"
-                                            type="search"
-                                            value="with"
-                                          />
-                                          <div
-                                            class="euiFormControlLayoutIcons"
-                                          >
-                                            <span
-                                              class="euiFormControlLayoutCustomIcon"
-                                            >
-                                              <div
-                                                aria-hidden="true"
-                                                class="euiFormControlLayoutCustomIcon__icon"
-                                                data-euiicon-type="search"
-                                              />
-                                            </span>
-                                          </div>
-                                          <div
-                                            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                                          >
-                                            <button
-                                              aria-label="Clear input"
-                                              class="euiFormControlLayoutClearButton"
-                                              type="button"
-                                            >
-                                              <div
-                                                class="euiFormControlLayoutClearButton__icon"
-                                                data-euiicon-type="cross"
-                                              />
-                                            </button>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                    <div
-                                      class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                    >
-                                      <span
-                                        aria-live="polite"
-                                        class="euiScreenReaderOnly"
-                                      >
-                                        2 types found
-                                      </span>
-                                      <ul
-                                        class="euiKeyPadMenu visNewVisDialog__types"
-                                        data-test-subj="visNewDialogTypes"
-                                      >
-                                        <li>
-                                          <button
-                                            aria-describedby="visTypeDescription-visWithAliasUrl"
-                                            class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                            data-test-subj="visType-visWithAliasUrl"
-                                            data-vis-stage="alias"
-                                            role="menuitem"
-                                            type="button"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__inner"
-                                            >
-                                              <span
-                                                class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                              >
-                                                <span
-                                                  class="euiToolTipAnchor"
-                                                >
-                                                  <span
-                                                    class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                    tabindex="0"
-                                                  >
-                                                    <div
-                                                      aria-hidden="true"
-                                                      class="euiBetaBadge__icon"
-                                                      data-euiicon-type="popout"
-                                                    />
-                                                  </span>
-                                                </span>
-                                              </span>
-                                              <div
-                                                class="euiKeyPadMenuItem__icon"
-                                              >
-                                                <div
-                                                  color="secondary"
-                                                  data-euiicon-type="empty"
-                                                />
-                                              </div>
-                                              <p
-                                                class="euiKeyPadMenuItem__label"
-                                              >
-                                                <span
-                                                  data-test-subj="visTypeTitle"
-                                                >
-                                                  Vis with alias Url
-                                                </span>
-                                              </p>
-                                            </div>
-                                          </button>
-                                        </li>
-                                        <li>
-                                          <button
-                                            aria-describedby="visTypeDescription-visWithSearch"
-                                            class="euiKeyPadMenuItem visNewVisDialog__type"
-                                            data-test-subj="visType-visWithSearch"
-                                            data-vis-stage="production"
-                                            role="menuitem"
-                                            type="button"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__inner"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__icon"
-                                              >
-                                                <div
-                                                  color="secondary"
-                                                  data-euiicon-type="empty"
-                                                />
-                                              </div>
-                                              <p
-                                                class="euiKeyPadMenuItem__label"
-                                              >
-                                                <span
-                                                  data-test-subj="visTypeTitle"
-                                                >
-                                                  Vis with search
-                                                </span>
-                                              </p>
-                                            </div>
-                                          </button>
-                                        </li>
-                                        <li>
-                                          <button
-                                            aria-describedby="visTypeDescription-vis"
-                                            class="euiKeyPadMenuItem visNewVisDialog__type"
-                                            data-test-subj="visType-vis"
-                                            data-vis-stage="production"
-                                            disabled=""
-                                            role="menuitem"
-                                            type="button"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__inner"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__icon"
-                                              >
-                                                <div
-                                                  color="secondary"
-                                                  data-euiicon-type="empty"
-                                                />
-                                              </div>
-                                              <p
-                                                class="euiKeyPadMenuItem__label"
-                                              >
-                                                <span
-                                                  data-test-subj="visTypeTitle"
-                                                >
-                                                  Vis Type 1
-                                                </span>
-                                              </p>
-                                            </div>
-                                          </button>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                                >
-                                  <h2
-                                    class="euiTitle euiTitle--small"
-                                  >
-                                    Select a visualization type
-                                  </h2>
-                                  <div
-                                    class="euiSpacer euiSpacer--m"
-                                  />
-                                  <div
-                                    class="euiText euiText--medium"
-                                  >
-                                    <p>
-                                      Start creating your visualization by selecting a type for that visualization.
-                                    </p>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideEffect(FocusWatcher)
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
-                        <div
-                          data-focus-lock-disabled="false"
-                        >
-                          <div
-                            aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                            class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                            role="menu"
-                            tabindex="0"
-                          >
-                            <button
-                              aria-label="Closes this modal window"
-                              class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                              type="button"
-                            >
-                              <div
-                                aria-hidden="true"
-                                class="euiButtonIcon__icon"
-                                data-euiicon-type="cross"
-                              />
-                            </button>
-                            <div
-                              class="euiModal__flex"
-                            >
-                              <div
-                                class="euiModalHeader"
-                              >
-                                <div
-                                  class="euiModalHeader__title"
-                                >
-                                  New Visualization
-                                </div>
-                              </div>
-                              <div
-                                class="visNewVisDialog__body"
-                              >
-                                <div
-                                  class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                                >
-                                  <div
-                                    class="euiFlexItem"
-                                  >
-                                    <div
-                                      class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                                    >
-                                      <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                      >
-                                        <div
-                                          class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                        >
-                                          <div
-                                            class="euiFormControlLayout__childrenWrapper"
-                                          >
-                                            <input
-                                              aria-label="Filter for a visualization type"
-                                              class="euiFieldSearch euiFieldSearch--fullWidth"
-                                              data-test-subj="filterVisType"
-                                              placeholder="Filter"
-                                              type="search"
-                                              value="with"
-                                            />
-                                            <div
-                                              class="euiFormControlLayoutIcons"
-                                            >
-                                              <span
-                                                class="euiFormControlLayoutCustomIcon"
-                                              >
-                                                <div
-                                                  aria-hidden="true"
-                                                  class="euiFormControlLayoutCustomIcon__icon"
-                                                  data-euiicon-type="search"
-                                                />
-                                              </span>
-                                            </div>
-                                            <div
-                                              class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                                            >
-                                              <button
-                                                aria-label="Clear input"
-                                                class="euiFormControlLayoutClearButton"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiFormControlLayoutClearButton__icon"
-                                                  data-euiicon-type="cross"
-                                                />
-                                              </button>
-                                            </div>
-                                          </div>
-                                        </div>
-                                      </div>
-                                      <div
-                                        class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                      >
-                                        <span
-                                          aria-live="polite"
-                                          class="euiScreenReaderOnly"
-                                        >
-                                          2 types found
-                                        </span>
-                                        <ul
-                                          class="euiKeyPadMenu visNewVisDialog__types"
-                                          data-test-subj="visNewDialogTypes"
-                                        >
-                                          <li>
-                                            <button
-                                              aria-describedby="visTypeDescription-visWithAliasUrl"
-                                              class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                              data-test-subj="visType-visWithAliasUrl"
-                                              data-vis-stage="alias"
-                                              role="menuitem"
-                                              type="button"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__inner"
-                                              >
-                                                <span
-                                                  class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                                >
-                                                  <span
-                                                    class="euiToolTipAnchor"
-                                                  >
-                                                    <span
-                                                      class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                      tabindex="0"
-                                                    >
-                                                      <div
-                                                        aria-hidden="true"
-                                                        class="euiBetaBadge__icon"
-                                                        data-euiicon-type="popout"
-                                                      />
-                                                    </span>
-                                                  </span>
-                                                </span>
-                                                <div
-                                                  class="euiKeyPadMenuItem__icon"
-                                                >
-                                                  <div
-                                                    color="secondary"
-                                                    data-euiicon-type="empty"
-                                                  />
-                                                </div>
-                                                <p
-                                                  class="euiKeyPadMenuItem__label"
-                                                >
-                                                  <span
-                                                    data-test-subj="visTypeTitle"
-                                                  >
-                                                    Vis with alias Url
-                                                  </span>
-                                                </p>
-                                              </div>
-                                            </button>
-                                          </li>
-                                          <li>
-                                            <button
-                                              aria-describedby="visTypeDescription-visWithSearch"
-                                              class="euiKeyPadMenuItem visNewVisDialog__type"
-                                              data-test-subj="visType-visWithSearch"
-                                              data-vis-stage="production"
-                                              role="menuitem"
-                                              type="button"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__inner"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__icon"
-                                                >
-                                                  <div
-                                                    color="secondary"
-                                                    data-euiicon-type="empty"
-                                                  />
-                                                </div>
-                                                <p
-                                                  class="euiKeyPadMenuItem__label"
-                                                >
-                                                  <span
-                                                    data-test-subj="visTypeTitle"
-                                                  >
-                                                    Vis with search
-                                                  </span>
-                                                </p>
-                                              </div>
-                                            </button>
-                                          </li>
-                                          <li>
-                                            <button
-                                              aria-describedby="visTypeDescription-vis"
-                                              class="euiKeyPadMenuItem visNewVisDialog__type"
-                                              data-test-subj="visType-vis"
-                                              data-vis-stage="production"
-                                              disabled=""
-                                              role="menuitem"
-                                              type="button"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__inner"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__icon"
-                                                >
-                                                  <div
-                                                    color="secondary"
-                                                    data-euiicon-type="empty"
-                                                  />
-                                                </div>
-                                                <p
-                                                  class="euiKeyPadMenuItem__label"
-                                                >
-                                                  <span
-                                                    data-test-subj="visTypeTitle"
-                                                  >
-                                                    Vis Type 1
-                                                  </span>
-                                                </p>
-                                              </div>
-                                            </button>
-                                          </li>
-                                        </ul>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                                  >
-                                    <h2
-                                      class="euiTitle euiTitle--small"
-                                    >
-                                      Select a visualization type
-                                    </h2>
-                                    <div
-                                      class="euiSpacer euiSpacer--m"
-                                    />
-                                    <div
-                                      class="euiText euiText--medium"
-                                    >
-                                      <p>
-                                        Start creating your visualization by selecting a type for that visualization.
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                    >
-                      <FocusWatcher
-                        autoFocus={true}
-                        crossFrame={true}
-                        disabled={false}
-                        id={Object {}}
-                        observed={
-                          <div
-                            data-focus-lock-disabled="false"
-                          >
-                            <div
-                              aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                              class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                              role="menu"
-                              tabindex="0"
-                            >
-                              <button
-                                aria-label="Closes this modal window"
-                                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                                type="button"
-                              >
-                                <div
-                                  aria-hidden="true"
-                                  class="euiButtonIcon__icon"
-                                  data-euiicon-type="cross"
-                                />
-                              </button>
-                              <div
-                                class="euiModal__flex"
-                              >
-                                <div
-                                  class="euiModalHeader"
-                                >
-                                  <div
-                                    class="euiModalHeader__title"
-                                  >
-                                    New Visualization
-                                  </div>
-                                </div>
-                                <div
-                                  class="visNewVisDialog__body"
-                                >
-                                  <div
-                                    class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                                  >
-                                    <div
-                                      class="euiFlexItem"
-                                    >
-                                      <div
-                                        class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                                      >
-                                        <div
-                                          class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                        >
-                                          <div
-                                            class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                          >
-                                            <div
-                                              class="euiFormControlLayout__childrenWrapper"
-                                            >
-                                              <input
-                                                aria-label="Filter for a visualization type"
-                                                class="euiFieldSearch euiFieldSearch--fullWidth"
-                                                data-test-subj="filterVisType"
-                                                placeholder="Filter"
-                                                type="search"
-                                                value="with"
-                                              />
-                                              <div
-                                                class="euiFormControlLayoutIcons"
-                                              >
-                                                <span
-                                                  class="euiFormControlLayoutCustomIcon"
-                                                >
-                                                  <div
-                                                    aria-hidden="true"
-                                                    class="euiFormControlLayoutCustomIcon__icon"
-                                                    data-euiicon-type="search"
-                                                  />
-                                                </span>
-                                              </div>
-                                              <div
-                                                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                                              >
-                                                <button
-                                                  aria-label="Clear input"
-                                                  class="euiFormControlLayoutClearButton"
-                                                  type="button"
-                                                >
-                                                  <div
-                                                    class="euiFormControlLayoutClearButton__icon"
-                                                    data-euiicon-type="cross"
-                                                  />
-                                                </button>
-                                              </div>
-                                            </div>
-                                          </div>
-                                        </div>
-                                        <div
-                                          class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                        >
-                                          <span
-                                            aria-live="polite"
-                                            class="euiScreenReaderOnly"
-                                          >
-                                            2 types found
-                                          </span>
-                                          <ul
-                                            class="euiKeyPadMenu visNewVisDialog__types"
-                                            data-test-subj="visNewDialogTypes"
-                                          >
-                                            <li>
-                                              <button
-                                                aria-describedby="visTypeDescription-visWithAliasUrl"
-                                                class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                                data-test-subj="visType-visWithAliasUrl"
-                                                data-vis-stage="alias"
-                                                role="menuitem"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__inner"
-                                                >
-                                                  <span
-                                                    class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                                  >
-                                                    <span
-                                                      class="euiToolTipAnchor"
-                                                    >
-                                                      <span
-                                                        class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                        tabindex="0"
-                                                      >
-                                                        <div
-                                                          aria-hidden="true"
-                                                          class="euiBetaBadge__icon"
-                                                          data-euiicon-type="popout"
-                                                        />
-                                                      </span>
-                                                    </span>
-                                                  </span>
-                                                  <div
-                                                    class="euiKeyPadMenuItem__icon"
-                                                  >
-                                                    <div
-                                                      color="secondary"
-                                                      data-euiicon-type="empty"
-                                                    />
-                                                  </div>
-                                                  <p
-                                                    class="euiKeyPadMenuItem__label"
-                                                  >
-                                                    <span
-                                                      data-test-subj="visTypeTitle"
-                                                    >
-                                                      Vis with alias Url
-                                                    </span>
-                                                  </p>
-                                                </div>
-                                              </button>
-                                            </li>
-                                            <li>
-                                              <button
-                                                aria-describedby="visTypeDescription-visWithSearch"
-                                                class="euiKeyPadMenuItem visNewVisDialog__type"
-                                                data-test-subj="visType-visWithSearch"
-                                                data-vis-stage="production"
-                                                role="menuitem"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__inner"
-                                                >
-                                                  <div
-                                                    class="euiKeyPadMenuItem__icon"
-                                                  >
-                                                    <div
-                                                      color="secondary"
-                                                      data-euiicon-type="empty"
-                                                    />
-                                                  </div>
-                                                  <p
-                                                    class="euiKeyPadMenuItem__label"
-                                                  >
-                                                    <span
-                                                      data-test-subj="visTypeTitle"
-                                                    >
-                                                      Vis with search
-                                                    </span>
-                                                  </p>
-                                                </div>
-                                              </button>
-                                            </li>
-                                            <li>
-                                              <button
-                                                aria-describedby="visTypeDescription-vis"
-                                                class="euiKeyPadMenuItem visNewVisDialog__type"
-                                                data-test-subj="visType-vis"
-                                                data-vis-stage="production"
-                                                disabled=""
-                                                role="menuitem"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__inner"
-                                                >
-                                                  <div
-                                                    class="euiKeyPadMenuItem__icon"
-                                                  >
-                                                    <div
-                                                      color="secondary"
-                                                      data-euiicon-type="empty"
-                                                    />
-                                                  </div>
-                                                  <p
-                                                    class="euiKeyPadMenuItem__label"
-                                                  >
-                                                    <span
-                                                      data-test-subj="visTypeTitle"
-                                                    >
-                                                      Vis Type 1
-                                                    </span>
-                                                  </p>
-                                                </div>
-                                              </button>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                    <div
-                                      class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                                    >
-                                      <h2
-                                        class="euiTitle euiTitle--small"
-                                      >
-                                        Select a visualization type
-                                      </h2>
-                                      <div
-                                        class="euiSpacer euiSpacer--m"
-                                      />
-                                      <div
-                                        class="euiText euiText--medium"
-                                      >
-                                        <p>
-                                          Start creating your visualization by selecting a type for that visualization.
-                                        </p>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        }
-                        onActivation={[Function]}
-                        onDeactivation={[Function]}
-                        persistentFocus={false}
-                        returnFocus={[Function]}
-                        shards={Array []}
-                      />
-                    </SideEffect(FocusWatcher)>
-                  </SideCar>
-                </RequireSideCar>
-                <ForwardRef
-                  data-focus-lock-disabled={false}
-                  enabled={false}
-                  inert={false}
-                  onBlur={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onTouchStart={[Function]}
-                  removeScrollBar={true}
-                  sideCar={[Function]}
-                >
-                  <div
-                    data-focus-lock-disabled={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onScrollCapture={[Function]}
-                    onTouchMoveCapture={[Function]}
-                    onTouchStart={[Function]}
-                    onWheelCapture={[Function]}
-                  >
-                    <div
-                      aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                      className="euiModal euiModal--maxWidth-default visNewVisDialog"
-                      onKeyDown={[Function]}
-                      role="menu"
-                      tabIndex={0}
-                    >
-                      <EuiI18n
-                        default="Closes this modal window"
-                        token="euiModal.closeModal"
-                      >
-                        <EuiButtonIcon
-                          aria-label="Closes this modal window"
-                          className="euiModal__closeIcon"
-                          color="text"
-                          iconType="cross"
-                          onClick={[Function]}
-                        >
-                          <button
-                            aria-label="Closes this modal window"
-                            className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            onClick={[Function]}
-                            type="button"
-                          >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              size="m"
-                              type="cross"
-                            >
-                              <div
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                data-euiicon-type="cross"
-                                size="m"
-                              />
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
-                      </EuiI18n>
-                      <div
-                        className="euiModal__flex"
-                      >
-                        <TypeSelection
-                          addBasePath={[Function]}
-                          onVisTypeSelected={[Function]}
-                          visTypesRegistry={
-                            Object {
-                              "all": [Function],
-                              "get": [Function],
-                              "getAliases": [Function],
-                            }
-                          }
-                        >
-                          <EuiModalHeader>
-                            <div
-                              className="euiModalHeader"
-                            >
-                              <EuiModalHeaderTitle>
-                                <div
-                                  className="euiModalHeader__title"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="New Visualization"
-                                    id="visualizations.newVisWizard.title"
-                                    values={Object {}}
-                                  >
-                                    New Visualization
-                                  </FormattedMessage>
-                                </div>
-                              </EuiModalHeaderTitle>
-                            </div>
-                          </EuiModalHeader>
-                          <div
-                            className="visNewVisDialog__body"
-                          >
-                            <EuiFlexGroup
-                              gutterSize="xl"
-                            >
-                              <div
-                                className="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                              >
-                                <EuiFlexItem>
-                                  <div
-                                    className="euiFlexItem"
-                                  >
-                                    <EuiFlexGroup
-                                      className="visNewVisDialog__list"
-                                      direction="column"
-                                      gutterSize="none"
-                                      responsive={false}
-                                    >
-                                      <div
-                                        className="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                                      >
-                                        <EuiFlexItem
-                                          className="visNewVisDialog__searchWrapper"
-                                          grow={false}
-                                        >
-                                          <div
-                                            className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                          >
-                                            <EuiFieldSearch
-                                              aria-label="Filter for a visualization type"
-                                              compressed={false}
-                                              data-test-subj="filterVisType"
-                                              fullWidth={true}
-                                              incremental={false}
-                                              isClearable={true}
-                                              isLoading={false}
-                                              onChange={[Function]}
-                                              placeholder="Filter"
-                                              value="with"
-                                            >
-                                              <EuiFormControlLayout
-                                                clear={
-                                                  Object {
-                                                    "onClick": [Function],
-                                                  }
-                                                }
-                                                compressed={false}
-                                                fullWidth={true}
-                                                icon="search"
-                                                isLoading={false}
-                                              >
-                                                <div
-                                                  className="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                                >
-                                                  <div
-                                                    className="euiFormControlLayout__childrenWrapper"
-                                                  >
-                                                    <EuiValidatableControl>
-                                                      <input
-                                                        aria-label="Filter for a visualization type"
-                                                        className="euiFieldSearch euiFieldSearch--fullWidth"
-                                                        data-test-subj="filterVisType"
-                                                        onChange={[Function]}
-                                                        onKeyUp={[Function]}
-                                                        placeholder="Filter"
-                                                        type="search"
-                                                        value="with"
-                                                      />
-                                                    </EuiValidatableControl>
-                                                    <EuiFormControlLayoutIcons
-                                                      clear={
-                                                        Object {
-                                                          "onClick": [Function],
-                                                        }
-                                                      }
-                                                      icon="search"
-                                                      isLoading={false}
-                                                    >
-                                                      <div
-                                                        className="euiFormControlLayoutIcons"
-                                                      >
-                                                        <EuiFormControlLayoutCustomIcon
-                                                          type="search"
-                                                        >
-                                                          <span
-                                                            className="euiFormControlLayoutCustomIcon"
-                                                          >
-                                                            <EuiIcon
-                                                              aria-hidden="true"
-                                                              className="euiFormControlLayoutCustomIcon__icon"
-                                                              type="search"
-                                                            >
-                                                              <div
-                                                                aria-hidden="true"
-                                                                className="euiFormControlLayoutCustomIcon__icon"
-                                                                data-euiicon-type="search"
-                                                              />
-                                                            </EuiIcon>
-                                                          </span>
-                                                        </EuiFormControlLayoutCustomIcon>
-                                                      </div>
-                                                      <div
-                                                        className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                                                      >
-                                                        <EuiFormControlLayoutClearButton
-                                                          onClick={[Function]}
-                                                        >
-                                                          <EuiI18n
-                                                            default="Clear input"
-                                                            token="euiFormControlLayoutClearButton.label"
-                                                          >
-                                                            <button
-                                                              aria-label="Clear input"
-                                                              className="euiFormControlLayoutClearButton"
-                                                              onClick={[Function]}
-                                                              type="button"
-                                                            >
-                                                              <EuiIcon
-                                                                className="euiFormControlLayoutClearButton__icon"
-                                                                type="cross"
-                                                              >
-                                                                <div
-                                                                  className="euiFormControlLayoutClearButton__icon"
-                                                                  data-euiicon-type="cross"
-                                                                />
-                                                              </EuiIcon>
-                                                            </button>
-                                                          </EuiI18n>
-                                                        </EuiFormControlLayoutClearButton>
-                                                      </div>
-                                                    </EuiFormControlLayoutIcons>
-                                                  </div>
-                                                </div>
-                                              </EuiFormControlLayout>
-                                            </EuiFieldSearch>
-                                          </div>
-                                        </EuiFlexItem>
-                                        <EuiFlexItem
-                                          className="visNewVisDialog__typesWrapper"
-                                          grow={1}
-                                        >
-                                          <div
-                                            className="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                          >
-                                            <EuiScreenReaderOnly>
-                                              <span
-                                                aria-live="polite"
-                                                className="euiScreenReaderOnly"
-                                              >
-                                                <FormattedMessage
-                                                  defaultMessage="{resultCount} {resultCount, plural, one {type} other {types} } found"
-                                                  id="visualizations.newVisWizard.resultsFound"
-                                                  values={
-                                                    Object {
-                                                      "resultCount": 2,
-                                                    }
-                                                  }
-                                                >
-                                                  2 types found
-                                                </FormattedMessage>
-                                              </span>
-                                            </EuiScreenReaderOnly>
-                                            <EuiKeyPadMenu
-                                              className="visNewVisDialog__types"
-                                              data-test-subj="visNewDialogTypes"
-                                            >
-                                              <ul
-                                                className="euiKeyPadMenu visNewVisDialog__types"
-                                                data-test-subj="visNewDialogTypes"
-                                              >
-                                                <li
-                                                  key=".$visWithAliasUrl"
-                                                >
-                                                  <EuiKeyPadMenuItem
-                                                    aria-describedby="visTypeDescription-visWithAliasUrl"
-                                                    betaBadgeIconType="popout"
-                                                    betaBadgeLabel="Kibana application"
-                                                    betaBadgeTooltipContent="Opens a Kibana application that is outside of Visualize."
-                                                    className="visNewVisDialog__type"
-                                                    data-test-subj="visType-visWithAliasUrl"
-                                                    data-vis-stage="alias"
-                                                    disabled={false}
-                                                    key="visWithAliasUrl"
-                                                    label={
-                                                      <span
-                                                        data-test-subj="visTypeTitle"
-                                                      >
-                                                        Vis with alias Url
-                                                      </span>
-                                                    }
-                                                    onBlur={[Function]}
-                                                    onClick={[Function]}
-                                                    onFocus={[Function]}
-                                                    onMouseEnter={[Function]}
-                                                    onMouseLeave={[Function]}
-                                                    role="menuitem"
-                                                  >
-                                                    <button
-                                                      aria-describedby="visTypeDescription-visWithAliasUrl"
-                                                      className="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                                      data-test-subj="visType-visWithAliasUrl"
-                                                      data-vis-stage="alias"
-                                                      disabled={false}
-                                                      onBlur={[Function]}
-                                                      onClick={[Function]}
-                                                      onFocus={[Function]}
-                                                      onMouseEnter={[Function]}
-                                                      onMouseLeave={[Function]}
-                                                      role="menuitem"
-                                                      type="button"
-                                                    >
-                                                      <div
-                                                        className="euiKeyPadMenuItem__inner"
-                                                      >
-                                                        <span
-                                                          className="euiKeyPadMenuItem__betaBadgeWrapper"
-                                                        >
-                                                          <EuiBetaBadge
-                                                            className="euiKeyPadMenuItem__betaBadge"
-                                                            iconType="popout"
-                                                            label="Kibana application"
-                                                            tooltipContent="Opens a Kibana application that is outside of Visualize."
-                                                          >
-                                                            <EuiToolTip
-                                                              content="Opens a Kibana application that is outside of Visualize."
-                                                              delay="regular"
-                                                              position="top"
-                                                              title="Kibana application"
-                                                            >
-                                                              <span
-                                                                className="euiToolTipAnchor"
-                                                                onKeyUp={[Function]}
-                                                                onMouseOut={[Function]}
-                                                                onMouseOver={[Function]}
-                                                              >
-                                                                <span
-                                                                  className="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                                  onBlur={[Function]}
-                                                                  onFocus={[Function]}
-                                                                  tabIndex={0}
-                                                                >
-                                                                  <EuiIcon
-                                                                    aria-hidden="true"
-                                                                    className="euiBetaBadge__icon"
-                                                                    size="m"
-                                                                    type="popout"
-                                                                  >
-                                                                    <div
-                                                                      aria-hidden="true"
-                                                                      className="euiBetaBadge__icon"
-                                                                      data-euiicon-type="popout"
-                                                                      size="m"
-                                                                    />
-                                                                  </EuiIcon>
-                                                                </span>
-                                                              </span>
-                                                            </EuiToolTip>
-                                                          </EuiBetaBadge>
-                                                        </span>
-                                                        <div
-                                                          className="euiKeyPadMenuItem__icon"
-                                                        >
-                                                          <VisTypeIcon>
-                                                            <EuiIcon
-                                                              color="secondary"
-                                                              size="l"
-                                                              type="empty"
-                                                            >
-                                                              <div
-                                                                color="secondary"
-                                                                data-euiicon-type="empty"
-                                                                size="l"
-                                                              />
-                                                            </EuiIcon>
-                                                          </VisTypeIcon>
-                                                        </div>
-                                                        <p
-                                                          className="euiKeyPadMenuItem__label"
-                                                        >
-                                                          <span
-                                                            data-test-subj="visTypeTitle"
-                                                          >
-                                                            Vis with alias Url
-                                                          </span>
-                                                        </p>
-                                                      </div>
-                                                    </button>
-                                                  </EuiKeyPadMenuItem>
-                                                </li>
-                                                <li
-                                                  key=".$visWithSearch"
-                                                >
-                                                  <EuiKeyPadMenuItem
-                                                    aria-describedby="visTypeDescription-visWithSearch"
-                                                    className="visNewVisDialog__type"
-                                                    data-test-subj="visType-visWithSearch"
-                                                    data-vis-stage="production"
-                                                    disabled={false}
-                                                    key="visWithSearch"
-                                                    label={
-                                                      <span
-                                                        data-test-subj="visTypeTitle"
-                                                      >
-                                                        Vis with search
-                                                      </span>
-                                                    }
-                                                    onBlur={[Function]}
-                                                    onClick={[Function]}
-                                                    onFocus={[Function]}
-                                                    onMouseEnter={[Function]}
-                                                    onMouseLeave={[Function]}
-                                                    role="menuitem"
-                                                  >
-                                                    <button
-                                                      aria-describedby="visTypeDescription-visWithSearch"
-                                                      className="euiKeyPadMenuItem visNewVisDialog__type"
-                                                      data-test-subj="visType-visWithSearch"
-                                                      data-vis-stage="production"
-                                                      disabled={false}
-                                                      onBlur={[Function]}
-                                                      onClick={[Function]}
-                                                      onFocus={[Function]}
-                                                      onMouseEnter={[Function]}
-                                                      onMouseLeave={[Function]}
-                                                      role="menuitem"
-                                                      type="button"
-                                                    >
-                                                      <div
-                                                        className="euiKeyPadMenuItem__inner"
-                                                      >
-                                                        <div
-                                                          className="euiKeyPadMenuItem__icon"
-                                                        >
-                                                          <VisTypeIcon>
-                                                            <EuiIcon
-                                                              color="secondary"
-                                                              size="l"
-                                                              type="empty"
-                                                            >
-                                                              <div
-                                                                color="secondary"
-                                                                data-euiicon-type="empty"
-                                                                size="l"
-                                                              />
-                                                            </EuiIcon>
-                                                          </VisTypeIcon>
-                                                        </div>
-                                                        <p
-                                                          className="euiKeyPadMenuItem__label"
-                                                        >
-                                                          <span
-                                                            data-test-subj="visTypeTitle"
-                                                          >
-                                                            Vis with search
-                                                          </span>
-                                                        </p>
-                                                      </div>
-                                                    </button>
-                                                  </EuiKeyPadMenuItem>
-                                                </li>
-                                                <li
-                                                  key=".$vis"
-                                                >
-                                                  <EuiKeyPadMenuItem
-                                                    aria-describedby="visTypeDescription-vis"
-                                                    className="visNewVisDialog__type"
-                                                    data-test-subj="visType-vis"
-                                                    data-vis-stage="production"
-                                                    disabled={true}
-                                                    key="vis"
-                                                    label={
-                                                      <span
-                                                        data-test-subj="visTypeTitle"
-                                                      >
-                                                        Vis Type 1
-                                                      </span>
-                                                    }
-                                                    onBlur={[Function]}
-                                                    onClick={[Function]}
-                                                    onFocus={[Function]}
-                                                    onMouseEnter={[Function]}
-                                                    onMouseLeave={[Function]}
-                                                    role="menuitem"
-                                                  >
-                                                    <button
-                                                      aria-describedby="visTypeDescription-vis"
-                                                      className="euiKeyPadMenuItem visNewVisDialog__type"
-                                                      data-test-subj="visType-vis"
-                                                      data-vis-stage="production"
-                                                      disabled={true}
-                                                      onBlur={[Function]}
-                                                      onClick={[Function]}
-                                                      onFocus={[Function]}
-                                                      onMouseEnter={[Function]}
-                                                      onMouseLeave={[Function]}
-                                                      role="menuitem"
-                                                      type="button"
-                                                    >
-                                                      <div
-                                                        className="euiKeyPadMenuItem__inner"
-                                                      >
-                                                        <div
-                                                          className="euiKeyPadMenuItem__icon"
-                                                        >
-                                                          <VisTypeIcon>
-                                                            <EuiIcon
-                                                              color="secondary"
-                                                              size="l"
-                                                              type="empty"
-                                                            >
-                                                              <div
-                                                                color="secondary"
-                                                                data-euiicon-type="empty"
-                                                                size="l"
-                                                              />
-                                                            </EuiIcon>
-                                                          </VisTypeIcon>
-                                                        </div>
-                                                        <p
-                                                          className="euiKeyPadMenuItem__label"
-                                                        >
-                                                          <span
-                                                            data-test-subj="visTypeTitle"
-                                                          >
-                                                            Vis Type 1
-                                                          </span>
-                                                        </p>
-                                                      </div>
-                                                    </button>
-                                                  </EuiKeyPadMenuItem>
-                                                </li>
-                                              </ul>
-                                            </EuiKeyPadMenu>
-                                          </div>
-                                        </EuiFlexItem>
-                                      </div>
-                                    </EuiFlexGroup>
-                                  </div>
-                                </EuiFlexItem>
-                                <EuiFlexItem
-                                  className="visNewVisDialog__description"
-                                  grow={false}
-                                >
-                                  <div
-                                    className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                                  >
-                                    <EuiTitle
-                                      size="s"
-                                    >
-                                      <h2
-                                        className="euiTitle euiTitle--small"
-                                      >
-                                        <FormattedMessage
-                                          defaultMessage="Select a visualization type"
-                                          id="visualizations.newVisWizard.selectVisType"
-                                          values={Object {}}
-                                        >
-                                          Select a visualization type
-                                        </FormattedMessage>
-                                      </h2>
-                                    </EuiTitle>
-                                    <EuiSpacer
-                                      size="m"
-                                    >
-                                      <div
-                                        className="euiSpacer euiSpacer--m"
-                                      />
-                                    </EuiSpacer>
-                                    <NewVisHelp
-                                      onPromotionClicked={[Function]}
-                                      promotedTypes={Array []}
-                                    >
-                                      <EuiText>
-                                        <div
-                                          className="euiText euiText--medium"
-                                        >
-                                          <p>
-                                            <FormattedMessage
-                                              defaultMessage="Start creating your visualization by selecting a type for that visualization."
-                                              id="visualizations.newVisWizard.helpText"
-                                              values={Object {}}
-                                            >
-                                              Start creating your visualization by selecting a type for that visualization.
-                                            </FormattedMessage>
-                                          </p>
-                                        </div>
-                                      </EuiText>
-                                    </NewVisHelp>
-                                  </div>
-                                </EuiFlexItem>
-                              </div>
-                            </EuiFlexGroup>
-                          </div>
-                        </TypeSelection>
-                      </div>
-                    </div>
-                  </div>
-                </ForwardRef>
-                <div
-                  data-focus-guard={true}
-                  style={
-                    Object {
-                      "height": "0px",
-                      "left": "1px",
-                      "overflow": "hidden",
-                      "padding": 0,
-                      "position": "fixed",
-                      "top": "1px",
-                      "width": "1px",
-                    }
-                  }
-                  tabIndex={0}
-                />
-              </ForwardRef>
-              <RequireSideCar
-                noIsolation={true}
-                setLockProps={[Function]}
-                sideCar={
-                  Object {
-                    "assignMedium": [Function],
-                    "assignSyncMedium": [Function],
-                    "options": Object {
-                      "async": true,
-                      "ssr": false,
-                    },
-                    "read": [Function],
-                    "useMedium": [Function],
-                  }
-                }
-              >
-                <SideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <Effect
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                  >
-                    <Component>
-                      <Sheet
-                        styles="
- [data-focus-on-hidden] {
-   pointer-events: none !important;
- }
-"
-                      />
-                    </Component>
-                  </Effect>
-                </SideCar>
-              </RequireSideCar>
-            </ForwardRef>
-          </ForwardRef>
-        </EuiFocusTrap>
-      </EuiModal>
-    </Portal>
-  </EuiOverlayMask>
-</NewVisModal>
-`;
-
-exports[`NewVisModal should render as expected 1`] = `
-<NewVisModal
-  addBasePath={[Function]}
-  application={Object {}}
-  editorParams={Array []}
-  intl={
-    Object {
-      "defaultFormats": Object {},
-      "defaultLocale": "en",
-      "formatDate": [Function],
-      "formatHTMLMessage": [Function],
-      "formatMessage": [Function],
-      "formatNumber": [Function],
-      "formatPlural": [Function],
-      "formatRelative": [Function],
-      "formatTime": [Function],
-      "formats": Object {
-        "date": Object {
-          "full": Object {
-            "day": "numeric",
-            "month": "long",
-            "weekday": "long",
-            "year": "numeric",
-          },
-          "long": Object {
-            "day": "numeric",
-            "month": "long",
-            "year": "numeric",
-          },
-          "medium": Object {
-            "day": "numeric",
-            "month": "short",
-            "year": "numeric",
-          },
-          "short": Object {
-            "day": "numeric",
-            "month": "numeric",
-            "year": "2-digit",
-          },
-        },
-        "number": Object {
-          "currency": Object {
-            "style": "currency",
-          },
-          "percent": Object {
-            "style": "percent",
-          },
-        },
-        "relative": Object {
-          "days": Object {
-            "units": "day",
-          },
-          "hours": Object {
-            "units": "hour",
-          },
-          "minutes": Object {
-            "units": "minute",
-          },
-          "months": Object {
-            "units": "month",
-          },
-          "seconds": Object {
-            "units": "second",
-          },
-          "years": Object {
-            "units": "year",
-          },
-        },
-        "time": Object {
-          "full": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "long": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "medium": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-          },
-          "short": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-          },
-        },
-      },
-      "formatters": Object {
-        "getDateTimeFormat": [Function],
-        "getMessageFormat": [Function],
-        "getNumberFormat": [Function],
-        "getPluralFormat": [Function],
-        "getRelativeFormat": [Function],
-      },
-      "locale": "en",
-      "messages": Object {},
-      "now": [Function],
-      "onError": [Function],
-      "textComponent": Symbol(react.fragment),
-      "timeZone": null,
-    }
-  }
-  isOpen={true}
-  onClose={[Function]}
-  savedObjects={Object {}}
-  uiSettings={
-    Object {
-      "get": [MockFunction] {
-        "calls": Array [
-          Array [
-            "visualize:enableLabs",
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      },
-    }
-  }
-  visTypesRegistry={
-    Object {
-      "all": [Function],
-      "get": [Function],
-      "getAliases": [Function],
-    }
-  }
->
-  <EuiOverlayMask>
-    <Portal
-      containerInfo={
-        <div
-          class="euiOverlayMask euiOverlayMask--aboveHeader"
-        >
-          <div
-            aria-hidden="true"
-            data-aria-hidden="true"
-            data-focus-guard="true"
-            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-            tabindex="0"
-          />
-          <div
-            aria-hidden="true"
-            data-aria-hidden="true"
-            data-focus-guard="true"
-            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-            tabindex="1"
-          />
-          <div
-            data-focus-lock-disabled="false"
-          >
-            <div
-              aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-              class="euiModal euiModal--maxWidth-default visNewVisDialog"
-              role="menu"
-              tabindex="0"
-            >
-              <button
-                aria-label="Closes this modal window"
-                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                type="button"
-              >
-                <div
-                  aria-hidden="true"
-                  class="euiButtonIcon__icon"
-                  data-euiicon-type="cross"
-                />
-              </button>
-              <div
-                class="euiModal__flex"
-              >
-                <div
-                  class="euiModalHeader"
-                >
-                  <div
-                    class="euiModalHeader__title"
-                  >
-                    New Visualization
-                  </div>
-                </div>
-                <div
-                  class="visNewVisDialog__body"
-                >
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                      >
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                        >
-                          <div
-                            class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                          >
-                            <div
-                              class="euiFormControlLayout__childrenWrapper"
-                            >
-                              <input
-                                aria-label="Filter for a visualization type"
-                                class="euiFieldSearch euiFieldSearch--fullWidth"
-                                data-test-subj="filterVisType"
-                                placeholder="Filter"
-                                type="search"
-                                value=""
-                              />
-                              <div
-                                class="euiFormControlLayoutIcons"
-                              >
-                                <span
-                                  class="euiFormControlLayoutCustomIcon"
-                                >
-                                  <div
-                                    aria-hidden="true"
-                                    class="euiFormControlLayoutCustomIcon__icon"
-                                    data-euiicon-type="search"
-                                  />
-                                </span>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                        >
-                          <span
-                            aria-live="polite"
-                            class="euiScreenReaderOnly"
-                          />
-                          <ul
-                            class="euiKeyPadMenu visNewVisDialog__types"
-                            data-test-subj="visNewDialogTypes"
-                          >
-                            <li>
-                              <button
-                                aria-describedby="visTypeDescription-vis"
-                                class="euiKeyPadMenuItem visNewVisDialog__type"
-                                data-test-subj="visType-vis"
-                                data-vis-stage="production"
-                                role="menuitem"
-                                type="button"
-                              >
-                                <div
-                                  class="euiKeyPadMenuItem__inner"
-                                >
-                                  <div
-                                    class="euiKeyPadMenuItem__icon"
-                                  >
-                                    <div
-                                      color="secondary"
-                                      data-euiicon-type="empty"
-                                    />
-                                  </div>
-                                  <p
-                                    class="euiKeyPadMenuItem__label"
-                                  >
-                                    <span
-                                      data-test-subj="visTypeTitle"
-                                    >
-                                      Vis Type 1
-                                    </span>
-                                  </p>
-                                </div>
-                              </button>
-                            </li>
-                            <li>
-                              <button
-                                aria-describedby="visTypeDescription-visWithAliasUrl"
-                                class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                data-test-subj="visType-visWithAliasUrl"
-                                data-vis-stage="alias"
-                                role="menuitem"
-                                type="button"
-                              >
-                                <div
-                                  class="euiKeyPadMenuItem__inner"
-                                >
-                                  <span
-                                    class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                  >
-                                    <span
-                                      class="euiToolTipAnchor"
-                                    >
-                                      <span
-                                        class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                        tabindex="0"
-                                      >
-                                        <div
-                                          aria-hidden="true"
-                                          class="euiBetaBadge__icon"
-                                          data-euiicon-type="popout"
-                                        />
-                                      </span>
-                                    </span>
-                                  </span>
-                                  <div
-                                    class="euiKeyPadMenuItem__icon"
-                                  >
-                                    <div
-                                      color="secondary"
-                                      data-euiicon-type="empty"
-                                    />
-                                  </div>
-                                  <p
-                                    class="euiKeyPadMenuItem__label"
-                                  >
-                                    <span
-                                      data-test-subj="visTypeTitle"
-                                    >
-                                      Vis with alias Url
-                                    </span>
-                                  </p>
-                                </div>
-                              </button>
-                            </li>
-                            <li>
-                              <button
-                                aria-describedby="visTypeDescription-visWithSearch"
-                                class="euiKeyPadMenuItem visNewVisDialog__type"
-                                data-test-subj="visType-visWithSearch"
-                                data-vis-stage="production"
-                                role="menuitem"
-                                type="button"
-                              >
-                                <div
-                                  class="euiKeyPadMenuItem__inner"
-                                >
-                                  <div
-                                    class="euiKeyPadMenuItem__icon"
-                                  >
-                                    <div
-                                      color="secondary"
-                                      data-euiicon-type="empty"
-                                    />
-                                  </div>
-                                  <p
-                                    class="euiKeyPadMenuItem__label"
-                                  >
-                                    <span
-                                      data-test-subj="visTypeTitle"
-                                    >
-                                      Vis with search
-                                    </span>
-                                  </p>
-                                </div>
-                              </button>
-                            </li>
-                          </ul>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                    >
-                      <h2
-                        class="euiTitle euiTitle--small"
-                      >
-                        Select a visualization type
-                      </h2>
-                      <div
-                        class="euiSpacer euiSpacer--m"
-                      />
-                      <div
-                        class="euiText euiText--medium"
-                      >
-                        <p>
-                          Start creating your visualization by selecting a type for that visualization.
-                        </p>
+                        </EuiFlexItem>
                       </div>
-                    </div>
+                    </EuiFlexGroup>
                   </div>
-                </div>
+                </TypeSelection>
               </div>
             </div>
           </div>
+        </EuiFocusTrap>
+      </EuiModal>
+    </Portal>
+  </EuiOverlayMask>
+</NewVisModal>
+`;
+
+exports[`NewVisModal should render as expected 1`] = `
+<NewVisModal
+  addBasePath={[Function]}
+  application={Object {}}
+  editorParams={Array []}
+  intl={
+    Object {
+      "defaultFormats": Object {},
+      "defaultLocale": "en",
+      "formatDate": [Function],
+      "formatHTMLMessage": [Function],
+      "formatMessage": [Function],
+      "formatNumber": [Function],
+      "formatPlural": [Function],
+      "formatRelative": [Function],
+      "formatTime": [Function],
+      "formats": Object {
+        "date": Object {
+          "full": Object {
+            "day": "numeric",
+            "month": "long",
+            "weekday": "long",
+            "year": "numeric",
+          },
+          "long": Object {
+            "day": "numeric",
+            "month": "long",
+            "year": "numeric",
+          },
+          "medium": Object {
+            "day": "numeric",
+            "month": "short",
+            "year": "numeric",
+          },
+          "short": Object {
+            "day": "numeric",
+            "month": "numeric",
+            "year": "2-digit",
+          },
+        },
+        "number": Object {
+          "currency": Object {
+            "style": "currency",
+          },
+          "percent": Object {
+            "style": "percent",
+          },
+        },
+        "relative": Object {
+          "days": Object {
+            "units": "day",
+          },
+          "hours": Object {
+            "units": "hour",
+          },
+          "minutes": Object {
+            "units": "minute",
+          },
+          "months": Object {
+            "units": "month",
+          },
+          "seconds": Object {
+            "units": "second",
+          },
+          "years": Object {
+            "units": "year",
+          },
+        },
+        "time": Object {
+          "full": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "long": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "medium": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+          },
+          "short": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+          },
+        },
+      },
+      "formatters": Object {
+        "getDateTimeFormat": [Function],
+        "getMessageFormat": [Function],
+        "getNumberFormat": [Function],
+        "getPluralFormat": [Function],
+        "getRelativeFormat": [Function],
+      },
+      "locale": "en",
+      "messages": Object {},
+      "now": [Function],
+      "onError": [Function],
+      "textComponent": Symbol(react.fragment),
+      "timeZone": null,
+    }
+  }
+  isOpen={true}
+  onClose={[Function]}
+  savedObjects={Object {}}
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "visualize:enableLabs",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      },
+    }
+  }
+  visTypesRegistry={
+    Object {
+      "all": [Function],
+      "get": [Function],
+      "getAliases": [Function],
+    }
+  }
+>
+  <EuiOverlayMask>
+    <Portal
+      containerInfo={
+        <div
+          class="euiOverlayMask euiOverlayMask--aboveHeader"
+        >
           <div
-            aria-hidden="true"
-            data-aria-hidden="true"
-            data-focus-guard="true"
-            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-            tabindex="0"
-          />
-        </div>
-      }
-    >
-      <EuiModal
-        aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-        className="visNewVisDialog"
-        onClose={[Function]}
-        role="menu"
-      >
-        <EuiFocusTrap>
-          <ForwardRef
-            enabled={true}
-            noIsolation={true}
-            returnFocus={true}
-            scrollLock={false}
+            data-eui="EuiFocusTrap"
           >
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
-              sideCar={[Function]}
+            <div
+              aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
+              class="euiModal euiModal--maxWidth-default visNewVisDialog"
+              role="menu"
+              tabindex="0"
             >
-              <ForwardRef
-                as={
-                  Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "classNames": Object {
-                      "fullWidth": "width-before-scroll-bar",
-                      "zeroRight": "right-scroll-bar-position",
-                    },
-                    "defaultProps": Object {
-                      "enabled": true,
-                      "inert": false,
-                      "removeScrollBar": true,
-                    },
-                    "render": [Function],
-                  }
-                }
-                autoFocus={true}
-                crossFrame={true}
-                disabled={false}
-                lockProps={
-                  Object {
-                    "allowPinchZoom": undefined,
-                    "enabled": false,
-                    "inert": undefined,
-                    "onMouseDown": [Function],
-                    "onTouchStart": [Function],
-                    "shards": undefined,
-                    "sideCar": [Function],
-                  }
-                }
-                noFocusGuards={false}
-                onActivation={[Function]}
-                onDeactivation={[Function]}
-                persistentFocus={false}
-                returnFocus={true}
-                sideCar={[Function]}
+              <button
+                aria-label="Closes this modal window"
+                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                type="button"
               >
                 <div
-                  data-focus-guard={true}
-                  key="guard-first"
-                  style={
-                    Object {
-                      "height": "0px",
-                      "left": "1px",
-                      "overflow": "hidden",
-                      "padding": 0,
-                      "position": "fixed",
-                      "top": "1px",
-                      "width": "1px",
-                    }
-                  }
-                  tabIndex={0}
-                />
-                <div
-                  data-focus-guard={true}
-                  key="guard-nearest"
-                  style={
-                    Object {
-                      "height": "0px",
-                      "left": "1px",
-                      "overflow": "hidden",
-                      "padding": 0,
-                      "position": "fixed",
-                      "top": "1px",
-                      "width": "1px",
-                    }
-                  }
-                  tabIndex={1}
-                />
-                <RequireSideCar
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  id={Object {}}
-                  observed={
-                    <div
-                      data-focus-lock-disabled="false"
-                    >
-                      <div
-                        aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                        class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                        role="menu"
-                        tabindex="0"
-                      >
-                        <button
-                          aria-label="Closes this modal window"
-                          class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                          type="button"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="euiButtonIcon__icon"
-                            data-euiicon-type="cross"
-                          />
-                        </button>
-                        <div
-                          class="euiModal__flex"
-                        >
-                          <div
-                            class="euiModalHeader"
-                          >
-                            <div
-                              class="euiModalHeader__title"
-                            >
-                              New Visualization
-                            </div>
-                          </div>
-                          <div
-                            class="visNewVisDialog__body"
-                          >
-                            <div
-                              class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                            >
-                              <div
-                                class="euiFlexItem"
-                              >
-                                <div
-                                  class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                                >
-                                  <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                  >
-                                    <div
-                                      class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                    >
-                                      <div
-                                        class="euiFormControlLayout__childrenWrapper"
-                                      >
-                                        <input
-                                          aria-label="Filter for a visualization type"
-                                          class="euiFieldSearch euiFieldSearch--fullWidth"
-                                          data-test-subj="filterVisType"
-                                          placeholder="Filter"
-                                          type="search"
-                                          value=""
-                                        />
-                                        <div
-                                          class="euiFormControlLayoutIcons"
-                                        >
-                                          <span
-                                            class="euiFormControlLayoutCustomIcon"
-                                          >
-                                            <div
-                                              aria-hidden="true"
-                                              class="euiFormControlLayoutCustomIcon__icon"
-                                              data-euiicon-type="search"
-                                            />
-                                          </span>
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div
-                                    class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                  >
-                                    <span
-                                      aria-live="polite"
-                                      class="euiScreenReaderOnly"
-                                    />
-                                    <ul
-                                      class="euiKeyPadMenu visNewVisDialog__types"
-                                      data-test-subj="visNewDialogTypes"
-                                    >
-                                      <li>
-                                        <button
-                                          aria-describedby="visTypeDescription-vis"
-                                          class="euiKeyPadMenuItem visNewVisDialog__type"
-                                          data-test-subj="visType-vis"
-                                          data-vis-stage="production"
-                                          role="menuitem"
-                                          type="button"
-                                        >
-                                          <div
-                                            class="euiKeyPadMenuItem__inner"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__icon"
-                                            >
-                                              <div
-                                                color="secondary"
-                                                data-euiicon-type="empty"
-                                              />
-                                            </div>
-                                            <p
-                                              class="euiKeyPadMenuItem__label"
-                                            >
-                                              <span
-                                                data-test-subj="visTypeTitle"
-                                              >
-                                                Vis Type 1
-                                              </span>
-                                            </p>
-                                          </div>
-                                        </button>
-                                      </li>
-                                      <li>
-                                        <button
-                                          aria-describedby="visTypeDescription-visWithAliasUrl"
-                                          class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                          data-test-subj="visType-visWithAliasUrl"
-                                          data-vis-stage="alias"
-                                          role="menuitem"
-                                          type="button"
-                                        >
-                                          <div
-                                            class="euiKeyPadMenuItem__inner"
-                                          >
-                                            <span
-                                              class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                            >
-                                              <span
-                                                class="euiToolTipAnchor"
-                                              >
-                                                <span
-                                                  class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                  tabindex="0"
-                                                >
-                                                  <div
-                                                    aria-hidden="true"
-                                                    class="euiBetaBadge__icon"
-                                                    data-euiicon-type="popout"
-                                                  />
-                                                </span>
-                                              </span>
-                                            </span>
-                                            <div
-                                              class="euiKeyPadMenuItem__icon"
-                                            >
-                                              <div
-                                                color="secondary"
-                                                data-euiicon-type="empty"
-                                              />
-                                            </div>
-                                            <p
-                                              class="euiKeyPadMenuItem__label"
-                                            >
-                                              <span
-                                                data-test-subj="visTypeTitle"
-                                              >
-                                                Vis with alias Url
-                                              </span>
-                                            </p>
-                                          </div>
-                                        </button>
-                                      </li>
-                                      <li>
-                                        <button
-                                          aria-describedby="visTypeDescription-visWithSearch"
-                                          class="euiKeyPadMenuItem visNewVisDialog__type"
-                                          data-test-subj="visType-visWithSearch"
-                                          data-vis-stage="production"
-                                          role="menuitem"
-                                          type="button"
-                                        >
-                                          <div
-                                            class="euiKeyPadMenuItem__inner"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__icon"
-                                            >
-                                              <div
-                                                color="secondary"
-                                                data-euiicon-type="empty"
-                                              />
-                                            </div>
-                                            <p
-                                              class="euiKeyPadMenuItem__label"
-                                            >
-                                              <span
-                                                data-test-subj="visTypeTitle"
-                                              >
-                                                Vis with search
-                                              </span>
-                                            </p>
-                                          </div>
-                                        </button>
-                                      </li>
-                                    </ul>
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                              >
-                                <h2
-                                  class="euiTitle euiTitle--small"
-                                >
-                                  Select a visualization type
-                                </h2>
-                                <div
-                                  class="euiSpacer euiSpacer--m"
-                                />
-                                <div
-                                  class="euiText euiText--medium"
-                                >
-                                  <p>
-                                    Start creating your visualization by selecting a type for that visualization.
-                                  </p>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  }
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={[Function]}
-                  shards={Array []}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
+                  aria-hidden="true"
+                  class="euiButtonIcon__icon"
+                  data-euiicon-type="cross"
+                />
+              </button>
+              <div
+                class="euiModal__flex"
+              >
+                <div
+                  class="euiModalHeader"
+                >
+                  <div
+                    class="euiModalHeader__title"
+                  >
+                    New Visualization
+                  </div>
+                </div>
+                <div
+                  class="visNewVisDialog__body"
                 >
-                  <SideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
+                  <div
+                    class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                  >
+                    <div
+                      class="euiFlexItem"
+                    >
                       <div
-                        data-focus-lock-disabled="false"
+                        class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
                       >
                         <div
-                          aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                          class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                          role="menu"
-                          tabindex="0"
+                          class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
                         >
-                          <button
-                            aria-label="Closes this modal window"
-                            class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              class="euiButtonIcon__icon"
-                              data-euiicon-type="cross"
-                            />
-                          </button>
                           <div
-                            class="euiModal__flex"
+                            class="euiFormControlLayout euiFormControlLayout--fullWidth"
                           >
                             <div
-                              class="euiModalHeader"
-                            >
-                              <div
-                                class="euiModalHeader__title"
-                              >
-                                New Visualization
-                              </div>
-                            </div>
-                            <div
-                              class="visNewVisDialog__body"
-                            >
-                              <div
-                                class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                              >
-                                <div
-                                  class="euiFlexItem"
-                                >
-                                  <div
-                                    class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                                  >
-                                    <div
-                                      class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                    >
-                                      <div
-                                        class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                      >
-                                        <div
-                                          class="euiFormControlLayout__childrenWrapper"
-                                        >
-                                          <input
-                                            aria-label="Filter for a visualization type"
-                                            class="euiFieldSearch euiFieldSearch--fullWidth"
-                                            data-test-subj="filterVisType"
-                                            placeholder="Filter"
-                                            type="search"
-                                            value=""
-                                          />
-                                          <div
-                                            class="euiFormControlLayoutIcons"
-                                          >
-                                            <span
-                                              class="euiFormControlLayoutCustomIcon"
-                                            >
-                                              <div
-                                                aria-hidden="true"
-                                                class="euiFormControlLayoutCustomIcon__icon"
-                                                data-euiicon-type="search"
-                                              />
-                                            </span>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    </div>
-                                    <div
-                                      class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                    >
-                                      <span
-                                        aria-live="polite"
-                                        class="euiScreenReaderOnly"
-                                      />
-                                      <ul
-                                        class="euiKeyPadMenu visNewVisDialog__types"
-                                        data-test-subj="visNewDialogTypes"
-                                      >
-                                        <li>
-                                          <button
-                                            aria-describedby="visTypeDescription-vis"
-                                            class="euiKeyPadMenuItem visNewVisDialog__type"
-                                            data-test-subj="visType-vis"
-                                            data-vis-stage="production"
-                                            role="menuitem"
-                                            type="button"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__inner"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__icon"
-                                              >
-                                                <div
-                                                  color="secondary"
-                                                  data-euiicon-type="empty"
-                                                />
-                                              </div>
-                                              <p
-                                                class="euiKeyPadMenuItem__label"
-                                              >
-                                                <span
-                                                  data-test-subj="visTypeTitle"
-                                                >
-                                                  Vis Type 1
-                                                </span>
-                                              </p>
-                                            </div>
-                                          </button>
-                                        </li>
-                                        <li>
-                                          <button
-                                            aria-describedby="visTypeDescription-visWithAliasUrl"
-                                            class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                            data-test-subj="visType-visWithAliasUrl"
-                                            data-vis-stage="alias"
-                                            role="menuitem"
-                                            type="button"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__inner"
-                                            >
-                                              <span
-                                                class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                              >
-                                                <span
-                                                  class="euiToolTipAnchor"
-                                                >
-                                                  <span
-                                                    class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                    tabindex="0"
-                                                  >
-                                                    <div
-                                                      aria-hidden="true"
-                                                      class="euiBetaBadge__icon"
-                                                      data-euiicon-type="popout"
-                                                    />
-                                                  </span>
-                                                </span>
-                                              </span>
-                                              <div
-                                                class="euiKeyPadMenuItem__icon"
-                                              >
-                                                <div
-                                                  color="secondary"
-                                                  data-euiicon-type="empty"
-                                                />
-                                              </div>
-                                              <p
-                                                class="euiKeyPadMenuItem__label"
-                                              >
-                                                <span
-                                                  data-test-subj="visTypeTitle"
-                                                >
-                                                  Vis with alias Url
-                                                </span>
-                                              </p>
-                                            </div>
-                                          </button>
-                                        </li>
-                                        <li>
-                                          <button
-                                            aria-describedby="visTypeDescription-visWithSearch"
-                                            class="euiKeyPadMenuItem visNewVisDialog__type"
-                                            data-test-subj="visType-visWithSearch"
-                                            data-vis-stage="production"
-                                            role="menuitem"
-                                            type="button"
-                                          >
-                                            <div
-                                              class="euiKeyPadMenuItem__inner"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__icon"
-                                              >
-                                                <div
-                                                  color="secondary"
-                                                  data-euiicon-type="empty"
-                                                />
-                                              </div>
-                                              <p
-                                                class="euiKeyPadMenuItem__label"
-                                              >
-                                                <span
-                                                  data-test-subj="visTypeTitle"
-                                                >
-                                                  Vis with search
-                                                </span>
-                                              </p>
-                                            </div>
-                                          </button>
-                                        </li>
-                                      </ul>
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                                >
-                                  <h2
-                                    class="euiTitle euiTitle--small"
-                                  >
-                                    Select a visualization type
-                                  </h2>
-                                  <div
-                                    class="euiSpacer euiSpacer--m"
-                                  />
-                                  <div
-                                    class="euiText euiText--medium"
-                                  >
-                                    <p>
-                                      Start creating your visualization by selecting a type for that visualization.
-                                    </p>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideEffect(FocusWatcher)
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
-                        <div
-                          data-focus-lock-disabled="false"
-                        >
-                          <div
-                            aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                            class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                            role="menu"
-                            tabindex="0"
-                          >
-                            <button
-                              aria-label="Closes this modal window"
-                              class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                              type="button"
+                              class="euiFormControlLayout__childrenWrapper"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="euiButtonIcon__icon"
-                                data-euiicon-type="cross"
+                              <input
+                                aria-label="Filter for a visualization type"
+                                class="euiFieldSearch euiFieldSearch--fullWidth"
+                                data-test-subj="filterVisType"
+                                placeholder="Filter"
+                                type="search"
+                                value=""
                               />
-                            </button>
-                            <div
-                              class="euiModal__flex"
-                            >
-                              <div
-                                class="euiModalHeader"
-                              >
-                                <div
-                                  class="euiModalHeader__title"
-                                >
-                                  New Visualization
-                                </div>
-                              </div>
                               <div
-                                class="visNewVisDialog__body"
+                                class="euiFormControlLayoutIcons"
                               >
-                                <div
-                                  class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                                >
-                                  <div
-                                    class="euiFlexItem"
-                                  >
-                                    <div
-                                      class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
-                                    >
-                                      <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                      >
-                                        <div
-                                          class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                        >
-                                          <div
-                                            class="euiFormControlLayout__childrenWrapper"
-                                          >
-                                            <input
-                                              aria-label="Filter for a visualization type"
-                                              class="euiFieldSearch euiFieldSearch--fullWidth"
-                                              data-test-subj="filterVisType"
-                                              placeholder="Filter"
-                                              type="search"
-                                              value=""
-                                            />
-                                            <div
-                                              class="euiFormControlLayoutIcons"
-                                            >
-                                              <span
-                                                class="euiFormControlLayoutCustomIcon"
-                                              >
-                                                <div
-                                                  aria-hidden="true"
-                                                  class="euiFormControlLayoutCustomIcon__icon"
-                                                  data-euiicon-type="search"
-                                                />
-                                              </span>
-                                            </div>
-                                          </div>
-                                        </div>
-                                      </div>
-                                      <div
-                                        class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                      >
-                                        <span
-                                          aria-live="polite"
-                                          class="euiScreenReaderOnly"
-                                        />
-                                        <ul
-                                          class="euiKeyPadMenu visNewVisDialog__types"
-                                          data-test-subj="visNewDialogTypes"
-                                        >
-                                          <li>
-                                            <button
-                                              aria-describedby="visTypeDescription-vis"
-                                              class="euiKeyPadMenuItem visNewVisDialog__type"
-                                              data-test-subj="visType-vis"
-                                              data-vis-stage="production"
-                                              role="menuitem"
-                                              type="button"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__inner"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__icon"
-                                                >
-                                                  <div
-                                                    color="secondary"
-                                                    data-euiicon-type="empty"
-                                                  />
-                                                </div>
-                                                <p
-                                                  class="euiKeyPadMenuItem__label"
-                                                >
-                                                  <span
-                                                    data-test-subj="visTypeTitle"
-                                                  >
-                                                    Vis Type 1
-                                                  </span>
-                                                </p>
-                                              </div>
-                                            </button>
-                                          </li>
-                                          <li>
-                                            <button
-                                              aria-describedby="visTypeDescription-visWithAliasUrl"
-                                              class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                              data-test-subj="visType-visWithAliasUrl"
-                                              data-vis-stage="alias"
-                                              role="menuitem"
-                                              type="button"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__inner"
-                                              >
-                                                <span
-                                                  class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                                >
-                                                  <span
-                                                    class="euiToolTipAnchor"
-                                                  >
-                                                    <span
-                                                      class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                      tabindex="0"
-                                                    >
-                                                      <div
-                                                        aria-hidden="true"
-                                                        class="euiBetaBadge__icon"
-                                                        data-euiicon-type="popout"
-                                                      />
-                                                    </span>
-                                                  </span>
-                                                </span>
-                                                <div
-                                                  class="euiKeyPadMenuItem__icon"
-                                                >
-                                                  <div
-                                                    color="secondary"
-                                                    data-euiicon-type="empty"
-                                                  />
-                                                </div>
-                                                <p
-                                                  class="euiKeyPadMenuItem__label"
-                                                >
-                                                  <span
-                                                    data-test-subj="visTypeTitle"
-                                                  >
-                                                    Vis with alias Url
-                                                  </span>
-                                                </p>
-                                              </div>
-                                            </button>
-                                          </li>
-                                          <li>
-                                            <button
-                                              aria-describedby="visTypeDescription-visWithSearch"
-                                              class="euiKeyPadMenuItem visNewVisDialog__type"
-                                              data-test-subj="visType-visWithSearch"
-                                              data-vis-stage="production"
-                                              role="menuitem"
-                                              type="button"
-                                            >
-                                              <div
-                                                class="euiKeyPadMenuItem__inner"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__icon"
-                                                >
-                                                  <div
-                                                    color="secondary"
-                                                    data-euiicon-type="empty"
-                                                  />
-                                                </div>
-                                                <p
-                                                  class="euiKeyPadMenuItem__label"
-                                                >
-                                                  <span
-                                                    data-test-subj="visTypeTitle"
-                                                  >
-                                                    Vis with search
-                                                  </span>
-                                                </p>
-                                              </div>
-                                            </button>
-                                          </li>
-                                        </ul>
-                                      </div>
-                                    </div>
-                                  </div>
+                                <span
+                                  class="euiFormControlLayoutCustomIcon"
+                                >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                                  >
-                                    <h2
-                                      class="euiTitle euiTitle--small"
-                                    >
-                                      Select a visualization type
-                                    </h2>
-                                    <div
-                                      class="euiSpacer euiSpacer--m"
-                                    />
-                                    <div
-                                      class="euiText euiText--medium"
-                                    >
-                                      <p>
-                                        Start creating your visualization by selecting a type for that visualization.
-                                      </p>
-                                    </div>
-                                  </div>
-                                </div>
+                                    aria-hidden="true"
+                                    class="euiFormControlLayoutCustomIcon__icon"
+                                    data-euiicon-type="search"
+                                  />
+                                </span>
                               </div>
                             </div>
                           </div>
                         </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                    >
-                      <FocusWatcher
-                        autoFocus={true}
-                        crossFrame={true}
-                        disabled={false}
-                        id={Object {}}
-                        observed={
-                          <div
-                            data-focus-lock-disabled="false"
+                        <div
+                          class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
+                        >
+                          <span
+                            aria-live="polite"
+                            class="euiScreenReaderOnly"
+                          />
+                          <ul
+                            class="euiKeyPadMenu visNewVisDialog__types"
+                            data-test-subj="visNewDialogTypes"
                           >
-                            <div
-                              aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                              class="euiModal euiModal--maxWidth-default visNewVisDialog"
-                              role="menu"
-                              tabindex="0"
-                            >
+                            <li>
                               <button
-                                aria-label="Closes this modal window"
-                                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                aria-describedby="visTypeDescription-vis"
+                                class="euiKeyPadMenuItem visNewVisDialog__type"
+                                data-test-subj="visType-vis"
+                                data-vis-stage="production"
+                                role="menuitem"
                                 type="button"
                               >
                                 <div
-                                  aria-hidden="true"
-                                  class="euiButtonIcon__icon"
-                                  data-euiicon-type="cross"
-                                />
-                              </button>
-                              <div
-                                class="euiModal__flex"
-                              >
-                                <div
-                                  class="euiModalHeader"
+                                  class="euiKeyPadMenuItem__inner"
                                 >
                                   <div
-                                    class="euiModalHeader__title"
+                                    class="euiKeyPadMenuItem__icon"
                                   >
-                                    New Visualization
+                                    <div
+                                      color="secondary"
+                                      data-euiicon-type="empty"
+                                    />
                                   </div>
+                                  <p
+                                    class="euiKeyPadMenuItem__label"
+                                  >
+                                    <span
+                                      data-test-subj="visTypeTitle"
+                                    >
+                                      Vis Type 1
+                                    </span>
+                                  </p>
                                 </div>
+                              </button>
+                            </li>
+                            <li>
+                              <button
+                                aria-describedby="visTypeDescription-visWithAliasUrl"
+                                class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
+                                data-test-subj="visType-visWithAliasUrl"
+                                data-vis-stage="alias"
+                                role="menuitem"
+                                type="button"
+                              >
                                 <div
-                                  class="visNewVisDialog__body"
+                                  class="euiKeyPadMenuItem__inner"
                                 >
-                                  <div
-                                    class="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  <span
+                                    class="euiKeyPadMenuItem__betaBadgeWrapper"
                                   >
-                                    <div
-                                      class="euiFlexItem"
+                                    <span
+                                      class="euiToolTipAnchor"
                                     >
-                                      <div
-                                        class="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
+                                      <span
+                                        class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
+                                        tabindex="0"
                                       >
                                         <div
-                                          class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
-                                        >
-                                          <div
-                                            class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                                          >
-                                            <div
-                                              class="euiFormControlLayout__childrenWrapper"
-                                            >
-                                              <input
-                                                aria-label="Filter for a visualization type"
-                                                class="euiFieldSearch euiFieldSearch--fullWidth"
-                                                data-test-subj="filterVisType"
-                                                placeholder="Filter"
-                                                type="search"
-                                                value=""
-                                              />
-                                              <div
-                                                class="euiFormControlLayoutIcons"
-                                              >
-                                                <span
-                                                  class="euiFormControlLayoutCustomIcon"
-                                                >
-                                                  <div
-                                                    aria-hidden="true"
-                                                    class="euiFormControlLayoutCustomIcon__icon"
-                                                    data-euiicon-type="search"
-                                                  />
-                                                </span>
-                                              </div>
-                                            </div>
-                                          </div>
-                                        </div>
-                                        <div
-                                          class="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                        >
-                                          <span
-                                            aria-live="polite"
-                                            class="euiScreenReaderOnly"
-                                          />
-                                          <ul
-                                            class="euiKeyPadMenu visNewVisDialog__types"
-                                            data-test-subj="visNewDialogTypes"
-                                          >
-                                            <li>
-                                              <button
-                                                aria-describedby="visTypeDescription-vis"
-                                                class="euiKeyPadMenuItem visNewVisDialog__type"
-                                                data-test-subj="visType-vis"
-                                                data-vis-stage="production"
-                                                role="menuitem"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__inner"
-                                                >
-                                                  <div
-                                                    class="euiKeyPadMenuItem__icon"
-                                                  >
-                                                    <div
-                                                      color="secondary"
-                                                      data-euiicon-type="empty"
-                                                    />
-                                                  </div>
-                                                  <p
-                                                    class="euiKeyPadMenuItem__label"
-                                                  >
-                                                    <span
-                                                      data-test-subj="visTypeTitle"
-                                                    >
-                                                      Vis Type 1
-                                                    </span>
-                                                  </p>
-                                                </div>
-                                              </button>
-                                            </li>
-                                            <li>
-                                              <button
-                                                aria-describedby="visTypeDescription-visWithAliasUrl"
-                                                class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                                data-test-subj="visType-visWithAliasUrl"
-                                                data-vis-stage="alias"
-                                                role="menuitem"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__inner"
-                                                >
-                                                  <span
-                                                    class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                                  >
-                                                    <span
-                                                      class="euiToolTipAnchor"
-                                                    >
-                                                      <span
-                                                        class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                        tabindex="0"
-                                                      >
-                                                        <div
-                                                          aria-hidden="true"
-                                                          class="euiBetaBadge__icon"
-                                                          data-euiicon-type="popout"
-                                                        />
-                                                      </span>
-                                                    </span>
-                                                  </span>
-                                                  <div
-                                                    class="euiKeyPadMenuItem__icon"
-                                                  >
-                                                    <div
-                                                      color="secondary"
-                                                      data-euiicon-type="empty"
-                                                    />
-                                                  </div>
-                                                  <p
-                                                    class="euiKeyPadMenuItem__label"
-                                                  >
-                                                    <span
-                                                      data-test-subj="visTypeTitle"
-                                                    >
-                                                      Vis with alias Url
-                                                    </span>
-                                                  </p>
-                                                </div>
-                                              </button>
-                                            </li>
-                                            <li>
-                                              <button
-                                                aria-describedby="visTypeDescription-visWithSearch"
-                                                class="euiKeyPadMenuItem visNewVisDialog__type"
-                                                data-test-subj="visType-visWithSearch"
-                                                data-vis-stage="production"
-                                                role="menuitem"
-                                                type="button"
-                                              >
-                                                <div
-                                                  class="euiKeyPadMenuItem__inner"
-                                                >
-                                                  <div
-                                                    class="euiKeyPadMenuItem__icon"
-                                                  >
-                                                    <div
-                                                      color="secondary"
-                                                      data-euiicon-type="empty"
-                                                    />
-                                                  </div>
-                                                  <p
-                                                    class="euiKeyPadMenuItem__label"
-                                                  >
-                                                    <span
-                                                      data-test-subj="visTypeTitle"
-                                                    >
-                                                      Vis with search
-                                                    </span>
-                                                  </p>
-                                                </div>
-                                              </button>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
+                                          aria-hidden="true"
+                                          class="euiBetaBadge__icon"
+                                          data-euiicon-type="popout"
+                                        />
+                                      </span>
+                                    </span>
+                                  </span>
+                                  <div
+                                    class="euiKeyPadMenuItem__icon"
+                                  >
                                     <div
-                                      class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
+                                      color="secondary"
+                                      data-euiicon-type="empty"
+                                    />
+                                  </div>
+                                  <p
+                                    class="euiKeyPadMenuItem__label"
+                                  >
+                                    <span
+                                      data-test-subj="visTypeTitle"
                                     >
-                                      <h2
-                                        class="euiTitle euiTitle--small"
-                                      >
-                                        Select a visualization type
-                                      </h2>
-                                      <div
-                                        class="euiSpacer euiSpacer--m"
-                                      />
-                                      <div
-                                        class="euiText euiText--medium"
-                                      >
-                                        <p>
-                                          Start creating your visualization by selecting a type for that visualization.
-                                        </p>
-                                      </div>
-                                    </div>
+                                      Vis with alias Url
+                                    </span>
+                                  </p>
+                                </div>
+                              </button>
+                            </li>
+                            <li>
+                              <button
+                                aria-describedby="visTypeDescription-visWithSearch"
+                                class="euiKeyPadMenuItem visNewVisDialog__type"
+                                data-test-subj="visType-visWithSearch"
+                                data-vis-stage="production"
+                                role="menuitem"
+                                type="button"
+                              >
+                                <div
+                                  class="euiKeyPadMenuItem__inner"
+                                >
+                                  <div
+                                    class="euiKeyPadMenuItem__icon"
+                                  >
+                                    <div
+                                      color="secondary"
+                                      data-euiicon-type="empty"
+                                    />
                                   </div>
+                                  <p
+                                    class="euiKeyPadMenuItem__label"
+                                  >
+                                    <span
+                                      data-test-subj="visTypeTitle"
+                                    >
+                                      Vis with search
+                                    </span>
+                                  </p>
                                 </div>
-                              </div>
-                            </div>
-                          </div>
-                        }
-                        onActivation={[Function]}
-                        onDeactivation={[Function]}
-                        persistentFocus={false}
-                        returnFocus={[Function]}
-                        shards={Array []}
+                              </button>
+                            </li>
+                          </ul>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
+                    >
+                      <h2
+                        class="euiTitle euiTitle--small"
+                      >
+                        Select a visualization type
+                      </h2>
+                      <div
+                        class="euiSpacer euiSpacer--m"
                       />
-                    </SideEffect(FocusWatcher)>
-                  </SideCar>
-                </RequireSideCar>
-                <ForwardRef
-                  data-focus-lock-disabled={false}
-                  enabled={false}
-                  inert={false}
-                  onBlur={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onTouchStart={[Function]}
-                  removeScrollBar={true}
-                  sideCar={[Function]}
+                      <div
+                        class="euiText euiText--medium"
+                      >
+                        <p>
+                          Start creating your visualization by selecting a type for that visualization.
+                        </p>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      }
+    >
+      <EuiModal
+        aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
+        className="visNewVisDialog"
+        onClose={[Function]}
+        role="menu"
+      >
+        <EuiFocusTrap>
+          <div
+            data-eui="EuiFocusTrap"
+          >
+            <div
+              aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
+              className="euiModal euiModal--maxWidth-default visNewVisDialog"
+              onKeyDown={[Function]}
+              role="menu"
+              tabIndex={0}
+            >
+              <EuiI18n
+                default="Closes this modal window"
+                token="euiModal.closeModal"
+              >
+                <EuiButtonIcon
+                  aria-label="Closes this modal window"
+                  className="euiModal__closeIcon"
+                  color="text"
+                  iconType="cross"
+                  onClick={[Function]}
                 >
-                  <div
-                    data-focus-lock-disabled={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onScrollCapture={[Function]}
-                    onTouchMoveCapture={[Function]}
-                    onTouchStart={[Function]}
-                    onWheelCapture={[Function]}
+                  <button
+                    aria-label="Closes this modal window"
+                    className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                    onClick={[Function]}
+                    type="button"
                   >
+                    <EuiIcon
+                      aria-hidden="true"
+                      className="euiButtonIcon__icon"
+                      size="m"
+                      type="cross"
+                    >
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="cross"
+                        size="m"
+                      />
+                    </EuiIcon>
+                  </button>
+                </EuiButtonIcon>
+              </EuiI18n>
+              <div
+                className="euiModal__flex"
+              >
+                <TypeSelection
+                  addBasePath={[Function]}
+                  onVisTypeSelected={[Function]}
+                  visTypesRegistry={
+                    Object {
+                      "all": [Function],
+                      "get": [Function],
+                      "getAliases": [Function],
+                    }
+                  }
+                >
+                  <EuiModalHeader>
                     <div
-                      aria-label="Start creating your visualization by selecting a type for that visualization. Hit escape to close this modal. Hit Tab key to go further."
-                      className="euiModal euiModal--maxWidth-default visNewVisDialog"
-                      onKeyDown={[Function]}
-                      role="menu"
-                      tabIndex={0}
+                      className="euiModalHeader"
                     >
-                      <EuiI18n
-                        default="Closes this modal window"
-                        token="euiModal.closeModal"
-                      >
-                        <EuiButtonIcon
-                          aria-label="Closes this modal window"
-                          className="euiModal__closeIcon"
-                          color="text"
-                          iconType="cross"
-                          onClick={[Function]}
+                      <EuiModalHeaderTitle>
+                        <div
+                          className="euiModalHeader__title"
                         >
-                          <button
-                            aria-label="Closes this modal window"
-                            className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            onClick={[Function]}
-                            type="button"
+                          <FormattedMessage
+                            defaultMessage="New Visualization"
+                            id="visualizations.newVisWizard.title"
+                            values={Object {}}
                           >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              size="m"
-                              type="cross"
-                            >
-                              <div
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                data-euiicon-type="cross"
-                                size="m"
-                              />
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
-                      </EuiI18n>
+                            New Visualization
+                          </FormattedMessage>
+                        </div>
+                      </EuiModalHeaderTitle>
+                    </div>
+                  </EuiModalHeader>
+                  <div
+                    className="visNewVisDialog__body"
+                  >
+                    <EuiFlexGroup
+                      gutterSize="xl"
+                    >
                       <div
-                        className="euiModal__flex"
+                        className="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
                       >
-                        <TypeSelection
-                          addBasePath={[Function]}
-                          onVisTypeSelected={[Function]}
-                          visTypesRegistry={
-                            Object {
-                              "all": [Function],
-                              "get": [Function],
-                              "getAliases": [Function],
-                            }
-                          }
-                        >
-                          <EuiModalHeader>
-                            <div
-                              className="euiModalHeader"
-                            >
-                              <EuiModalHeaderTitle>
-                                <div
-                                  className="euiModalHeader__title"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="New Visualization"
-                                    id="visualizations.newVisWizard.title"
-                                    values={Object {}}
-                                  >
-                                    New Visualization
-                                  </FormattedMessage>
-                                </div>
-                              </EuiModalHeaderTitle>
-                            </div>
-                          </EuiModalHeader>
+                        <EuiFlexItem>
                           <div
-                            className="visNewVisDialog__body"
+                            className="euiFlexItem"
                           >
                             <EuiFlexGroup
-                              gutterSize="xl"
+                              className="visNewVisDialog__list"
+                              direction="column"
+                              gutterSize="none"
+                              responsive={false}
                             >
                               <div
-                                className="euiFlexGroup euiFlexGroup--gutterExtraLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                className="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
                               >
-                                <EuiFlexItem>
+                                <EuiFlexItem
+                                  className="visNewVisDialog__searchWrapper"
+                                  grow={false}
+                                >
                                   <div
-                                    className="euiFlexItem"
+                                    className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
                                   >
-                                    <EuiFlexGroup
-                                      className="visNewVisDialog__list"
-                                      direction="column"
-                                      gutterSize="none"
-                                      responsive={false}
+                                    <EuiFieldSearch
+                                      aria-label="Filter for a visualization type"
+                                      compressed={false}
+                                      data-test-subj="filterVisType"
+                                      fullWidth={true}
+                                      incremental={false}
+                                      isClearable={true}
+                                      isLoading={false}
+                                      onChange={[Function]}
+                                      placeholder="Filter"
+                                      value=""
                                     >
-                                      <div
-                                        className="euiFlexGroup euiFlexGroup--directionColumn visNewVisDialog__list"
+                                      <EuiFormControlLayout
+                                        compressed={false}
+                                        fullWidth={true}
+                                        icon="search"
+                                        isLoading={false}
                                       >
-                                        <EuiFlexItem
-                                          className="visNewVisDialog__searchWrapper"
-                                          grow={false}
+                                        <div
+                                          className="euiFormControlLayout euiFormControlLayout--fullWidth"
                                         >
                                           <div
-                                            className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__searchWrapper"
+                                            className="euiFormControlLayout__childrenWrapper"
                                           >
-                                            <EuiFieldSearch
-                                              aria-label="Filter for a visualization type"
-                                              compressed={false}
-                                              data-test-subj="filterVisType"
-                                              fullWidth={true}
-                                              incremental={false}
-                                              isClearable={true}
+                                            <EuiValidatableControl>
+                                              <input
+                                                aria-label="Filter for a visualization type"
+                                                className="euiFieldSearch euiFieldSearch--fullWidth"
+                                                data-test-subj="filterVisType"
+                                                onChange={[Function]}
+                                                onKeyUp={[Function]}
+                                                placeholder="Filter"
+                                                type="search"
+                                                value=""
+                                              />
+                                            </EuiValidatableControl>
+                                            <EuiFormControlLayoutIcons
+                                              icon="search"
                                               isLoading={false}
-                                              onChange={[Function]}
-                                              placeholder="Filter"
-                                              value=""
                                             >
-                                              <EuiFormControlLayout
-                                                compressed={false}
-                                                fullWidth={true}
-                                                icon="search"
-                                                isLoading={false}
+                                              <div
+                                                className="euiFormControlLayoutIcons"
                                               >
-                                                <div
-                                                  className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                                <EuiFormControlLayoutCustomIcon
+                                                  type="search"
                                                 >
-                                                  <div
-                                                    className="euiFormControlLayout__childrenWrapper"
+                                                  <span
+                                                    className="euiFormControlLayoutCustomIcon"
                                                   >
-                                                    <EuiValidatableControl>
-                                                      <input
-                                                        aria-label="Filter for a visualization type"
-                                                        className="euiFieldSearch euiFieldSearch--fullWidth"
-                                                        data-test-subj="filterVisType"
-                                                        onChange={[Function]}
-                                                        onKeyUp={[Function]}
-                                                        placeholder="Filter"
-                                                        type="search"
-                                                        value=""
-                                                      />
-                                                    </EuiValidatableControl>
-                                                    <EuiFormControlLayoutIcons
-                                                      icon="search"
-                                                      isLoading={false}
+                                                    <EuiIcon
+                                                      aria-hidden="true"
+                                                      className="euiFormControlLayoutCustomIcon__icon"
+                                                      type="search"
                                                     >
                                                       <div
-                                                        className="euiFormControlLayoutIcons"
-                                                      >
-                                                        <EuiFormControlLayoutCustomIcon
-                                                          type="search"
-                                                        >
-                                                          <span
-                                                            className="euiFormControlLayoutCustomIcon"
-                                                          >
-                                                            <EuiIcon
-                                                              aria-hidden="true"
-                                                              className="euiFormControlLayoutCustomIcon__icon"
-                                                              type="search"
-                                                            >
-                                                              <div
-                                                                aria-hidden="true"
-                                                                className="euiFormControlLayoutCustomIcon__icon"
-                                                                data-euiicon-type="search"
-                                                              />
-                                                            </EuiIcon>
-                                                          </span>
-                                                        </EuiFormControlLayoutCustomIcon>
-                                                      </div>
-                                                    </EuiFormControlLayoutIcons>
-                                                  </div>
-                                                </div>
-                                              </EuiFormControlLayout>
-                                            </EuiFieldSearch>
+                                                        aria-hidden="true"
+                                                        className="euiFormControlLayoutCustomIcon__icon"
+                                                        data-euiicon-type="search"
+                                                      />
+                                                    </EuiIcon>
+                                                  </span>
+                                                </EuiFormControlLayoutCustomIcon>
+                                              </div>
+                                            </EuiFormControlLayoutIcons>
                                           </div>
-                                        </EuiFlexItem>
-                                        <EuiFlexItem
-                                          className="visNewVisDialog__typesWrapper"
-                                          grow={1}
+                                        </div>
+                                      </EuiFormControlLayout>
+                                    </EuiFieldSearch>
+                                  </div>
+                                </EuiFlexItem>
+                                <EuiFlexItem
+                                  className="visNewVisDialog__typesWrapper"
+                                  grow={1}
+                                >
+                                  <div
+                                    className="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
+                                  >
+                                    <EuiScreenReaderOnly>
+                                      <span
+                                        aria-live="polite"
+                                        className="euiScreenReaderOnly"
+                                      />
+                                    </EuiScreenReaderOnly>
+                                    <EuiKeyPadMenu
+                                      className="visNewVisDialog__types"
+                                      data-test-subj="visNewDialogTypes"
+                                    >
+                                      <ul
+                                        className="euiKeyPadMenu visNewVisDialog__types"
+                                        data-test-subj="visNewDialogTypes"
+                                      >
+                                        <li
+                                          key=".$vis"
                                         >
-                                          <div
-                                            className="euiFlexItem euiFlexItem--flexGrow1 visNewVisDialog__typesWrapper"
-                                          >
-                                            <EuiScreenReaderOnly>
+                                          <EuiKeyPadMenuItem
+                                            aria-describedby="visTypeDescription-vis"
+                                            className="visNewVisDialog__type"
+                                            data-test-subj="visType-vis"
+                                            data-vis-stage="production"
+                                            disabled={false}
+                                            key="vis"
+                                            label={
                                               <span
-                                                aria-live="polite"
-                                                className="euiScreenReaderOnly"
-                                              />
-                                            </EuiScreenReaderOnly>
-                                            <EuiKeyPadMenu
-                                              className="visNewVisDialog__types"
-                                              data-test-subj="visNewDialogTypes"
+                                                data-test-subj="visTypeTitle"
+                                              >
+                                                Vis Type 1
+                                              </span>
+                                            }
+                                            onBlur={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onMouseEnter={[Function]}
+                                            onMouseLeave={[Function]}
+                                            role="menuitem"
+                                          >
+                                            <button
+                                              aria-describedby="visTypeDescription-vis"
+                                              className="euiKeyPadMenuItem visNewVisDialog__type"
+                                              data-test-subj="visType-vis"
+                                              data-vis-stage="production"
+                                              disabled={false}
+                                              onBlur={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onMouseEnter={[Function]}
+                                              onMouseLeave={[Function]}
+                                              role="menuitem"
+                                              type="button"
                                             >
-                                              <ul
-                                                className="euiKeyPadMenu visNewVisDialog__types"
-                                                data-test-subj="visNewDialogTypes"
+                                              <div
+                                                className="euiKeyPadMenuItem__inner"
                                               >
-                                                <li
-                                                  key=".$vis"
+                                                <div
+                                                  className="euiKeyPadMenuItem__icon"
                                                 >
-                                                  <EuiKeyPadMenuItem
-                                                    aria-describedby="visTypeDescription-vis"
-                                                    className="visNewVisDialog__type"
-                                                    data-test-subj="visType-vis"
-                                                    data-vis-stage="production"
-                                                    disabled={false}
-                                                    key="vis"
-                                                    label={
-                                                      <span
-                                                        data-test-subj="visTypeTitle"
-                                                      >
-                                                        Vis Type 1
-                                                      </span>
-                                                    }
-                                                    onBlur={[Function]}
-                                                    onClick={[Function]}
-                                                    onFocus={[Function]}
-                                                    onMouseEnter={[Function]}
-                                                    onMouseLeave={[Function]}
-                                                    role="menuitem"
-                                                  >
-                                                    <button
-                                                      aria-describedby="visTypeDescription-vis"
-                                                      className="euiKeyPadMenuItem visNewVisDialog__type"
-                                                      data-test-subj="visType-vis"
-                                                      data-vis-stage="production"
-                                                      disabled={false}
-                                                      onBlur={[Function]}
-                                                      onClick={[Function]}
-                                                      onFocus={[Function]}
-                                                      onMouseEnter={[Function]}
-                                                      onMouseLeave={[Function]}
-                                                      role="menuitem"
-                                                      type="button"
+                                                  <VisTypeIcon>
+                                                    <EuiIcon
+                                                      color="secondary"
+                                                      size="l"
+                                                      type="empty"
                                                     >
                                                       <div
-                                                        className="euiKeyPadMenuItem__inner"
-                                                      >
-                                                        <div
-                                                          className="euiKeyPadMenuItem__icon"
-                                                        >
-                                                          <VisTypeIcon>
-                                                            <EuiIcon
-                                                              color="secondary"
-                                                              size="l"
-                                                              type="empty"
-                                                            >
-                                                              <div
-                                                                color="secondary"
-                                                                data-euiicon-type="empty"
-                                                                size="l"
-                                                              />
-                                                            </EuiIcon>
-                                                          </VisTypeIcon>
-                                                        </div>
-                                                        <p
-                                                          className="euiKeyPadMenuItem__label"
-                                                        >
-                                                          <span
-                                                            data-test-subj="visTypeTitle"
-                                                          >
-                                                            Vis Type 1
-                                                          </span>
-                                                        </p>
-                                                      </div>
-                                                    </button>
-                                                  </EuiKeyPadMenuItem>
-                                                </li>
-                                                <li
-                                                  key=".$visWithAliasUrl"
+                                                        color="secondary"
+                                                        data-euiicon-type="empty"
+                                                        size="l"
+                                                      />
+                                                    </EuiIcon>
+                                                  </VisTypeIcon>
+                                                </div>
+                                                <p
+                                                  className="euiKeyPadMenuItem__label"
                                                 >
-                                                  <EuiKeyPadMenuItem
-                                                    aria-describedby="visTypeDescription-visWithAliasUrl"
-                                                    betaBadgeIconType="popout"
-                                                    betaBadgeLabel="Kibana application"
-                                                    betaBadgeTooltipContent="Opens a Kibana application that is outside of Visualize."
-                                                    className="visNewVisDialog__type"
-                                                    data-test-subj="visType-visWithAliasUrl"
-                                                    data-vis-stage="alias"
-                                                    disabled={false}
-                                                    key="visWithAliasUrl"
-                                                    label={
-                                                      <span
-                                                        data-test-subj="visTypeTitle"
-                                                      >
-                                                        Vis with alias Url
-                                                      </span>
-                                                    }
-                                                    onBlur={[Function]}
-                                                    onClick={[Function]}
-                                                    onFocus={[Function]}
-                                                    onMouseEnter={[Function]}
-                                                    onMouseLeave={[Function]}
-                                                    role="menuitem"
+                                                  <span
+                                                    data-test-subj="visTypeTitle"
                                                   >
-                                                    <button
-                                                      aria-describedby="visTypeDescription-visWithAliasUrl"
-                                                      className="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
-                                                      data-test-subj="visType-visWithAliasUrl"
-                                                      data-vis-stage="alias"
-                                                      disabled={false}
-                                                      onBlur={[Function]}
-                                                      onClick={[Function]}
-                                                      onFocus={[Function]}
-                                                      onMouseEnter={[Function]}
-                                                      onMouseLeave={[Function]}
-                                                      role="menuitem"
-                                                      type="button"
+                                                    Vis Type 1
+                                                  </span>
+                                                </p>
+                                              </div>
+                                            </button>
+                                          </EuiKeyPadMenuItem>
+                                        </li>
+                                        <li
+                                          key=".$visWithAliasUrl"
+                                        >
+                                          <EuiKeyPadMenuItem
+                                            aria-describedby="visTypeDescription-visWithAliasUrl"
+                                            betaBadgeIconType="popout"
+                                            betaBadgeLabel="Kibana application"
+                                            betaBadgeTooltipContent="Opens a Kibana application that is outside of Visualize."
+                                            className="visNewVisDialog__type"
+                                            data-test-subj="visType-visWithAliasUrl"
+                                            data-vis-stage="alias"
+                                            disabled={false}
+                                            key="visWithAliasUrl"
+                                            label={
+                                              <span
+                                                data-test-subj="visTypeTitle"
+                                              >
+                                                Vis with alias Url
+                                              </span>
+                                            }
+                                            onBlur={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onMouseEnter={[Function]}
+                                            onMouseLeave={[Function]}
+                                            role="menuitem"
+                                          >
+                                            <button
+                                              aria-describedby="visTypeDescription-visWithAliasUrl"
+                                              className="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
+                                              data-test-subj="visType-visWithAliasUrl"
+                                              data-vis-stage="alias"
+                                              disabled={false}
+                                              onBlur={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onMouseEnter={[Function]}
+                                              onMouseLeave={[Function]}
+                                              role="menuitem"
+                                              type="button"
+                                            >
+                                              <div
+                                                className="euiKeyPadMenuItem__inner"
+                                              >
+                                                <span
+                                                  className="euiKeyPadMenuItem__betaBadgeWrapper"
+                                                >
+                                                  <EuiBetaBadge
+                                                    className="euiKeyPadMenuItem__betaBadge"
+                                                    iconType="popout"
+                                                    label="Kibana application"
+                                                    tooltipContent="Opens a Kibana application that is outside of Visualize."
+                                                  >
+                                                    <EuiToolTip
+                                                      content="Opens a Kibana application that is outside of Visualize."
+                                                      delay="regular"
+                                                      position="top"
+                                                      title="Kibana application"
                                                     >
-                                                      <div
-                                                        className="euiKeyPadMenuItem__inner"
+                                                      <span
+                                                        className="euiToolTipAnchor"
+                                                        onKeyUp={[Function]}
+                                                        onMouseOut={[Function]}
+                                                        onMouseOver={[Function]}
                                                       >
                                                         <span
-                                                          className="euiKeyPadMenuItem__betaBadgeWrapper"
+                                                          className="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
+                                                          onBlur={[Function]}
+                                                          onFocus={[Function]}
+                                                          tabIndex={0}
                                                         >
-                                                          <EuiBetaBadge
-                                                            className="euiKeyPadMenuItem__betaBadge"
-                                                            iconType="popout"
-                                                            label="Kibana application"
-                                                            tooltipContent="Opens a Kibana application that is outside of Visualize."
+                                                          <EuiIcon
+                                                            aria-hidden="true"
+                                                            className="euiBetaBadge__icon"
+                                                            size="m"
+                                                            type="popout"
                                                           >
-                                                            <EuiToolTip
-                                                              content="Opens a Kibana application that is outside of Visualize."
-                                                              delay="regular"
-                                                              position="top"
-                                                              title="Kibana application"
-                                                            >
-                                                              <span
-                                                                className="euiToolTipAnchor"
-                                                                onKeyUp={[Function]}
-                                                                onMouseOut={[Function]}
-                                                                onMouseOver={[Function]}
-                                                              >
-                                                                <span
-                                                                  className="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                                  onBlur={[Function]}
-                                                                  onFocus={[Function]}
-                                                                  tabIndex={0}
-                                                                >
-                                                                  <EuiIcon
-                                                                    aria-hidden="true"
-                                                                    className="euiBetaBadge__icon"
-                                                                    size="m"
-                                                                    type="popout"
-                                                                  >
-                                                                    <div
-                                                                      aria-hidden="true"
-                                                                      className="euiBetaBadge__icon"
-                                                                      data-euiicon-type="popout"
-                                                                      size="m"
-                                                                    />
-                                                                  </EuiIcon>
-                                                                </span>
-                                                              </span>
-                                                            </EuiToolTip>
-                                                          </EuiBetaBadge>
+                                                            <div
+                                                              aria-hidden="true"
+                                                              className="euiBetaBadge__icon"
+                                                              data-euiicon-type="popout"
+                                                              size="m"
+                                                            />
+                                                          </EuiIcon>
                                                         </span>
-                                                        <div
-                                                          className="euiKeyPadMenuItem__icon"
-                                                        >
-                                                          <VisTypeIcon>
-                                                            <EuiIcon
-                                                              color="secondary"
-                                                              size="l"
-                                                              type="empty"
-                                                            >
-                                                              <div
-                                                                color="secondary"
-                                                                data-euiicon-type="empty"
-                                                                size="l"
-                                                              />
-                                                            </EuiIcon>
-                                                          </VisTypeIcon>
-                                                        </div>
-                                                        <p
-                                                          className="euiKeyPadMenuItem__label"
-                                                        >
-                                                          <span
-                                                            data-test-subj="visTypeTitle"
-                                                          >
-                                                            Vis with alias Url
-                                                          </span>
-                                                        </p>
-                                                      </div>
-                                                    </button>
-                                                  </EuiKeyPadMenuItem>
-                                                </li>
-                                                <li
-                                                  key=".$visWithSearch"
-                                                >
-                                                  <EuiKeyPadMenuItem
-                                                    aria-describedby="visTypeDescription-visWithSearch"
-                                                    className="visNewVisDialog__type"
-                                                    data-test-subj="visType-visWithSearch"
-                                                    data-vis-stage="production"
-                                                    disabled={false}
-                                                    key="visWithSearch"
-                                                    label={
-                                                      <span
-                                                        data-test-subj="visTypeTitle"
-                                                      >
-                                                        Vis with search
                                                       </span>
-                                                    }
-                                                    onBlur={[Function]}
-                                                    onClick={[Function]}
-                                                    onFocus={[Function]}
-                                                    onMouseEnter={[Function]}
-                                                    onMouseLeave={[Function]}
-                                                    role="menuitem"
-                                                  >
-                                                    <button
-                                                      aria-describedby="visTypeDescription-visWithSearch"
-                                                      className="euiKeyPadMenuItem visNewVisDialog__type"
-                                                      data-test-subj="visType-visWithSearch"
-                                                      data-vis-stage="production"
-                                                      disabled={false}
-                                                      onBlur={[Function]}
-                                                      onClick={[Function]}
-                                                      onFocus={[Function]}
-                                                      onMouseEnter={[Function]}
-                                                      onMouseLeave={[Function]}
-                                                      role="menuitem"
-                                                      type="button"
+                                                    </EuiToolTip>
+                                                  </EuiBetaBadge>
+                                                </span>
+                                                <div
+                                                  className="euiKeyPadMenuItem__icon"
+                                                >
+                                                  <VisTypeIcon>
+                                                    <EuiIcon
+                                                      color="secondary"
+                                                      size="l"
+                                                      type="empty"
                                                     >
                                                       <div
-                                                        className="euiKeyPadMenuItem__inner"
-                                                      >
-                                                        <div
-                                                          className="euiKeyPadMenuItem__icon"
-                                                        >
-                                                          <VisTypeIcon>
-                                                            <EuiIcon
-                                                              color="secondary"
-                                                              size="l"
-                                                              type="empty"
-                                                            >
-                                                              <div
-                                                                color="secondary"
-                                                                data-euiicon-type="empty"
-                                                                size="l"
-                                                              />
-                                                            </EuiIcon>
-                                                          </VisTypeIcon>
-                                                        </div>
-                                                        <p
-                                                          className="euiKeyPadMenuItem__label"
-                                                        >
-                                                          <span
-                                                            data-test-subj="visTypeTitle"
-                                                          >
-                                                            Vis with search
-                                                          </span>
-                                                        </p>
-                                                      </div>
-                                                    </button>
-                                                  </EuiKeyPadMenuItem>
-                                                </li>
-                                              </ul>
-                                            </EuiKeyPadMenu>
-                                          </div>
-                                        </EuiFlexItem>
-                                      </div>
-                                    </EuiFlexGroup>
-                                  </div>
-                                </EuiFlexItem>
-                                <EuiFlexItem
-                                  className="visNewVisDialog__description"
-                                  grow={false}
-                                >
-                                  <div
-                                    className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
-                                  >
-                                    <EuiTitle
-                                      size="s"
-                                    >
-                                      <h2
-                                        className="euiTitle euiTitle--small"
-                                      >
-                                        <FormattedMessage
-                                          defaultMessage="Select a visualization type"
-                                          id="visualizations.newVisWizard.selectVisType"
-                                          values={Object {}}
-                                        >
-                                          Select a visualization type
-                                        </FormattedMessage>
-                                      </h2>
-                                    </EuiTitle>
-                                    <EuiSpacer
-                                      size="m"
-                                    >
-                                      <div
-                                        className="euiSpacer euiSpacer--m"
-                                      />
-                                    </EuiSpacer>
-                                    <NewVisHelp
-                                      onPromotionClicked={[Function]}
-                                      promotedTypes={Array []}
-                                    >
-                                      <EuiText>
-                                        <div
-                                          className="euiText euiText--medium"
+                                                        color="secondary"
+                                                        data-euiicon-type="empty"
+                                                        size="l"
+                                                      />
+                                                    </EuiIcon>
+                                                  </VisTypeIcon>
+                                                </div>
+                                                <p
+                                                  className="euiKeyPadMenuItem__label"
+                                                >
+                                                  <span
+                                                    data-test-subj="visTypeTitle"
+                                                  >
+                                                    Vis with alias Url
+                                                  </span>
+                                                </p>
+                                              </div>
+                                            </button>
+                                          </EuiKeyPadMenuItem>
+                                        </li>
+                                        <li
+                                          key=".$visWithSearch"
                                         >
-                                          <p>
-                                            <FormattedMessage
-                                              defaultMessage="Start creating your visualization by selecting a type for that visualization."
-                                              id="visualizations.newVisWizard.helpText"
-                                              values={Object {}}
+                                          <EuiKeyPadMenuItem
+                                            aria-describedby="visTypeDescription-visWithSearch"
+                                            className="visNewVisDialog__type"
+                                            data-test-subj="visType-visWithSearch"
+                                            data-vis-stage="production"
+                                            disabled={false}
+                                            key="visWithSearch"
+                                            label={
+                                              <span
+                                                data-test-subj="visTypeTitle"
+                                              >
+                                                Vis with search
+                                              </span>
+                                            }
+                                            onBlur={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onMouseEnter={[Function]}
+                                            onMouseLeave={[Function]}
+                                            role="menuitem"
+                                          >
+                                            <button
+                                              aria-describedby="visTypeDescription-visWithSearch"
+                                              className="euiKeyPadMenuItem visNewVisDialog__type"
+                                              data-test-subj="visType-visWithSearch"
+                                              data-vis-stage="production"
+                                              disabled={false}
+                                              onBlur={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onMouseEnter={[Function]}
+                                              onMouseLeave={[Function]}
+                                              role="menuitem"
+                                              type="button"
                                             >
-                                              Start creating your visualization by selecting a type for that visualization.
-                                            </FormattedMessage>
-                                          </p>
-                                        </div>
-                                      </EuiText>
-                                    </NewVisHelp>
+                                              <div
+                                                className="euiKeyPadMenuItem__inner"
+                                              >
+                                                <div
+                                                  className="euiKeyPadMenuItem__icon"
+                                                >
+                                                  <VisTypeIcon>
+                                                    <EuiIcon
+                                                      color="secondary"
+                                                      size="l"
+                                                      type="empty"
+                                                    >
+                                                      <div
+                                                        color="secondary"
+                                                        data-euiicon-type="empty"
+                                                        size="l"
+                                                      />
+                                                    </EuiIcon>
+                                                  </VisTypeIcon>
+                                                </div>
+                                                <p
+                                                  className="euiKeyPadMenuItem__label"
+                                                >
+                                                  <span
+                                                    data-test-subj="visTypeTitle"
+                                                  >
+                                                    Vis with search
+                                                  </span>
+                                                </p>
+                                              </div>
+                                            </button>
+                                          </EuiKeyPadMenuItem>
+                                        </li>
+                                      </ul>
+                                    </EuiKeyPadMenu>
                                   </div>
                                 </EuiFlexItem>
                               </div>
                             </EuiFlexGroup>
                           </div>
-                        </TypeSelection>
+                        </EuiFlexItem>
+                        <EuiFlexItem
+                          className="visNewVisDialog__description"
+                          grow={false}
+                        >
+                          <div
+                            className="euiFlexItem euiFlexItem--flexGrowZero visNewVisDialog__description"
+                          >
+                            <EuiTitle
+                              size="s"
+                            >
+                              <h2
+                                className="euiTitle euiTitle--small"
+                              >
+                                <FormattedMessage
+                                  defaultMessage="Select a visualization type"
+                                  id="visualizations.newVisWizard.selectVisType"
+                                  values={Object {}}
+                                >
+                                  Select a visualization type
+                                </FormattedMessage>
+                              </h2>
+                            </EuiTitle>
+                            <EuiSpacer
+                              size="m"
+                            >
+                              <div
+                                className="euiSpacer euiSpacer--m"
+                              />
+                            </EuiSpacer>
+                            <NewVisHelp
+                              onPromotionClicked={[Function]}
+                              promotedTypes={Array []}
+                            >
+                              <EuiText>
+                                <div
+                                  className="euiText euiText--medium"
+                                >
+                                  <p>
+                                    <FormattedMessage
+                                      defaultMessage="Start creating your visualization by selecting a type for that visualization."
+                                      id="visualizations.newVisWizard.helpText"
+                                      values={Object {}}
+                                    >
+                                      Start creating your visualization by selecting a type for that visualization.
+                                    </FormattedMessage>
+                                  </p>
+                                </div>
+                              </EuiText>
+                            </NewVisHelp>
+                          </div>
+                        </EuiFlexItem>
                       </div>
-                    </div>
+                    </EuiFlexGroup>
                   </div>
-                </ForwardRef>
-                <div
-                  data-focus-guard={true}
-                  style={
-                    Object {
-                      "height": "0px",
-                      "left": "1px",
-                      "overflow": "hidden",
-                      "padding": 0,
-                      "position": "fixed",
-                      "top": "1px",
-                      "width": "1px",
-                    }
-                  }
-                  tabIndex={0}
-                />
-              </ForwardRef>
-              <RequireSideCar
-                noIsolation={true}
-                setLockProps={[Function]}
-                sideCar={
-                  Object {
-                    "assignMedium": [Function],
-                    "assignSyncMedium": [Function],
-                    "options": Object {
-                      "async": true,
-                      "ssr": false,
-                    },
-                    "read": [Function],
-                    "useMedium": [Function],
-                  }
-                }
-              >
-                <SideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <Effect
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                  >
-                    <Component>
-                      <Sheet
-                        styles="
- [data-focus-on-hidden] {
-   pointer-events: none !important;
- }
-"
-                      />
-                    </Component>
-                  </Effect>
-                </SideCar>
-              </RequireSideCar>
-            </ForwardRef>
-          </ForwardRef>
+                </TypeSelection>
+              </div>
+            </div>
+          </div>
         </EuiFocusTrap>
       </EuiModal>
     </Portal>
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index b04fbc2bb2136..c5e080e3c8175 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "27.4.0",
+    "@elastic/eui": "27.4.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
index 159bb54f50903..9cf81d27e4e8d 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
@@ -20,7 +20,7 @@
 import { History } from 'history';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Route, withRouter, RouteComponentProps } from 'react-router-dom';
+import { Router, Route, withRouter, RouteComponentProps, Redirect } from 'react-router-dom';
 
 import {
   EuiPage,
@@ -95,7 +95,7 @@ const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
           {
             id: 'home',
             name: 'Home',
-            onClick: () => history.push(''),
+            onClick: () => history.push('/home'),
             'data-test-subj': 'fooNavHome',
           },
           {
@@ -122,7 +122,8 @@ const FooApp = ({ history, context }: { history: History; context: AppMountConte
       <EuiPageSideBar>
         <Nav navigateToApp={context.core.application.navigateToApp} />
       </EuiPageSideBar>
-      <Route path="/" exact component={Home} />
+      <Route path="/" exact render={() => <Redirect to="/home" />} />
+      <Route path="/home" exact component={Home} />
       <Route path="/page-a" component={PageA} />
     </EuiPage>
   </Router>
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
index e4a66fe47d8f2..dac901f496304 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "27.4.0",
+    "@elastic/eui": "27.4.1",
     "react": "^16.12.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index 0e560dd7be7c3..b7c494807672e 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "27.4.0",
+    "@elastic/eui": "27.4.1",
     "react": "^16.12.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.ts b/test/plugin_functional/test_suites/core_plugins/applications.ts
index 9306b62b9d521..9ecef65f5f09a 100644
--- a/test/plugin_functional/test_suites/core_plugins/applications.ts
+++ b/test/plugin_functional/test_suites/core_plugins/applications.ts
@@ -54,6 +54,9 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     });
   };
 
+  const navigateTo = async (path: string) =>
+    await browser.navigateTo(`${PageObjects.common.getHostPort()}${path}`);
+
   describe('ui applications', function describeIndexTests() {
     before(async () => {
       await PageObjects.common.navigateToApp('foo');
@@ -63,6 +66,15 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       await testSubjects.existOrFail('fooAppHome');
     });
 
+    it('redirects and renders correctly regardless of trailing slash', async () => {
+      await navigateTo(`/app/foo`);
+      await waitForUrlToBe('/app/foo/home');
+      await testSubjects.existOrFail('fooAppHome');
+      await navigateTo(`/app/foo/`);
+      await waitForUrlToBe('/app/foo/home');
+      await testSubjects.existOrFail('fooAppHome');
+    });
+
     it('navigates to its own pages', async () => {
       // Go to page A
       await testSubjects.click('fooNavPageA');
@@ -72,7 +84,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
 
       // Go to home page
       await testSubjects.click('fooNavHome');
-      await waitForUrlToBe('/app/foo');
+      await waitForUrlToBe('/app/foo/home');
       await loadingScreenNotShown();
       await testSubjects.existOrFail('fooAppHome');
     });
@@ -86,7 +98,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
 
     it('navigates to app root when navlink is clicked', async () => {
       await appsMenu.clickLink('Foo');
-      await waitForUrlToBe('/app/foo');
+      await waitForUrlToBe('/app/foo/home');
       // await loadingScreenNotShown();
       await testSubjects.existOrFail('fooAppHome');
     });
@@ -105,7 +117,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
 
     it('can use the back button to navigate back to previous app', async () => {
       await browser.goBack();
-      await waitForUrlToBe('/app/foo');
+      await waitForUrlToBe('/app/foo/home');
       await loadingScreenNotShown();
       await testSubjects.existOrFail('fooAppHome');
     });
diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js
index 0e3f82792a2ba..a0574dbdf36da 100644
--- a/x-pack/dev-tools/jest/create_jest_config.js
+++ b/x-pack/dev-tools/jest/create_jest_config.js
@@ -58,7 +58,6 @@ export function createJestConfig({ kibanaDirectory, rootDir, xPackKibanaDirector
       `${xPackKibanaDirectory}/dev-tools/jest/setup/setup_test.js`,
       `${kibanaDirectory}/src/dev/jest/setup/mocks.js`,
       `${kibanaDirectory}/src/dev/jest/setup/react_testing_library.js`,
-      `${kibanaDirectory}/src/dev/jest/setup/default_timeout.js`,
     ],
     testEnvironment: 'jest-environment-jsdom-thirteen',
     testMatch: ['**/*.test.{js,mjs,ts,tsx}'],
diff --git a/x-pack/package.json b/x-pack/package.json
index a70373db36603..a9ffb85924562 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -206,7 +206,7 @@
     "@elastic/apm-rum-react": "^1.2.3",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.9.3",
-    "@elastic/eui": "27.4.0",
+    "@elastic/eui": "27.4.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.3.0",
     "@elastic/node-crypto": "1.2.1",
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
index 1fa440ebb794c..30c65e71f8019 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
@@ -1,10 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`TransactionActionMenu component should match the snapshot 1`] = `
-<div
-  aria-hidden="true"
-  data-aria-hidden="true"
->
+<div>
   <div
     class="euiPopover euiPopover--anchorDownRight"
     id="transactionActionMenu"
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
index 4f44c0cf85f17..26e586f4564dc 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
@@ -1,781 +1,673 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasAssetManager canvasModal--fixedSize"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "1000px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasAssetManager canvasModal--fixedSize"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "1000px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiModal__flex"
+        className="euiModalHeader canvasAssetManager__modalHeader"
       >
         <div
-          className="euiModalHeader canvasAssetManager__modalHeader"
+          className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
+        >
+          Manage workpad assets
+        </div>
+        <div
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive canvasAssetManager__fileUploadWrapper"
         >
           <div
-            className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
-          >
-            Manage workpad assets
-          </div>
-          <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive canvasAssetManager__fileUploadWrapper"
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+              className="euiFilePicker euiFilePicker--compressed"
             >
               <div
-                className="euiFilePicker euiFilePicker--compressed"
+                className="euiFilePicker__wrap"
               >
+                <input
+                  accept="image/*"
+                  aria-describedby="generated-id"
+                  className="euiFilePicker__input"
+                  multiple={true}
+                  onChange={[Function]}
+                  onDragLeave={[Function]}
+                  onDragOver={[Function]}
+                  onDrop={[Function]}
+                  type="file"
+                />
                 <div
-                  className="euiFilePicker__wrap"
+                  className="euiFilePicker__prompt"
+                  id="generated-id"
                 >
-                  <input
-                    accept="image/*"
-                    aria-describedby="generated-id"
-                    className="euiFilePicker__input"
-                    multiple={true}
-                    onChange={[Function]}
-                    onDragLeave={[Function]}
-                    onDragOver={[Function]}
-                    onDrop={[Function]}
-                    type="file"
+                  <div
+                    aria-hidden="true"
+                    className="euiFilePicker__icon"
+                    data-euiicon-type="importAction"
+                    size="m"
                   />
                   <div
-                    className="euiFilePicker__prompt"
-                    id="generated-id"
+                    className="euiFilePicker__promptText"
                   >
-                    <div
-                      aria-hidden="true"
-                      className="euiFilePicker__icon"
-                      data-euiicon-type="importAction"
-                      size="m"
-                    />
-                    <div
-                      className="euiFilePicker__promptText"
-                    >
-                      Select or drag and drop images
-                    </div>
+                    Select or drag and drop images
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalBody"
+      >
         <div
-          className="euiModalBody"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalBody__overflow"
+            className="euiText euiText--small"
           >
             <div
-              className="euiText euiText--small"
+              className="euiTextColor euiTextColor--subdued"
             >
-              <div
-                className="euiTextColor euiTextColor--subdued"
-              >
-                <p>
-                  Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets.
-                </p>
-              </div>
+              <p>
+                Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets.
+              </p>
             </div>
+          </div>
+          <div
+            className="euiSpacer euiSpacer--l"
+          />
+          <div
+            className="euiPanel euiPanel--paddingMedium canvasAssetManager__emptyPanel"
+          >
             <div
-              className="euiSpacer euiSpacer--l"
-            />
-            <div
-              className="euiPanel euiPanel--paddingMedium canvasAssetManager__emptyPanel"
+              className="euiEmptyPrompt"
             >
               <div
-                className="euiEmptyPrompt"
+                color="subdued"
+                data-euiicon-type="importAction"
+                size="xxl"
+              />
+              <div
+                className="euiSpacer euiSpacer--s"
+              />
+              <span
+                className="euiTextColor euiTextColor--subdued"
               >
+                <h2
+                  className="euiTitle euiTitle--xsmall"
+                >
+                  Import your assets to get started
+                </h2>
                 <div
-                  color="subdued"
-                  data-euiicon-type="importAction"
-                  size="xxl"
+                  className="euiSpacer euiSpacer--m"
                 />
-                <div
-                  className="euiSpacer euiSpacer--s"
-                />
-                <span
-                  className="euiTextColor euiTextColor--subdued"
-                >
-                  <h2
-                    className="euiTitle euiTitle--xsmall"
-                  >
-                    Import your assets to get started
-                  </h2>
-                  <div
-                    className="euiSpacer euiSpacer--m"
-                  />
-                </span>
-              </div>
+              </span>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalFooter canvasAssetManager__modalFooter"
+      >
         <div
-          className="euiModalFooter canvasAssetManager__modalFooter"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow canvasAssetManager__meterWrapper"
         >
           <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow canvasAssetManager__meterWrapper"
+            className="euiFlexItem"
+          >
+            <progress
+              aria-hidden={false}
+              aria-labelledby="CanvasAssetManagerLabel"
+              className="euiProgress euiProgress--native euiProgress--s euiProgress--secondary"
+              max={25000}
+              value={0}
+            />
+          </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero eui-textNoWrap"
           >
             <div
-              className="euiFlexItem"
-            >
-              <progress
-                aria-hidden={false}
-                aria-labelledby="CanvasAssetManagerLabel"
-                className="euiProgress euiProgress--native euiProgress--s euiProgress--secondary"
-                max={25000}
-                value={0}
-              />
-            </div>
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero eui-textNoWrap"
+              className="euiText euiText--medium"
+              id="CanvasAssetManagerLabel"
             >
-              <div
-                className="euiText euiText--medium"
-                id="CanvasAssetManagerLabel"
-              >
-                0% space used
-              </div>
+              0% space used
             </div>
           </div>
-          <button
-            className="euiButton euiButton--primary euiButton--small"
-            onClick={[Function]}
-            type="button"
+        </div>
+        <button
+          className="euiButton euiButton--primary euiButton--small"
+          onClick={[Function]}
+          type="button"
+        >
+          <span
+            className="euiButtonContent euiButton__content"
           >
             <span
-              className="euiButtonContent euiButton__content"
+              className="euiButton__text"
             >
-              <span
-                className="euiButton__text"
-              >
-                Close
-              </span>
+              Close
             </span>
-          </button>
-        </div>
+          </span>
+        </button>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
 
 exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasAssetManager canvasModal--fixedSize"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "1000px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasAssetManager canvasModal--fixedSize"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "1000px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiModal__flex"
+        className="euiModalHeader canvasAssetManager__modalHeader"
       >
         <div
-          className="euiModalHeader canvasAssetManager__modalHeader"
+          className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
+        >
+          Manage workpad assets
+        </div>
+        <div
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive canvasAssetManager__fileUploadWrapper"
         >
           <div
-            className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
-          >
-            Manage workpad assets
-          </div>
-          <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive canvasAssetManager__fileUploadWrapper"
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+              className="euiFilePicker euiFilePicker--compressed"
             >
               <div
-                className="euiFilePicker euiFilePicker--compressed"
+                className="euiFilePicker__wrap"
               >
+                <input
+                  accept="image/*"
+                  aria-describedby="generated-id"
+                  className="euiFilePicker__input"
+                  multiple={true}
+                  onChange={[Function]}
+                  onDragLeave={[Function]}
+                  onDragOver={[Function]}
+                  onDrop={[Function]}
+                  type="file"
+                />
                 <div
-                  className="euiFilePicker__wrap"
+                  className="euiFilePicker__prompt"
+                  id="generated-id"
                 >
-                  <input
-                    accept="image/*"
-                    aria-describedby="generated-id"
-                    className="euiFilePicker__input"
-                    multiple={true}
-                    onChange={[Function]}
-                    onDragLeave={[Function]}
-                    onDragOver={[Function]}
-                    onDrop={[Function]}
-                    type="file"
+                  <div
+                    aria-hidden="true"
+                    className="euiFilePicker__icon"
+                    data-euiicon-type="importAction"
+                    size="m"
                   />
                   <div
-                    className="euiFilePicker__prompt"
-                    id="generated-id"
+                    className="euiFilePicker__promptText"
                   >
-                    <div
-                      aria-hidden="true"
-                      className="euiFilePicker__icon"
-                      data-euiicon-type="importAction"
-                      size="m"
-                    />
-                    <div
-                      className="euiFilePicker__promptText"
-                    >
-                      Select or drag and drop images
-                    </div>
+                    Select or drag and drop images
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalBody"
+      >
         <div
-          className="euiModalBody"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalBody__overflow"
+            className="euiText euiText--small"
           >
             <div
-              className="euiText euiText--small"
+              className="euiTextColor euiTextColor--subdued"
             >
-              <div
-                className="euiTextColor euiTextColor--subdued"
-              >
-                <p>
-                  Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets.
-                </p>
-              </div>
+              <p>
+                Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets.
+              </p>
             </div>
+          </div>
+          <div
+            className="euiSpacer euiSpacer--l"
+          />
+          <div
+            className="euiFlexGrid euiFlexGrid--gutterLarge euiFlexGrid--fourths euiFlexGrid--responsive"
+          >
             <div
-              className="euiSpacer euiSpacer--l"
-            />
-            <div
-              className="euiFlexGrid euiFlexGrid--gutterLarge euiFlexGrid--fourths euiFlexGrid--responsive"
+              className="euiFlexItem"
             >
               <div
-                className="euiFlexItem"
+                className="euiPanel euiPanel--paddingSmall canvasAsset"
               >
                 <div
-                  className="euiPanel euiPanel--paddingSmall canvasAsset"
+                  className="canvasAsset__thumb canvasCheckered"
                 >
-                  <div
-                    className="canvasAsset__thumb canvasCheckered"
+                  <figure
+                    className="euiImage canvasAsset__img "
+                  >
+                    <img
+                      alt="Asset thumbnail"
+                      className="euiImage__img"
+                      src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4="
+                      style={Object {}}
+                    />
+                  </figure>
+                </div>
+                <div
+                  className="euiSpacer euiSpacer--s"
+                />
+                <div
+                  className="euiText euiText--extraSmall eui-textBreakAll"
+                >
+                  <p
+                    className="eui-textBreakAll"
                   >
-                    <figure
-                      className="euiImage canvasAsset__img "
+                    <strong>
+                      airplane
+                    </strong>
+                    <br />
+                    <span
+                      className="euiTextColor euiTextColor--subdued"
                     >
-                      <img
-                        alt="Asset thumbnail"
-                        className="euiImage__img"
-                        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4="
-                        style={Object {}}
-                      />
-                    </figure>
-                  </div>
-                  <div
-                    className="euiSpacer euiSpacer--s"
-                  />
+                      <small>
+                        (
+                        1
+                         kb)
+                      </small>
+                    </span>
+                  </p>
+                </div>
+                <div
+                  className="euiSpacer euiSpacer--s"
+                />
+                <div
+                  className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow"
+                >
                   <div
-                    className="euiText euiText--extraSmall eui-textBreakAll"
+                    className="euiFlexItem euiFlexItem--flexGrowZero asset-create-image"
                   >
-                    <p
-                      className="eui-textBreakAll"
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
                     >
-                      <strong>
-                        airplane
-                      </strong>
-                      <br />
-                      <span
-                        className="euiTextColor euiTextColor--subdued"
+                      <button
+                        aria-label="Create image element"
+                        className="euiButtonIcon euiButtonIcon--primary"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        type="button"
                       >
-                        <small>
-                          (
-                          1
-                           kb)
-                        </small>
-                      </span>
-                    </p>
+                        <div
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          data-euiicon-type="vector"
+                          size="m"
+                        />
+                      </button>
+                    </span>
                   </div>
                   <div
-                    className="euiSpacer euiSpacer--s"
-                  />
-                  <div
-                    className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow"
+                    className="euiFlexItem euiFlexItem--flexGrowZero asset-download"
                   >
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero asset-create-image"
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
                     >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
+                      <div
+                        className="canvasDownload"
+                        onClick={[Function]}
+                        onKeyPress={[Function]}
+                        role="button"
+                        tabIndex={0}
                       >
                         <button
-                          aria-label="Create image element"
+                          aria-label="Download"
                           className="euiButtonIcon euiButtonIcon--primary"
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
                           type="button"
                         >
                           <div
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
-                            data-euiicon-type="vector"
+                            data-euiicon-type="sortDown"
                             size="m"
                           />
                         </button>
-                      </span>
-                    </div>
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero asset-download"
-                    >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
-                      >
-                        <div
-                          className="canvasDownload"
-                          onClick={[Function]}
-                          onKeyPress={[Function]}
-                          role="button"
-                          tabIndex={0}
-                        >
-                          <button
-                            aria-label="Download"
-                            className="euiButtonIcon euiButtonIcon--primary"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              data-euiicon-type="sortDown"
-                              size="m"
-                            />
-                          </button>
-                        </div>
-                      </span>
-                    </div>
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
-                      >
-                        <div
-                          className="canvasClipboard"
-                          onClick={[Function]}
-                          onKeyPress={[Function]}
-                          role="button"
-                          tabIndex={0}
-                        >
-                          <button
-                            aria-label="Copy id to clipboard"
-                            className="euiButtonIcon euiButtonIcon--primary"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              data-euiicon-type="copyClipboard"
-                              size="m"
-                            />
-                          </button>
-                        </div>
-                      </span>
-                    </div>
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero"
+                      </div>
+                    </span>
+                  </div>
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                  >
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
                     >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
+                      <div
+                        className="canvasClipboard"
+                        onClick={[Function]}
+                        onKeyPress={[Function]}
+                        role="button"
+                        tabIndex={0}
                       >
                         <button
-                          aria-label="Delete"
-                          className="euiButtonIcon euiButtonIcon--danger"
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
+                          aria-label="Copy id to clipboard"
+                          className="euiButtonIcon euiButtonIcon--primary"
                           type="button"
                         >
                           <div
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
-                            data-euiicon-type="trash"
+                            data-euiicon-type="copyClipboard"
                             size="m"
                           />
                         </button>
-                      </span>
-                    </div>
+                      </div>
+                    </span>
+                  </div>
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                  >
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                    >
+                      <button
+                        aria-label="Delete"
+                        className="euiButtonIcon euiButtonIcon--danger"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        type="button"
+                      >
+                        <div
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          data-euiicon-type="trash"
+                          size="m"
+                        />
+                      </button>
+                    </span>
                   </div>
                 </div>
               </div>
+            </div>
+            <div
+              className="euiFlexItem"
+            >
               <div
-                className="euiFlexItem"
+                className="euiPanel euiPanel--paddingSmall canvasAsset"
               >
                 <div
-                  className="euiPanel euiPanel--paddingSmall canvasAsset"
+                  className="canvasAsset__thumb canvasCheckered"
                 >
-                  <div
-                    className="canvasAsset__thumb canvasCheckered"
+                  <figure
+                    className="euiImage canvasAsset__img "
                   >
-                    <figure
-                      className="euiImage canvasAsset__img "
+                    <img
+                      alt="Asset thumbnail"
+                      className="euiImage__img"
+                      src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4="
+                      style={Object {}}
+                    />
+                  </figure>
+                </div>
+                <div
+                  className="euiSpacer euiSpacer--s"
+                />
+                <div
+                  className="euiText euiText--extraSmall eui-textBreakAll"
+                >
+                  <p
+                    className="eui-textBreakAll"
+                  >
+                    <strong>
+                      marker
+                    </strong>
+                    <br />
+                    <span
+                      className="euiTextColor euiTextColor--subdued"
                     >
-                      <img
-                        alt="Asset thumbnail"
-                        className="euiImage__img"
-                        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4="
-                        style={Object {}}
-                      />
-                    </figure>
-                  </div>
-                  <div
-                    className="euiSpacer euiSpacer--s"
-                  />
+                      <small>
+                        (
+                        1
+                         kb)
+                      </small>
+                    </span>
+                  </p>
+                </div>
+                <div
+                  className="euiSpacer euiSpacer--s"
+                />
+                <div
+                  className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow"
+                >
                   <div
-                    className="euiText euiText--extraSmall eui-textBreakAll"
+                    className="euiFlexItem euiFlexItem--flexGrowZero asset-create-image"
                   >
-                    <p
-                      className="eui-textBreakAll"
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
                     >
-                      <strong>
-                        marker
-                      </strong>
-                      <br />
-                      <span
-                        className="euiTextColor euiTextColor--subdued"
+                      <button
+                        aria-label="Create image element"
+                        className="euiButtonIcon euiButtonIcon--primary"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        type="button"
                       >
-                        <small>
-                          (
-                          1
-                           kb)
-                        </small>
-                      </span>
-                    </p>
+                        <div
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          data-euiicon-type="vector"
+                          size="m"
+                        />
+                      </button>
+                    </span>
                   </div>
                   <div
-                    className="euiSpacer euiSpacer--s"
-                  />
-                  <div
-                    className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow"
+                    className="euiFlexItem euiFlexItem--flexGrowZero asset-download"
                   >
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero asset-create-image"
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
                     >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
+                      <div
+                        className="canvasDownload"
+                        onClick={[Function]}
+                        onKeyPress={[Function]}
+                        role="button"
+                        tabIndex={0}
                       >
                         <button
-                          aria-label="Create image element"
+                          aria-label="Download"
                           className="euiButtonIcon euiButtonIcon--primary"
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
                           type="button"
                         >
                           <div
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
-                            data-euiicon-type="vector"
+                            data-euiicon-type="sortDown"
                             size="m"
                           />
                         </button>
-                      </span>
-                    </div>
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero asset-download"
-                    >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
-                      >
-                        <div
-                          className="canvasDownload"
-                          onClick={[Function]}
-                          onKeyPress={[Function]}
-                          role="button"
-                          tabIndex={0}
-                        >
-                          <button
-                            aria-label="Download"
-                            className="euiButtonIcon euiButtonIcon--primary"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              data-euiicon-type="sortDown"
-                              size="m"
-                            />
-                          </button>
-                        </div>
-                      </span>
-                    </div>
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero"
-                    >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
-                      >
-                        <div
-                          className="canvasClipboard"
-                          onClick={[Function]}
-                          onKeyPress={[Function]}
-                          role="button"
-                          tabIndex={0}
-                        >
-                          <button
-                            aria-label="Copy id to clipboard"
-                            className="euiButtonIcon euiButtonIcon--primary"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              data-euiicon-type="copyClipboard"
-                              size="m"
-                            />
-                          </button>
-                        </div>
-                      </span>
-                    </div>
-                    <div
-                      className="euiFlexItem euiFlexItem--flexGrowZero"
+                      </div>
+                    </span>
+                  </div>
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                  >
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
                     >
-                      <span
-                        className="euiToolTipAnchor"
-                        onKeyUp={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
+                      <div
+                        className="canvasClipboard"
+                        onClick={[Function]}
+                        onKeyPress={[Function]}
+                        role="button"
+                        tabIndex={0}
                       >
                         <button
-                          aria-label="Delete"
-                          className="euiButtonIcon euiButtonIcon--danger"
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
+                          aria-label="Copy id to clipboard"
+                          className="euiButtonIcon euiButtonIcon--primary"
                           type="button"
                         >
                           <div
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
-                            data-euiicon-type="trash"
+                            data-euiicon-type="copyClipboard"
                             size="m"
                           />
                         </button>
-                      </span>
-                    </div>
+                      </div>
+                    </span>
+                  </div>
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                  >
+                    <span
+                      className="euiToolTipAnchor"
+                      onKeyUp={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                    >
+                      <button
+                        aria-label="Delete"
+                        className="euiButtonIcon euiButtonIcon--danger"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        type="button"
+                      >
+                        <div
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          data-euiicon-type="trash"
+                          size="m"
+                        />
+                      </button>
+                    </span>
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalFooter canvasAssetManager__modalFooter"
+      >
         <div
-          className="euiModalFooter canvasAssetManager__modalFooter"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow canvasAssetManager__meterWrapper"
         >
           <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow canvasAssetManager__meterWrapper"
+            className="euiFlexItem"
+          >
+            <progress
+              aria-hidden={false}
+              aria-labelledby="CanvasAssetManagerLabel"
+              className="euiProgress euiProgress--native euiProgress--s euiProgress--secondary"
+              max={25000}
+              value={2}
+            />
+          </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero eui-textNoWrap"
           >
             <div
-              className="euiFlexItem"
+              className="euiText euiText--medium"
+              id="CanvasAssetManagerLabel"
             >
-              <progress
-                aria-hidden={false}
-                aria-labelledby="CanvasAssetManagerLabel"
-                className="euiProgress euiProgress--native euiProgress--s euiProgress--secondary"
-                max={25000}
-                value={2}
-              />
-            </div>
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero eui-textNoWrap"
-            >
-              <div
-                className="euiText euiText--medium"
-                id="CanvasAssetManagerLabel"
-              >
-                0% space used
-              </div>
+              0% space used
             </div>
           </div>
-          <button
-            className="euiButton euiButton--primary euiButton--small"
-            onClick={[Function]}
-            type="button"
+        </div>
+        <button
+          className="euiButton euiButton--primary euiButton--small"
+          onClick={[Function]}
+          type="button"
+        >
+          <span
+            className="euiButtonContent euiButton__content"
           >
             <span
-              className="euiButtonContent euiButton__content"
+              className="euiButton__text"
             >
-              <span
-                className="euiButton__text"
-              >
-                Close
-              </span>
+              Close
             </span>
-          </button>
-        </div>
+          </span>
+        </button>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
index 0467161c58c34..0903b4f14084f 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
@@ -1,1424 +1,1208 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots components/Elements/CustomElementModal with description 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasCustomElementModal"
+    description="best element ever"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "700px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasCustomElementModal"
-      description="best element ever"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "700px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiModal__flex"
+        className="euiModalHeader"
       >
         <div
-          className="euiModalHeader"
+          className="euiModalHeader__title"
         >
-          <div
-            className="euiModalHeader__title"
-          >
-            <h3>
-              Edit custom element
-            </h3>
-          </div>
+          <h3>
+            Edit custom element
+          </h3>
         </div>
+      </div>
+      <div
+        className="euiModalBody"
+      >
         <div
-          className="euiModalBody"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalBody__overflow"
+            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
           >
             <div
-              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+              className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
             >
               <div
-                className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
+                className="euiFormRow euiFormRow--compressed"
+                id="generated-id-row"
               >
                 <div
-                  className="euiFormRow euiFormRow--compressed"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Name
-                    </label>
-                  </div>
+                    Name
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormControlLayout"
                   >
                     <div
-                      className="euiFormControlLayout"
-                    >
-                      <div
-                        className="euiFormControlLayout__childrenWrapper"
-                      >
-                        <input
-                          aria-describedby="generated-id-help"
-                          className="euiFieldText canvasCustomElementForm__name"
-                          data-test-subj="canvasCustomElementForm-name"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onFocus={[Function]}
-                          required={true}
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
+                      className="euiFormControlLayout__childrenWrapper"
                     >
-                      40 characters remaining
+                      <input
+                        aria-describedby="generated-id-help"
+                        className="euiFieldText canvasCustomElementForm__name"
+                        data-test-subj="canvasCustomElementForm-name"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onFocus={[Function]}
+                        required={true}
+                        type="text"
+                        value=""
+                      />
                     </div>
                   </div>
+                  <div
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
+                  >
+                    40 characters remaining
+                  </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Description
-                    </label>
-                  </div>
+                    Description
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
+                  <textarea
+                    aria-describedby="generated-id-help"
+                    className="euiTextArea euiTextArea--resizeVertical"
+                    data-test-subj="canvasCustomElementForm-description"
+                    id="generated-id"
+                    onBlur={[Function]}
+                    onChange={[Function]}
+                    onFocus={[Function]}
+                    rows={2}
+                    value="best element ever"
+                  />
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
                   >
-                    <textarea
-                      aria-describedby="generated-id-help"
-                      className="euiTextArea euiTextArea--resizeVertical"
-                      data-test-subj="canvasCustomElementForm-description"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      rows={2}
-                      value="best element ever"
-                    />
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
-                    >
-                      83 characters remaining
-                    </div>
+                    83 characters remaining
                   </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Thumbnail image
-                    </label>
-                  </div>
+                    Thumbnail image
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFilePicker euiFilePicker--large canvasImageUpload"
                   >
                     <div
-                      className="euiFilePicker euiFilePicker--large canvasImageUpload"
+                      className="euiFilePicker__wrap"
                     >
+                      <input
+                        accept="image/*"
+                        aria-describedby="generated-id-filePicker__prompt"
+                        className="euiFilePicker__input"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onDragLeave={[Function]}
+                        onDragOver={[Function]}
+                        onDrop={[Function]}
+                        onFocus={[Function]}
+                        type="file"
+                      />
                       <div
-                        className="euiFilePicker__wrap"
+                        className="euiFilePicker__prompt"
+                        id="generated-id-filePicker__prompt"
                       >
-                        <input
-                          accept="image/*"
-                          aria-describedby="generated-id-filePicker__prompt"
-                          className="euiFilePicker__input"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onDragLeave={[Function]}
-                          onDragOver={[Function]}
-                          onDrop={[Function]}
-                          onFocus={[Function]}
-                          type="file"
+                        <div
+                          aria-hidden="true"
+                          className="euiFilePicker__icon"
+                          data-euiicon-type="importAction"
+                          size="l"
                         />
                         <div
-                          className="euiFilePicker__prompt"
-                          id="generated-id-filePicker__prompt"
+                          className="euiFilePicker__promptText"
                         >
-                          <div
-                            aria-hidden="true"
-                            className="euiFilePicker__icon"
-                            data-euiicon-type="importAction"
-                            size="l"
-                          />
-                          <div
-                            className="euiFilePicker__promptText"
-                          >
-                            Select or drag and drop an image
-                          </div>
+                          Select or drag and drop an image
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div
-                  className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
-                >
-                  <p>
-                    Take a screenshot of your element and upload it here. This can also be done after saving.
-                  </p>
-                </div>
               </div>
               <div
-                className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+                className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
+              >
+                <p>
+                  Take a screenshot of your element and upload it here. This can also be done after saving.
+                </p>
+              </div>
+            </div>
+            <div
+              className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+            >
+              <h4
+                className="euiTitle euiTitle--xxxsmall"
+              >
+                Element preview
+              </h4>
+              <div
+                className="euiSpacer euiSpacer--s"
+              />
+              <div
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasIcon canvasElementCard canvasElementCard--hasIcon"
+                onClick={[Function]}
               >
-                <h4
-                  className="euiTitle euiTitle--xxxsmall"
-                >
-                  Element preview
-                </h4>
-                <div
-                  className="euiSpacer euiSpacer--s"
-                />
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasIcon canvasElementCard canvasElementCard--hasIcon"
-                  onClick={[Function]}
+                  className="euiCard__top"
                 >
                   <div
-                    className="euiCard__top"
+                    className="euiCard__icon"
+                    data-euiicon-type="canvasApp"
+                    size="xxl"
+                  />
+                </div>
+                <div
+                  className="euiCard__content"
+                >
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
                   >
-                    <div
-                      className="euiCard__icon"
-                      data-euiicon-type="canvasApp"
-                      size="xxl"
-                    />
-                  </div>
+                    
+                  </span>
                   <div
-                    className="euiCard__content"
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
                   >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
-                    >
-                      
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        best element ever
-                      </p>
-                    </div>
+                    <p>
+                      best element ever
+                    </p>
                   </div>
-                  <div
-                    className="euiCard__footer"
-                  />
                 </div>
+                <div
+                  className="euiCard__footer"
+                />
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalFooter"
+      >
         <div
-          className="euiModalFooter"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
         >
           <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+            <button
+              className="euiButtonEmpty euiButtonEmpty--primary"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--primary"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButtonEmpty__content"
               >
                 <span
-                  className="euiButtonContent euiButtonEmpty__content"
+                  className="euiButtonEmpty__text"
                 >
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Cancel
-                  </span>
+                  Cancel
                 </span>
-              </button>
-            </div>
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+              </span>
+            </button>
+          </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
+          >
+            <button
+              className="euiButton euiButton--primary euiButton--fill"
+              data-test-subj="canvasCustomElementForm-submit"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButton euiButton--primary euiButton--fill"
-                data-test-subj="canvasCustomElementForm-submit"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButton__content"
               >
                 <span
-                  className="euiButtonContent euiButton__content"
+                  className="euiButton__text"
                 >
-                  <span
-                    className="euiButton__text"
-                  >
-                    Save
-                  </span>
+                  Save
                 </span>
-              </button>
-            </div>
+              </span>
+            </button>
           </div>
         </div>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
 
 exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasCustomElementModal"
+    image="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "700px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasCustomElementModal"
-      image="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "700px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiModal__flex"
+        className="euiModalHeader"
       >
         <div
-          className="euiModalHeader"
+          className="euiModalHeader__title"
         >
-          <div
-            className="euiModalHeader__title"
-          >
-            <h3>
-              Edit custom element
-            </h3>
-          </div>
+          <h3>
+            Edit custom element
+          </h3>
         </div>
+      </div>
+      <div
+        className="euiModalBody"
+      >
         <div
-          className="euiModalBody"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalBody__overflow"
+            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
           >
             <div
-              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+              className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
             >
               <div
-                className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
+                className="euiFormRow euiFormRow--compressed"
+                id="generated-id-row"
               >
                 <div
-                  className="euiFormRow euiFormRow--compressed"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Name
-                    </label>
-                  </div>
+                    Name
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormControlLayout"
                   >
                     <div
-                      className="euiFormControlLayout"
-                    >
-                      <div
-                        className="euiFormControlLayout__childrenWrapper"
-                      >
-                        <input
-                          aria-describedby="generated-id-help"
-                          className="euiFieldText canvasCustomElementForm__name"
-                          data-test-subj="canvasCustomElementForm-name"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onFocus={[Function]}
-                          required={true}
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
+                      className="euiFormControlLayout__childrenWrapper"
                     >
-                      40 characters remaining
+                      <input
+                        aria-describedby="generated-id-help"
+                        className="euiFieldText canvasCustomElementForm__name"
+                        data-test-subj="canvasCustomElementForm-name"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onFocus={[Function]}
+                        required={true}
+                        type="text"
+                        value=""
+                      />
                     </div>
                   </div>
+                  <div
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
+                  >
+                    40 characters remaining
+                  </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Description
-                    </label>
-                  </div>
+                    Description
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
+                  <textarea
+                    aria-describedby="generated-id-help"
+                    className="euiTextArea euiTextArea--resizeVertical"
+                    data-test-subj="canvasCustomElementForm-description"
+                    id="generated-id"
+                    onBlur={[Function]}
+                    onChange={[Function]}
+                    onFocus={[Function]}
+                    rows={2}
+                    value=""
+                  />
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
                   >
-                    <textarea
-                      aria-describedby="generated-id-help"
-                      className="euiTextArea euiTextArea--resizeVertical"
-                      data-test-subj="canvasCustomElementForm-description"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      rows={2}
-                      value=""
-                    />
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
-                    >
-                      100 characters remaining
-                    </div>
+                    100 characters remaining
                   </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Thumbnail image
-                    </label>
-                  </div>
+                    Thumbnail image
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFilePicker euiFilePicker--large canvasImageUpload"
                   >
                     <div
-                      className="euiFilePicker euiFilePicker--large canvasImageUpload"
+                      className="euiFilePicker__wrap"
                     >
+                      <input
+                        accept="image/*"
+                        aria-describedby="generated-id-filePicker__prompt"
+                        className="euiFilePicker__input"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onDragLeave={[Function]}
+                        onDragOver={[Function]}
+                        onDrop={[Function]}
+                        onFocus={[Function]}
+                        type="file"
+                      />
                       <div
-                        className="euiFilePicker__wrap"
+                        className="euiFilePicker__prompt"
+                        id="generated-id-filePicker__prompt"
                       >
-                        <input
-                          accept="image/*"
-                          aria-describedby="generated-id-filePicker__prompt"
-                          className="euiFilePicker__input"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onDragLeave={[Function]}
-                          onDragOver={[Function]}
-                          onDrop={[Function]}
-                          onFocus={[Function]}
-                          type="file"
+                        <div
+                          aria-hidden="true"
+                          className="euiFilePicker__icon"
+                          data-euiicon-type="importAction"
+                          size="l"
                         />
                         <div
-                          className="euiFilePicker__prompt"
-                          id="generated-id-filePicker__prompt"
+                          className="euiFilePicker__promptText"
                         >
-                          <div
-                            aria-hidden="true"
-                            className="euiFilePicker__icon"
-                            data-euiicon-type="importAction"
-                            size="l"
-                          />
-                          <div
-                            className="euiFilePicker__promptText"
-                          >
-                            Select or drag and drop an image
-                          </div>
+                          Select or drag and drop an image
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div
-                  className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
-                >
-                  <p>
-                    Take a screenshot of your element and upload it here. This can also be done after saving.
-                  </p>
-                </div>
               </div>
               <div
-                className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+                className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
+              >
+                <p>
+                  Take a screenshot of your element and upload it here. This can also be done after saving.
+                </p>
+              </div>
+            </div>
+            <div
+              className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+            >
+              <h4
+                className="euiTitle euiTitle--xxxsmall"
+              >
+                Element preview
+              </h4>
+              <div
+                className="euiSpacer euiSpacer--s"
+              />
+              <div
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned canvasElementCard"
+                onClick={[Function]}
               >
-                <h4
-                  className="euiTitle euiTitle--xxxsmall"
-                >
-                  Element preview
-                </h4>
-                <div
-                  className="euiSpacer euiSpacer--s"
-                />
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned canvasElementCard"
-                  onClick={[Function]}
+                  className="euiCard__top"
                 >
                   <div
-                    className="euiCard__top"
+                    className="euiCard__image"
                   >
-                    <div
-                      className="euiCard__image"
-                    >
-                      <img
-                        alt=""
-                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
-                      />
-                    </div>
+                    <img
+                      alt=""
+                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+                    />
                   </div>
+                </div>
+                <div
+                  className="euiCard__content"
+                >
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
+                  >
+                    
+                  </span>
                   <div
-                    className="euiCard__content"
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
                   >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
-                    >
+                    <p>
                       
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        
-                      </p>
-                    </div>
+                    </p>
                   </div>
-                  <div
-                    className="euiCard__footer"
-                  />
                 </div>
+                <div
+                  className="euiCard__footer"
+                />
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalFooter"
+      >
         <div
-          className="euiModalFooter"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
         >
           <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+            <button
+              className="euiButtonEmpty euiButtonEmpty--primary"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--primary"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButtonEmpty__content"
               >
                 <span
-                  className="euiButtonContent euiButtonEmpty__content"
+                  className="euiButtonEmpty__text"
                 >
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Cancel
-                  </span>
+                  Cancel
                 </span>
-              </button>
-            </div>
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+              </span>
+            </button>
+          </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
+          >
+            <button
+              className="euiButton euiButton--primary euiButton--fill"
+              data-test-subj="canvasCustomElementForm-submit"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButton euiButton--primary euiButton--fill"
-                data-test-subj="canvasCustomElementForm-submit"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButton__content"
               >
                 <span
-                  className="euiButtonContent euiButton__content"
+                  className="euiButton__text"
                 >
-                  <span
-                    className="euiButton__text"
-                  >
-                    Save
-                  </span>
+                  Save
                 </span>
-              </button>
-            </div>
+              </span>
+            </button>
           </div>
         </div>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
 
 exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasCustomElementModal"
+    description=""
+    name="My Chart"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "700px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasCustomElementModal"
-      description=""
-      name="My Chart"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "700px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiModal__flex"
+        className="euiModalHeader"
       >
         <div
-          className="euiModalHeader"
+          className="euiModalHeader__title"
         >
-          <div
-            className="euiModalHeader__title"
-          >
-            <h3>
-              Edit custom element
-            </h3>
-          </div>
+          <h3>
+            Edit custom element
+          </h3>
         </div>
+      </div>
+      <div
+        className="euiModalBody"
+      >
         <div
-          className="euiModalBody"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalBody__overflow"
+            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
           >
             <div
-              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+              className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
             >
               <div
-                className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
+                className="euiFormRow euiFormRow--compressed"
+                id="generated-id-row"
               >
                 <div
-                  className="euiFormRow euiFormRow--compressed"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Name
-                    </label>
-                  </div>
+                    Name
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormControlLayout"
                   >
                     <div
-                      className="euiFormControlLayout"
-                    >
-                      <div
-                        className="euiFormControlLayout__childrenWrapper"
-                      >
-                        <input
-                          aria-describedby="generated-id-help"
-                          className="euiFieldText canvasCustomElementForm__name"
-                          data-test-subj="canvasCustomElementForm-name"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onFocus={[Function]}
-                          required={true}
-                          type="text"
-                          value="My Chart"
-                        />
-                      </div>
-                    </div>
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
+                      className="euiFormControlLayout__childrenWrapper"
                     >
-                      32 characters remaining
+                      <input
+                        aria-describedby="generated-id-help"
+                        className="euiFieldText canvasCustomElementForm__name"
+                        data-test-subj="canvasCustomElementForm-name"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onFocus={[Function]}
+                        required={true}
+                        type="text"
+                        value="My Chart"
+                      />
                     </div>
                   </div>
+                  <div
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
+                  >
+                    32 characters remaining
+                  </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Description
-                    </label>
-                  </div>
+                    Description
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
+                  <textarea
+                    aria-describedby="generated-id-help"
+                    className="euiTextArea euiTextArea--resizeVertical"
+                    data-test-subj="canvasCustomElementForm-description"
+                    id="generated-id"
+                    onBlur={[Function]}
+                    onChange={[Function]}
+                    onFocus={[Function]}
+                    rows={2}
+                    value=""
+                  />
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
                   >
-                    <textarea
-                      aria-describedby="generated-id-help"
-                      className="euiTextArea euiTextArea--resizeVertical"
-                      data-test-subj="canvasCustomElementForm-description"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      rows={2}
-                      value=""
-                    />
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
-                    >
-                      100 characters remaining
-                    </div>
+                    100 characters remaining
                   </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Thumbnail image
-                    </label>
-                  </div>
+                    Thumbnail image
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFilePicker euiFilePicker--large canvasImageUpload"
                   >
                     <div
-                      className="euiFilePicker euiFilePicker--large canvasImageUpload"
+                      className="euiFilePicker__wrap"
                     >
+                      <input
+                        accept="image/*"
+                        aria-describedby="generated-id-filePicker__prompt"
+                        className="euiFilePicker__input"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onDragLeave={[Function]}
+                        onDragOver={[Function]}
+                        onDrop={[Function]}
+                        onFocus={[Function]}
+                        type="file"
+                      />
                       <div
-                        className="euiFilePicker__wrap"
+                        className="euiFilePicker__prompt"
+                        id="generated-id-filePicker__prompt"
                       >
-                        <input
-                          accept="image/*"
-                          aria-describedby="generated-id-filePicker__prompt"
-                          className="euiFilePicker__input"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onDragLeave={[Function]}
-                          onDragOver={[Function]}
-                          onDrop={[Function]}
-                          onFocus={[Function]}
-                          type="file"
+                        <div
+                          aria-hidden="true"
+                          className="euiFilePicker__icon"
+                          data-euiicon-type="importAction"
+                          size="l"
                         />
                         <div
-                          className="euiFilePicker__prompt"
-                          id="generated-id-filePicker__prompt"
+                          className="euiFilePicker__promptText"
                         >
-                          <div
-                            aria-hidden="true"
-                            className="euiFilePicker__icon"
-                            data-euiicon-type="importAction"
-                            size="l"
-                          />
-                          <div
-                            className="euiFilePicker__promptText"
-                          >
-                            Select or drag and drop an image
-                          </div>
+                          Select or drag and drop an image
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div
-                  className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
-                >
-                  <p>
-                    Take a screenshot of your element and upload it here. This can also be done after saving.
-                  </p>
-                </div>
               </div>
               <div
-                className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+                className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
+              >
+                <p>
+                  Take a screenshot of your element and upload it here. This can also be done after saving.
+                </p>
+              </div>
+            </div>
+            <div
+              className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+            >
+              <h4
+                className="euiTitle euiTitle--xxxsmall"
+              >
+                Element preview
+              </h4>
+              <div
+                className="euiSpacer euiSpacer--s"
+              />
+              <div
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasIcon canvasElementCard canvasElementCard--hasIcon"
+                onClick={[Function]}
               >
-                <h4
-                  className="euiTitle euiTitle--xxxsmall"
-                >
-                  Element preview
-                </h4>
-                <div
-                  className="euiSpacer euiSpacer--s"
-                />
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasIcon canvasElementCard canvasElementCard--hasIcon"
-                  onClick={[Function]}
+                  className="euiCard__top"
                 >
                   <div
-                    className="euiCard__top"
+                    className="euiCard__icon"
+                    data-euiicon-type="canvasApp"
+                    size="xxl"
+                  />
+                </div>
+                <div
+                  className="euiCard__content"
+                >
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
                   >
-                    <div
-                      className="euiCard__icon"
-                      data-euiicon-type="canvasApp"
-                      size="xxl"
-                    />
-                  </div>
+                    My Chart
+                  </span>
                   <div
-                    className="euiCard__content"
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
                   >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
-                    >
-                      My Chart
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        
-                      </p>
-                    </div>
+                    <p>
+                      
+                    </p>
                   </div>
-                  <div
-                    className="euiCard__footer"
-                  />
                 </div>
+                <div
+                  className="euiCard__footer"
+                />
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalFooter"
+      >
         <div
-          className="euiModalFooter"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
         >
           <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+            <button
+              className="euiButtonEmpty euiButtonEmpty--primary"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--primary"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButtonEmpty__content"
               >
                 <span
-                  className="euiButtonContent euiButtonEmpty__content"
+                  className="euiButtonEmpty__text"
                 >
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Cancel
-                  </span>
+                  Cancel
                 </span>
-              </button>
-            </div>
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+              </span>
+            </button>
+          </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
+          >
+            <button
+              className="euiButton euiButton--primary euiButton--fill"
+              data-test-subj="canvasCustomElementForm-submit"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButton euiButton--primary euiButton--fill"
-                data-test-subj="canvasCustomElementForm-submit"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButton__content"
               >
                 <span
-                  className="euiButtonContent euiButton__content"
+                  className="euiButton__text"
                 >
-                  <span
-                    className="euiButton__text"
-                  >
-                    Save
-                  </span>
+                  Save
                 </span>
-              </button>
-            </div>
+              </span>
+            </button>
           </div>
         </div>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
 
 exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasCustomElementModal"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "700px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasCustomElementModal"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "700px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiModal__flex"
+        className="euiModalHeader"
       >
         <div
-          className="euiModalHeader"
+          className="euiModalHeader__title"
         >
-          <div
-            className="euiModalHeader__title"
-          >
-            <h3>
-              Create new element
-            </h3>
-          </div>
+          <h3>
+            Create new element
+          </h3>
         </div>
+      </div>
+      <div
+        className="euiModalBody"
+      >
         <div
-          className="euiModalBody"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalBody__overflow"
+            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
           >
             <div
-              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+              className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
             >
               <div
-                className="euiFlexItem euiFlexItem--flexGrow2 canvasCustomElementForm"
+                className="euiFormRow euiFormRow--compressed"
+                id="generated-id-row"
               >
                 <div
-                  className="euiFormRow euiFormRow--compressed"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Name
-                    </label>
-                  </div>
+                    Name
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormControlLayout"
                   >
                     <div
-                      className="euiFormControlLayout"
-                    >
-                      <div
-                        className="euiFormControlLayout__childrenWrapper"
-                      >
-                        <input
-                          aria-describedby="generated-id-help"
-                          className="euiFieldText canvasCustomElementForm__name"
-                          data-test-subj="canvasCustomElementForm-name"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onFocus={[Function]}
-                          required={true}
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
+                      className="euiFormControlLayout__childrenWrapper"
                     >
-                      40 characters remaining
+                      <input
+                        aria-describedby="generated-id-help"
+                        className="euiFieldText canvasCustomElementForm__name"
+                        data-test-subj="canvasCustomElementForm-name"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onFocus={[Function]}
+                        required={true}
+                        type="text"
+                        value=""
+                      />
                     </div>
                   </div>
+                  <div
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
+                  >
+                    40 characters remaining
+                  </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Description
-                    </label>
-                  </div>
+                    Description
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
+                  <textarea
+                    aria-describedby="generated-id-help"
+                    className="euiTextArea euiTextArea--resizeVertical"
+                    data-test-subj="canvasCustomElementForm-description"
+                    id="generated-id"
+                    onBlur={[Function]}
+                    onChange={[Function]}
+                    onFocus={[Function]}
+                    rows={2}
+                    value=""
+                  />
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFormHelpText euiFormRow__text"
+                    id="generated-id-help"
                   >
-                    <textarea
-                      aria-describedby="generated-id-help"
-                      className="euiTextArea euiTextArea--resizeVertical"
-                      data-test-subj="canvasCustomElementForm-description"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      rows={2}
-                      value=""
-                    />
-                    <div
-                      className="euiFormHelpText euiFormRow__text"
-                      id="generated-id-help"
-                    >
-                      100 characters remaining
-                    </div>
+                    100 characters remaining
                   </div>
                 </div>
+              </div>
+              <div
+                className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
+                id="generated-id-row"
+              >
                 <div
-                  className="euiFormRow euiFormRow--compressed canvasCustomElementForm__thumbnail"
-                  id="generated-id-row"
+                  className="euiFormRow__labelWrapper"
                 >
-                  <div
-                    className="euiFormRow__labelWrapper"
+                  <label
+                    className="euiFormLabel euiFormRow__label"
+                    htmlFor="generated-id"
                   >
-                    <label
-                      className="euiFormLabel euiFormRow__label"
-                      htmlFor="generated-id"
-                    >
-                      Thumbnail image
-                    </label>
-                  </div>
+                    Thumbnail image
+                  </label>
+                </div>
+                <div
+                  className="euiFormRow__fieldWrapper"
+                >
                   <div
-                    className="euiFormRow__fieldWrapper"
+                    className="euiFilePicker euiFilePicker--large canvasImageUpload"
                   >
                     <div
-                      className="euiFilePicker euiFilePicker--large canvasImageUpload"
+                      className="euiFilePicker__wrap"
                     >
+                      <input
+                        accept="image/*"
+                        aria-describedby="generated-id-filePicker__prompt"
+                        className="euiFilePicker__input"
+                        id="generated-id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onDragLeave={[Function]}
+                        onDragOver={[Function]}
+                        onDrop={[Function]}
+                        onFocus={[Function]}
+                        type="file"
+                      />
                       <div
-                        className="euiFilePicker__wrap"
+                        className="euiFilePicker__prompt"
+                        id="generated-id-filePicker__prompt"
                       >
-                        <input
-                          accept="image/*"
-                          aria-describedby="generated-id-filePicker__prompt"
-                          className="euiFilePicker__input"
-                          id="generated-id"
-                          onBlur={[Function]}
-                          onChange={[Function]}
-                          onDragLeave={[Function]}
-                          onDragOver={[Function]}
-                          onDrop={[Function]}
-                          onFocus={[Function]}
-                          type="file"
+                        <div
+                          aria-hidden="true"
+                          className="euiFilePicker__icon"
+                          data-euiicon-type="importAction"
+                          size="l"
                         />
                         <div
-                          className="euiFilePicker__prompt"
-                          id="generated-id-filePicker__prompt"
+                          className="euiFilePicker__promptText"
                         >
-                          <div
-                            aria-hidden="true"
-                            className="euiFilePicker__icon"
-                            data-euiicon-type="importAction"
-                            size="l"
-                          />
-                          <div
-                            className="euiFilePicker__promptText"
-                          >
-                            Select or drag and drop an image
-                          </div>
+                          Select or drag and drop an image
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div
-                  className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
-                >
-                  <p>
-                    Take a screenshot of your element and upload it here. This can also be done after saving.
-                  </p>
-                </div>
               </div>
               <div
-                className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+                className="euiText euiText--extraSmall canvasCustomElementForm__thumbnailHelp"
+              >
+                <p>
+                  Take a screenshot of your element and upload it here. This can also be done after saving.
+                </p>
+              </div>
+            </div>
+            <div
+              className="euiFlexItem euiFlexItem--flexGrow1 canvasElementCard__wrapper canvasCustomElementForm__preview"
+            >
+              <h4
+                className="euiTitle euiTitle--xxxsmall"
+              >
+                Element preview
+              </h4>
+              <div
+                className="euiSpacer euiSpacer--s"
+              />
+              <div
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasIcon canvasElementCard canvasElementCard--hasIcon"
+                onClick={[Function]}
               >
-                <h4
-                  className="euiTitle euiTitle--xxxsmall"
-                >
-                  Element preview
-                </h4>
-                <div
-                  className="euiSpacer euiSpacer--s"
-                />
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasIcon canvasElementCard canvasElementCard--hasIcon"
-                  onClick={[Function]}
+                  className="euiCard__top"
                 >
                   <div
-                    className="euiCard__top"
+                    className="euiCard__icon"
+                    data-euiicon-type="canvasApp"
+                    size="xxl"
+                  />
+                </div>
+                <div
+                  className="euiCard__content"
+                >
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
                   >
-                    <div
-                      className="euiCard__icon"
-                      data-euiicon-type="canvasApp"
-                      size="xxl"
-                    />
-                  </div>
+                    
+                  </span>
                   <div
-                    className="euiCard__content"
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
                   >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
-                    >
+                    <p>
                       
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        
-                      </p>
-                    </div>
+                    </p>
                   </div>
-                  <div
-                    className="euiCard__footer"
-                  />
                 </div>
+                <div
+                  className="euiCard__footer"
+                />
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="euiModalFooter"
+      >
         <div
-          className="euiModalFooter"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
         >
           <div
-            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+            <button
+              className="euiButtonEmpty euiButtonEmpty--primary"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--primary"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButtonEmpty__content"
               >
                 <span
-                  className="euiButtonContent euiButtonEmpty__content"
+                  className="euiButtonEmpty__text"
                 >
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Cancel
-                  </span>
+                  Cancel
                 </span>
-              </button>
-            </div>
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero"
+              </span>
+            </button>
+          </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
+          >
+            <button
+              className="euiButton euiButton--primary euiButton--fill"
+              data-test-subj="canvasCustomElementForm-submit"
+              onClick={[Function]}
+              type="button"
             >
-              <button
-                className="euiButton euiButton--primary euiButton--fill"
-                data-test-subj="canvasCustomElementForm-submit"
-                onClick={[Function]}
-                type="button"
+              <span
+                className="euiButtonContent euiButton__content"
               >
                 <span
-                  className="euiButtonContent euiButton__content"
+                  className="euiButton__text"
                 >
-                  <span
-                    className="euiButton__text"
-                  >
-                    Save
-                  </span>
+                  Save
                 </span>
-              </button>
-            </div>
+              </span>
+            </button>
           </div>
         </div>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
diff --git a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
index a40265f0353e7..b435bbbb73495 100644
--- a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
@@ -2,1163 +2,1104 @@
 
 exports[`Storyshots components/KeyboardShortcutsDoc default 1`] = `
 <div
-  onMouseDown={[Function]}
-  onMouseUp={[Function]}
-  onTouchEnd={[Function]}
-  onTouchStart={[Function]}
+  data-eui="EuiFocusTrap"
 >
   <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
+    className="euiFlyout euiFlyout--small"
+    role="dialog"
     tabIndex={0}
-  />
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
-    <div
-      className="euiFlyout euiFlyout--small"
-      role="dialog"
-      tabIndex={0}
+    <button
+      aria-label="Closes keyboard shortcuts reference"
+      className="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
+      data-test-subj="euiFlyoutCloseButton"
+      onClick={[Function]}
+      type="button"
     >
-      <button
-        aria-label="Closes keyboard shortcuts reference"
-        className="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-        data-test-subj="euiFlyoutCloseButton"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
+    <div
+      className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
+    >
+      <h2
+        className="euiTitle euiTitle--small"
       >
-        <h2
-          className="euiTitle euiTitle--small"
-        >
-          Keyboard shortcuts
-        </h2>
-      </div>
+        Keyboard shortcuts
+      </h2>
+    </div>
+    <div
+      className="euiFlyoutBody"
+    >
       <div
-        className="euiFlyoutBody"
+        className="euiFlyoutBody__overflow"
       >
         <div
-          className="euiFlyoutBody__overflow"
+          className="euiFlyoutBody__overflowContent"
         >
           <div
-            className="euiFlyoutBody__overflowContent"
+            className="canvasKeyboardShortcut"
           >
-            <div
-              className="canvasKeyboardShortcut"
+            <h4
+              className="euiTitle euiTitle--xsmall"
+            >
+              Element controls
+            </h4>
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+            />
+            <dl
+              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
             >
-              <h4
-                className="euiTitle euiTitle--xsmall"
-              >
-                Element controls
-              </h4>
-              <hr
-                className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-              />
-              <dl
-                className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-              >
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Cut
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        X
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Copy
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        C
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Paste
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        V
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Clone
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        D
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Delete
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        DEL
-                      </code>
-                    </span>
-                  </span>
-                  <span>
-                     
-                    or
-                     
-                  </span>
-                  <span>
-                    <span>
-                      <code>
-                        BACKSPACE
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Bring to front
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ↑
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Bring forward
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ↑
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Send backward
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ↓
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Send to back
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ↓
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Group
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        G
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Ungroup
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        U
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift up by 10px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ↑
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift down by 10px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ↓
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift left by 10px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ←
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift right by 10px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        →
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift up by 1px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ↑
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift down by 1px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ↓
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift left by 1px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ←
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Shift right by 1px
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        →
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-              </dl>
-              <div
-                className="euiSpacer euiSpacer--l"
-              />
-            </div>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Cut
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      X
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Copy
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      C
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Paste
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      V
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Clone
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      D
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Delete
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      DEL
+                    </code>
+                  </span>
+                </span>
+                <span>
+                   
+                  or
+                   
+                </span>
+                <span>
+                  <span>
+                    <code>
+                      BACKSPACE
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Bring to front
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ↑
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Bring forward
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ↑
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Send backward
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ↓
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Send to back
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ↓
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Group
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      G
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Ungroup
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      U
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift up by 10px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ↑
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift down by 10px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ↓
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift left by 10px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ←
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift right by 10px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      →
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift up by 1px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ↑
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift down by 1px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ↓
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift left by 1px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ←
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Shift right by 1px
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      →
+                    </code>
+                  </span>
+                </span>
+              </dd>
+            </dl>
             <div
-              className="canvasKeyboardShortcut"
+              className="euiSpacer euiSpacer--l"
+            />
+          </div>
+          <div
+            className="canvasKeyboardShortcut"
+          >
+            <h4
+              className="euiTitle euiTitle--xsmall"
+            >
+              Expression controls
+            </h4>
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+            />
+            <dl
+              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
             >
-              <h4
-                className="euiTitle euiTitle--xsmall"
-              >
-                Expression controls
-              </h4>
-              <hr
-                className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-              />
-              <dl
-                className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-              >
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Run whole expression
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ENTER
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-              </dl>
-              <div
-                className="euiSpacer euiSpacer--l"
-              />
-            </div>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Run whole expression
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ENTER
+                    </code>
+                  </span>
+                </span>
+              </dd>
+            </dl>
             <div
-              className="canvasKeyboardShortcut"
+              className="euiSpacer euiSpacer--l"
+            />
+          </div>
+          <div
+            className="canvasKeyboardShortcut"
+          >
+            <h4
+              className="euiTitle euiTitle--xsmall"
             >
-              <h4
-                className="euiTitle euiTitle--xsmall"
-              >
-                Editor controls
-              </h4>
-              <hr
-                className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-              />
-              <dl
-                className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-              >
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Select multiple elements
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        CLICK
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Resize from center
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        DRAG
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Move, resize, and rotate without snapping
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        DRAG
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Select element below
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        CLICK
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Undo last action
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        Z
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Redo last action
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        SHIFT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        Z
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Go to previous page
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        [
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Go to next page
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ]
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Toggle edit mode
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        E
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Show grid
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        G
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Refresh workpad
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        R
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Zoom in
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        +
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Zoom out
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        -
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Reset zoom to 100%
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        CTRL
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        [
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Enter presentation mode
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        F
-                      </code>
-                    </span>
-                  </span>
-                  <span>
-                     
-                    or
-                     
-                  </span>
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        P
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-              </dl>
-              <div
-                className="euiSpacer euiSpacer--l"
-              />
-            </div>
+              Editor controls
+            </h4>
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+            />
+            <dl
+              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
+            >
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Select multiple elements
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      CLICK
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Resize from center
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      DRAG
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Move, resize, and rotate without snapping
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      DRAG
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Select element below
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      CLICK
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Undo last action
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      Z
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Redo last action
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      SHIFT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      Z
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Go to previous page
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      [
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Go to next page
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ]
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Toggle edit mode
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      E
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Show grid
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      G
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Refresh workpad
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      R
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Zoom in
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      +
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Zoom out
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      -
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Reset zoom to 100%
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      CTRL
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      [
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Enter presentation mode
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      F
+                    </code>
+                  </span>
+                </span>
+                <span>
+                   
+                  or
+                   
+                </span>
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      P
+                    </code>
+                  </span>
+                </span>
+              </dd>
+            </dl>
             <div
-              className="canvasKeyboardShortcut"
+              className="euiSpacer euiSpacer--l"
+            />
+          </div>
+          <div
+            className="canvasKeyboardShortcut"
+          >
+            <h4
+              className="euiTitle euiTitle--xsmall"
             >
-              <h4
-                className="euiTitle euiTitle--xsmall"
-              >
-                Presentation controls
-              </h4>
-              <hr
-                className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-              />
-              <dl
-                className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
-              >
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Enter presentation mode
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        F
-                      </code>
-                    </span>
-                  </span>
-                  <span>
-                     
-                    or
-                     
-                  </span>
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        P
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Exit presentation mode
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ESC
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Go to previous page
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        [
-                      </code>
-                    </span>
-                  </span>
-                  <span>
-                     
-                    or
-                     
-                  </span>
-                  <span>
-                    <span>
-                      <code>
-                        BACKSPACE
-                      </code>
-                    </span>
-                  </span>
-                  <span>
-                     
-                    or
-                     
-                  </span>
-                  <span>
-                    <span>
-                      <code>
-                        ←
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Go to next page
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        ]
-                      </code>
-                    </span>
-                  </span>
-                  <span>
-                     
-                    or
-                     
-                  </span>
-                  <span>
-                    <span>
-                      <code>
-                        SPACE
-                      </code>
-                    </span>
-                  </span>
-                  <span>
-                     
-                    or
-                     
-                  </span>
-                  <span>
-                    <span>
-                      <code>
-                        →
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Refresh workpad
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        ALT
-                      </code>
-                    </span>
-                     
-                    <span>
-                      <code>
-                        R
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-                <dt
-                  className="euiDescriptionList__title"
-                >
-                  Toggle page cycling
-                </dt>
-                <dd
-                  className="euiDescriptionList__description"
-                >
-                  <span>
-                    <span>
-                      <code>
-                        P
-                      </code>
-                    </span>
-                  </span>
-                </dd>
-              </dl>
-              <div
-                className="euiSpacer euiSpacer--l"
-              />
-            </div>
+              Presentation controls
+            </h4>
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+            />
+            <dl
+              className="euiDescriptionList euiDescriptionList--column euiDescriptionList--reverse euiDescriptionList--compressed"
+            >
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Enter presentation mode
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      F
+                    </code>
+                  </span>
+                </span>
+                <span>
+                   
+                  or
+                   
+                </span>
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      P
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Exit presentation mode
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ESC
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Go to previous page
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      [
+                    </code>
+                  </span>
+                </span>
+                <span>
+                   
+                  or
+                   
+                </span>
+                <span>
+                  <span>
+                    <code>
+                      BACKSPACE
+                    </code>
+                  </span>
+                </span>
+                <span>
+                   
+                  or
+                   
+                </span>
+                <span>
+                  <span>
+                    <code>
+                      ←
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Go to next page
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      ]
+                    </code>
+                  </span>
+                </span>
+                <span>
+                   
+                  or
+                   
+                </span>
+                <span>
+                  <span>
+                    <code>
+                      SPACE
+                    </code>
+                  </span>
+                </span>
+                <span>
+                   
+                  or
+                   
+                </span>
+                <span>
+                  <span>
+                    <code>
+                      →
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Refresh workpad
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      ALT
+                    </code>
+                  </span>
+                   
+                  <span>
+                    <code>
+                      R
+                    </code>
+                  </span>
+                </span>
+              </dd>
+              <dt
+                className="euiDescriptionList__title"
+              >
+                Toggle page cycling
+              </dt>
+              <dd
+                className="euiDescriptionList__description"
+              >
+                <span>
+                  <span>
+                    <code>
+                      P
+                    </code>
+                  </span>
+                </span>
+              </dd>
+            </dl>
+            <div
+              className="euiSpacer euiSpacer--l"
+            />
           </div>
         </div>
       </div>
     </div>
   </div>
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />
 </div>
 `;
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
index fcc22cbe78134..0b345849b0a9a 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
@@ -1,968 +1,806 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasModal--fixedSize"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "1000px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasModal--fixedSize"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "1000px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
-      >
-        <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
       <div
-        className="euiModal__flex"
+        className="euiModalHeader canvasAssetManager__modalHeader"
       >
         <div
-          className="euiModalHeader canvasAssetManager__modalHeader"
+          className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
         >
-          <div
-            className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
-          >
-            My elements
-          </div>
+          My elements
         </div>
-        <div
-          className="euiModalBody"
-          style={
-            Object {
-              "paddingRight": "1px",
-            }
+      </div>
+      <div
+        className="euiModalBody"
+        style={
+          Object {
+            "paddingRight": "1px",
           }
+        }
+      >
+        <div
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalBody__overflow"
+            className="euiFormControlLayout euiFormControlLayout--fullWidth"
           >
             <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth"
+              className="euiFormControlLayout__childrenWrapper"
             >
+              <input
+                className="euiFieldSearch euiFieldSearch--fullWidth"
+                onChange={[Function]}
+                onKeyUp={[Function]}
+                placeholder="Find element"
+                type="search"
+                value=""
+              />
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayoutIcons"
               >
-                <input
-                  className="euiFieldSearch euiFieldSearch--fullWidth"
-                  onChange={[Function]}
-                  onKeyUp={[Function]}
-                  placeholder="Find element"
-                  type="search"
-                  value=""
-                />
-                <div
-                  className="euiFormControlLayoutIcons"
+                <span
+                  className="euiFormControlLayoutCustomIcon"
                 >
-                  <span
-                    className="euiFormControlLayoutCustomIcon"
-                  >
-                    <div
-                      aria-hidden="true"
-                      className="euiFormControlLayoutCustomIcon__icon"
-                      data-euiicon-type="search"
-                    />
-                  </span>
-                </div>
+                  <div
+                    aria-hidden="true"
+                    className="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="search"
+                  />
+                </span>
               </div>
             </div>
+          </div>
+          <div
+            className="euiSpacer euiSpacer--l"
+          />
+          <div
+            className="euiEmptyPrompt"
+          >
             <div
-              className="euiSpacer euiSpacer--l"
+              color="subdued"
+              data-euiicon-type="vector"
+              size="xxl"
             />
             <div
-              className="euiEmptyPrompt"
+              className="euiSpacer euiSpacer--s"
+            />
+            <span
+              className="euiTextColor euiTextColor--subdued"
             >
+              <h2
+                className="euiTitle euiTitle--small"
+              >
+                Add new elements
+              </h2>
               <div
-                color="subdued"
-                data-euiicon-type="vector"
-                size="xxl"
+                className="euiSpacer euiSpacer--m"
               />
               <div
-                className="euiSpacer euiSpacer--s"
-              />
-              <span
-                className="euiTextColor euiTextColor--subdued"
+                className="euiText euiText--medium"
               >
-                <h2
-                  className="euiTitle euiTitle--small"
-                >
-                  Add new elements
-                </h2>
-                <div
-                  className="euiSpacer euiSpacer--m"
-                />
-                <div
-                  className="euiText euiText--medium"
-                >
-                  <p>
-                    Group and save workpad elements to create new elements
-                  </p>
-                </div>
-              </span>
-            </div>
+                <p>
+                  Group and save workpad elements to create new elements
+                </p>
+              </div>
+            </span>
           </div>
         </div>
-        <div
-          className="euiModalFooter"
+      </div>
+      <div
+        className="euiModalFooter"
+      >
+        <button
+          className="euiButton euiButton--primary euiButton--small"
+          data-test-subj="saved-elements-modal-close-button"
+          onClick={[Function]}
+          type="button"
         >
-          <button
-            className="euiButton euiButton--primary euiButton--small"
-            data-test-subj="saved-elements-modal-close-button"
-            onClick={[Function]}
-            type="button"
+          <span
+            className="euiButtonContent euiButton__content"
           >
             <span
-              className="euiButtonContent euiButton__content"
+              className="euiButton__text"
             >
-              <span
-                className="euiButton__text"
-              >
-                Close
-              </span>
+              Close
             </span>
-          </button>
-        </div>
+          </span>
+        </button>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
 
 exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasModal--fixedSize"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "1000px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasModal--fixedSize"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "1000px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
+      <div
+        className="euiModalHeader canvasAssetManager__modalHeader"
       >
         <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
+          className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
+        >
+          My elements
+        </div>
+      </div>
       <div
-        className="euiModal__flex"
+        className="euiModalBody"
+        style={
+          Object {
+            "paddingRight": "1px",
+          }
+        }
       >
         <div
-          className="euiModalHeader canvasAssetManager__modalHeader"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
+            className="euiFormControlLayout euiFormControlLayout--fullWidth"
           >
-            My elements
+            <div
+              className="euiFormControlLayout__childrenWrapper"
+            >
+              <input
+                className="euiFieldSearch euiFieldSearch--fullWidth"
+                onChange={[Function]}
+                onKeyUp={[Function]}
+                placeholder="Find element"
+                type="search"
+                value=""
+              />
+              <div
+                className="euiFormControlLayoutIcons"
+              >
+                <span
+                  className="euiFormControlLayoutCustomIcon"
+                >
+                  <div
+                    aria-hidden="true"
+                    className="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="search"
+                  />
+                </span>
+              </div>
+            </div>
           </div>
-        </div>
-        <div
-          className="euiModalBody"
-          style={
-            Object {
-              "paddingRight": "1px",
-            }
-          }
-        >
           <div
-            className="euiModalBody__overflow"
+            className="euiSpacer euiSpacer--l"
+          />
+          <div
+            className="euiFlexGrid euiFlexGrid--gutterLarge euiFlexGrid--fourths euiFlexGrid--responsive"
           >
             <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth"
+              className="euiFlexItem canvasElementCard__wrapper"
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
+                onClick={[Function]}
               >
-                <input
-                  className="euiFieldSearch euiFieldSearch--fullWidth"
-                  onChange={[Function]}
-                  onKeyUp={[Function]}
-                  placeholder="Find element"
-                  type="search"
-                  value=""
+                <div
+                  className="euiCard__top"
+                >
+                  <div
+                    className="euiCard__image"
+                  >
+                    <img
+                      alt=""
+                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+                    />
+                  </div>
+                </div>
+                <div
+                  className="euiCard__content"
+                >
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
+                  >
+                    <button
+                      aria-describedby=" generated-idDescription"
+                      className="euiCard__titleButton"
+                      onClick={[Function]}
+                    >
+                      Custom Element 1
+                    </button>
+                  </span>
+                  <div
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
+                  >
+                    <p>
+                      sample description
+                    </p>
+                  </div>
+                </div>
+                <div
+                  className="euiCard__footer"
                 />
+              </div>
+              <div
+                className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
+              >
                 <div
-                  className="euiFormControlLayoutIcons"
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
                   <span
-                    className="euiFormControlLayoutCustomIcon"
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
                   >
-                    <div
-                      aria-hidden="true"
-                      className="euiFormControlLayoutCustomIcon__icon"
-                      data-euiicon-type="search"
-                    />
+                    <button
+                      aria-label="Edit element"
+                      className="euiButtonIcon euiButtonIcon--primary"
+                      data-test-subj="canvasElementCard__editButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
+                    >
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="pencil"
+                        size="m"
+                      />
+                    </button>
+                  </span>
+                </div>
+                <div
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <span
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                  >
+                    <button
+                      aria-label="Delete element"
+                      className="euiButtonIcon euiButtonIcon--danger"
+                      data-test-subj="canvasElementCard__deleteButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
+                    >
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="trash"
+                        size="m"
+                      />
+                    </button>
                   </span>
                 </div>
               </div>
             </div>
             <div
-              className="euiSpacer euiSpacer--l"
-            />
-            <div
-              className="euiFlexGrid euiFlexGrid--gutterLarge euiFlexGrid--fourths euiFlexGrid--responsive"
+              className="euiFlexItem canvasElementCard__wrapper"
             >
               <div
-                className="euiFlexItem canvasElementCard__wrapper"
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
+                onClick={[Function]}
               >
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
-                  onClick={[Function]}
+                  className="euiCard__top"
                 >
                   <div
-                    className="euiCard__top"
+                    className="euiCard__image"
                   >
-                    <div
-                      className="euiCard__image"
-                    >
-                      <img
-                        alt=""
-                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
-                      />
-                    </div>
-                  </div>
-                  <div
-                    className="euiCard__content"
-                  >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
-                    >
-                      <button
-                        aria-describedby=" generated-idDescription"
-                        className="euiCard__titleButton"
-                        onClick={[Function]}
-                      >
-                        Custom Element 1
-                      </button>
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        sample description
-                      </p>
-                    </div>
+                    <img
+                      alt=""
+                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+                    />
                   </div>
-                  <div
-                    className="euiCard__footer"
-                  />
                 </div>
                 <div
-                  className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
+                  className="euiCard__content"
                 >
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
                   >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
+                    <button
+                      aria-describedby=" generated-idDescription"
+                      className="euiCard__titleButton"
+                      onClick={[Function]}
                     >
-                      <button
-                        aria-label="Edit element"
-                        className="euiButtonIcon euiButtonIcon--primary"
-                        data-test-subj="canvasElementCard__editButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="pencil"
-                          size="m"
-                        />
-                      </button>
-                    </span>
-                  </div>
+                      Custom Element 2
+                    </button>
+                  </span>
                   <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
                   >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                    >
-                      <button
-                        aria-label="Delete element"
-                        className="euiButtonIcon euiButtonIcon--danger"
-                        data-test-subj="canvasElementCard__deleteButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="trash"
-                          size="m"
-                        />
-                      </button>
-                    </span>
+                    <p>
+                      Aenean eu justo auctor, placerat felis non, scelerisque dolor. 
+                    </p>
                   </div>
                 </div>
+                <div
+                  className="euiCard__footer"
+                />
               </div>
               <div
-                className="euiFlexItem canvasElementCard__wrapper"
+                className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
               >
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
-                  onClick={[Function]}
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
-                  <div
-                    className="euiCard__top"
+                  <span
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
                   >
-                    <div
-                      className="euiCard__image"
+                    <button
+                      aria-label="Edit element"
+                      className="euiButtonIcon euiButtonIcon--primary"
+                      data-test-subj="canvasElementCard__editButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
                     >
-                      <img
-                        alt=""
-                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="pencil"
+                        size="m"
                       />
-                    </div>
-                  </div>
-                  <div
-                    className="euiCard__content"
+                    </button>
+                  </span>
+                </div>
+                <div
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <span
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
                   >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
+                    <button
+                      aria-label="Delete element"
+                      className="euiButtonIcon euiButtonIcon--danger"
+                      data-test-subj="canvasElementCard__deleteButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-describedby=" generated-idDescription"
-                        className="euiCard__titleButton"
-                        onClick={[Function]}
-                      >
-                        Custom Element 2
-                      </button>
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        Aenean eu justo auctor, placerat felis non, scelerisque dolor. 
-                      </p>
-                    </div>
-                  </div>
-                  <div
-                    className="euiCard__footer"
-                  />
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="trash"
+                        size="m"
+                      />
+                    </button>
+                  </span>
                 </div>
+              </div>
+            </div>
+            <div
+              className="euiFlexItem canvasElementCard__wrapper"
+            >
+              <div
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
+                onClick={[Function]}
+              >
                 <div
-                  className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
+                  className="euiCard__top"
                 >
                   <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                    className="euiCard__image"
                   >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                    >
-                      <button
-                        aria-label="Edit element"
-                        className="euiButtonIcon euiButtonIcon--primary"
-                        data-test-subj="canvasElementCard__editButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="pencil"
-                          size="m"
-                        />
-                      </button>
-                    </span>
+                    <img
+                      alt=""
+                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+                    />
                   </div>
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                </div>
+                <div
+                  className="euiCard__content"
+                >
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
                   >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
+                    <button
+                      aria-describedby=" generated-idDescription"
+                      className="euiCard__titleButton"
+                      onClick={[Function]}
                     >
-                      <button
-                        aria-label="Delete element"
-                        className="euiButtonIcon euiButtonIcon--danger"
-                        data-test-subj="canvasElementCard__deleteButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="trash"
-                          size="m"
-                        />
-                      </button>
-                    </span>
+                      Custom Element 3
+                    </button>
+                  </span>
+                  <div
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
+                  >
+                    <p>
+                      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce lobortis aliquet arcu ut turpis duis.
+                    </p>
                   </div>
                 </div>
+                <div
+                  className="euiCard__footer"
+                />
               </div>
               <div
-                className="euiFlexItem canvasElementCard__wrapper"
+                className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
               >
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
-                  onClick={[Function]}
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
-                  <div
-                    className="euiCard__top"
+                  <span
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
                   >
-                    <div
-                      className="euiCard__image"
+                    <button
+                      aria-label="Edit element"
+                      className="euiButtonIcon euiButtonIcon--primary"
+                      data-test-subj="canvasElementCard__editButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
                     >
-                      <img
-                        alt=""
-                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="pencil"
+                        size="m"
                       />
-                    </div>
-                  </div>
-                  <div
-                    className="euiCard__content"
-                  >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
-                    >
-                      <button
-                        aria-describedby=" generated-idDescription"
-                        className="euiCard__titleButton"
-                        onClick={[Function]}
-                      >
-                        Custom Element 3
-                      </button>
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce lobortis aliquet arcu ut turpis duis.
-                      </p>
-                    </div>
-                  </div>
-                  <div
-                    className="euiCard__footer"
-                  />
+                    </button>
+                  </span>
                 </div>
                 <div
-                  className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
-                  >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                    >
-                      <button
-                        aria-label="Edit element"
-                        className="euiButtonIcon euiButtonIcon--primary"
-                        data-test-subj="canvasElementCard__editButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="pencil"
-                          size="m"
-                        />
-                      </button>
-                    </span>
-                  </div>
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                  <span
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
                   >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
+                    <button
+                      aria-label="Delete element"
+                      className="euiButtonIcon euiButtonIcon--danger"
+                      data-test-subj="canvasElementCard__deleteButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-label="Delete element"
-                        className="euiButtonIcon euiButtonIcon--danger"
-                        data-test-subj="canvasElementCard__deleteButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="trash"
-                          size="m"
-                        />
-                      </button>
-                    </span>
-                  </div>
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="trash"
+                        size="m"
+                      />
+                    </button>
+                  </span>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div
-          className="euiModalFooter"
+      </div>
+      <div
+        className="euiModalFooter"
+      >
+        <button
+          className="euiButton euiButton--primary euiButton--small"
+          data-test-subj="saved-elements-modal-close-button"
+          onClick={[Function]}
+          type="button"
         >
-          <button
-            className="euiButton euiButton--primary euiButton--small"
-            data-test-subj="saved-elements-modal-close-button"
-            onClick={[Function]}
-            type="button"
+          <span
+            className="euiButtonContent euiButton__content"
           >
             <span
-              className="euiButtonContent euiButton__content"
+              className="euiButton__text"
             >
-              <span
-                className="euiButton__text"
-              >
-                Close
-              </span>
+              Close
             </span>
-          </button>
-        </div>
+          </span>
+        </button>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
 
 exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
-Array [
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-guard={true}
+    className="euiModal canvasModal--fixedSize"
+    onKeyDown={[Function]}
     style={
       Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
+        "maxWidth": "1000px",
       }
     }
     tabIndex={0}
-  />,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={1}
-  />,
-  <div
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
   >
+    <button
+      aria-label="Closes this modal window"
+      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+      onClick={[Function]}
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        className="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+        size="m"
+      />
+    </button>
     <div
-      className="euiModal canvasModal--fixedSize"
-      onKeyDown={[Function]}
-      style={
-        Object {
-          "maxWidth": "1000px",
-        }
-      }
-      tabIndex={0}
+      className="euiModal__flex"
     >
-      <button
-        aria-label="Closes this modal window"
-        className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-        onClick={[Function]}
-        type="button"
+      <div
+        className="euiModalHeader canvasAssetManager__modalHeader"
       >
         <div
-          aria-hidden="true"
-          className="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-          size="m"
-        />
-      </button>
+          className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
+        >
+          My elements
+        </div>
+      </div>
       <div
-        className="euiModal__flex"
+        className="euiModalBody"
+        style={
+          Object {
+            "paddingRight": "1px",
+          }
+        }
       >
         <div
-          className="euiModalHeader canvasAssetManager__modalHeader"
+          className="euiModalBody__overflow"
         >
           <div
-            className="euiModalHeader__title canvasAssetManager__modalHeaderTitle"
+            className="euiFormControlLayout euiFormControlLayout--fullWidth"
           >
-            My elements
+            <div
+              className="euiFormControlLayout__childrenWrapper"
+            >
+              <input
+                className="euiFieldSearch euiFieldSearch--fullWidth"
+                onChange={[Function]}
+                onKeyUp={[Function]}
+                placeholder="Find element"
+                type="search"
+                value="Element 2"
+              />
+              <div
+                className="euiFormControlLayoutIcons"
+              >
+                <span
+                  className="euiFormControlLayoutCustomIcon"
+                >
+                  <div
+                    aria-hidden="true"
+                    className="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="search"
+                  />
+                </span>
+              </div>
+              <div
+                className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+              >
+                <button
+                  aria-label="Clear input"
+                  className="euiFormControlLayoutClearButton"
+                  onClick={[Function]}
+                  type="button"
+                >
+                  <div
+                    className="euiFormControlLayoutClearButton__icon"
+                    data-euiicon-type="cross"
+                  />
+                </button>
+              </div>
+            </div>
           </div>
-        </div>
-        <div
-          className="euiModalBody"
-          style={
-            Object {
-              "paddingRight": "1px",
-            }
-          }
-        >
           <div
-            className="euiModalBody__overflow"
+            className="euiSpacer euiSpacer--l"
+          />
+          <div
+            className="euiFlexGrid euiFlexGrid--gutterLarge euiFlexGrid--fourths euiFlexGrid--responsive"
           >
             <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth"
+              className="euiFlexItem canvasElementCard__wrapper"
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
+                onClick={[Function]}
               >
-                <input
-                  className="euiFieldSearch euiFieldSearch--fullWidth"
-                  onChange={[Function]}
-                  onKeyUp={[Function]}
-                  placeholder="Find element"
-                  type="search"
-                  value="Element 2"
-                />
                 <div
-                  className="euiFormControlLayoutIcons"
+                  className="euiCard__top"
                 >
-                  <span
-                    className="euiFormControlLayoutCustomIcon"
+                  <div
+                    className="euiCard__image"
                   >
-                    <div
-                      aria-hidden="true"
-                      className="euiFormControlLayoutCustomIcon__icon"
-                      data-euiicon-type="search"
+                    <img
+                      alt=""
+                      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
                     />
-                  </span>
+                  </div>
                 </div>
                 <div
-                  className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+                  className="euiCard__content"
                 >
-                  <button
-                    aria-label="Clear input"
-                    className="euiFormControlLayoutClearButton"
-                    onClick={[Function]}
-                    type="button"
+                  <span
+                    className="euiTitle euiTitle--small euiCard__title"
+                    id="generated-idTitle"
                   >
-                    <div
-                      className="euiFormControlLayoutClearButton__icon"
-                      data-euiicon-type="cross"
-                    />
-                  </button>
+                    <button
+                      aria-describedby=" generated-idDescription"
+                      className="euiCard__titleButton"
+                      onClick={[Function]}
+                    >
+                      Custom Element 2
+                    </button>
+                  </span>
+                  <div
+                    className="euiText euiText--small euiCard__description"
+                    id="generated-idDescription"
+                  >
+                    <p>
+                      Aenean eu justo auctor, placerat felis non, scelerisque dolor. 
+                    </p>
+                  </div>
                 </div>
+                <div
+                  className="euiCard__footer"
+                />
               </div>
-            </div>
-            <div
-              className="euiSpacer euiSpacer--l"
-            />
-            <div
-              className="euiFlexGrid euiFlexGrid--gutterLarge euiFlexGrid--fourths euiFlexGrid--responsive"
-            >
               <div
-                className="euiFlexItem canvasElementCard__wrapper"
+                className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
               >
                 <div
-                  className="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--isClickable canvasElementCard"
-                  onClick={[Function]}
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
-                  <div
-                    className="euiCard__top"
+                  <span
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
                   >
-                    <div
-                      className="euiCard__image"
+                    <button
+                      aria-label="Edit element"
+                      className="euiButtonIcon euiButtonIcon--primary"
+                      data-test-subj="canvasElementCard__editButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
                     >
-                      <img
-                        alt=""
-                        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDI3MC42MDAwMSAyNjkuNTQ2NjYiCiAgIGhlaWdodD0iMjY5LjU0NjY2IgogICB3aWR0aD0iMjcwLjYwMDAxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICBpZD0ic3ZnMiIKICAgdmVyc2lvbj0iMS4xIj48bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGE4Ij48cmRmOlJERj48Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcwogICAgIGlkPSJkZWZzNiIgLz48ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzMzMzMzMywwLDAsLTEuMzMzMzMzMywwLDI2OS41NDY2NykiCiAgICAgaWQ9ImcxMCI+PGcKICAgICAgIHRyYW5zZm9ybT0ic2NhbGUoMC4xKSIKICAgICAgIGlkPSJnMTIiPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTQiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMjAyOS40OCw5NjIuNDQxIGMgMCwxNzAuMDk5IC0xMDUuNDYsMzE4Ljc5OSAtMjY0LjE3LDM3Ni42NTkgNi45OCwzNS44NiAxMC42Miw3MS43MSAxMC42MiwxMDkuMDUgMCwzMTYuMTkgLTI1Ny4yNCw1NzMuNDMgLTU3My40Nyw1NzMuNDMgLTE4NC43MiwwIC0zNTYuNTU4LC04OC41OSAtNDY0LjUzLC0yMzcuODUgLTUzLjA5LDQxLjE4IC0xMTguMjg1LDYzLjc1IC0xODYuMzA1LDYzLjc1IC0xNjcuODM2LDAgLTMwNC4zODMsLTEzNi41NCAtMzA0LjM4MywtMzA0LjM4IDAsLTM3LjA4IDYuNjE3LC03Mi41OCAxOS4wMzEsLTEwNi4wOCBDIDEwOC40ODgsMTM4MC4wOSAwLDEyMjcuODkgMCwxMDU4Ljg4IDAsODg3LjkxIDEwNS45NzcsNzM4LjUzOSAyNjUuMzk4LDY4MS4wOSBjIC02Ljc2OSwtMzUuNDQyIC0xMC40NiwtNzIuMDIgLTEwLjQ2LC0xMDkgQyAyNTQuOTM4LDI1Ni42MjEgNTExLjU2NiwwIDgyNy4wMjcsMCAxMDEyLjIsMCAxMTgzLjk0LDg4Ljk0MTQgMTI5MS4zLDIzOC44MzIgYyA1My40NSwtNDEuOTYxIDExOC44LC02NC45OTIgMTg2LjU2LC02NC45OTIgMTY3LjgzLDAgMzA0LjM4LDEzNi40OTIgMzA0LjM4LDMwNC4zMzIgMCwzNy4wNzggLTYuNjIsNzIuNjI5IC0xOS4wMywxMDYuMTI5IDE1Ny43OCw1Ni44NzkgMjY2LjI3LDIwOS4xMjkgMjY2LjI3LDM3OC4xNCIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDE2IgogICAgICAgICBzdHlsZT0iZmlsbDojZmFjZjA5O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDc5Ny44OTgsMTE1MC45MyA0NDQuMDcyLC0yMDIuNDUgNDQ4LjA1LDM5Mi41OCBjIDYuNDksMzIuMzkgOS42Niw2NC42NyA5LjY2LDk4LjQ2IDAsMjc2LjIzIC0yMjQuNjgsNTAwLjk1IC01MDAuOSw1MDAuOTUgLTE2NS4yNCwwIC0zMTkuMzcsLTgxLjM2IC00MTMuMDUzLC0yMTcuNzkgbCAtNzQuNTI0LC0zODYuNjQgODYuNjk1LC0xODUuMTEiIC8+PHBhdGgKICAgICAgICAgaWQ9InBhdGgxOCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzQ5YzFhZTtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZSIKICAgICAgICAgZD0ibSAzMzguMjIzLDY4MC42NzIgYyAtNi40ODksLTMyLjM4MyAtOS44MDksLTY1Ljk4MSAtOS44MDksLTk5Ljk3MyAwLC0yNzYuOTI5IDIyNS4zMzYsLTUwMi4yNTc2IDUwMi4zMTMsLTUwMi4yNTc2IDE2Ni41OTMsMCAzMjEuNDczLDgyLjExNzYgNDE1LjAxMywyMTkuOTQ5NiBsIDczLjk3LDM4NS4zNDcgLTk4LjcyLDE4OC42MjEgTCA3NzUuMTU2LDEwNzUuNTcgMzM4LjIyMyw2ODAuNjcyIiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjAiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNlZjI5OWI7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMzM1LjQxLDE0NDkuMTggMzA0LjMzMiwtNzEuODYgNjYuNjgsMzQ2LjAyIGMgLTQxLjU4NiwzMS43OCAtOTIuOTMsNDkuMTggLTE0NS43MzEsNDkuMTggLTEzMi4yNSwwIC0yMzkuODEyLC0xMDcuNjEgLTIzOS44MTIsLTIzOS44NyAwLC0yOS4yMSA0Ljg3OSwtNTcuMjIgMTQuNTMxLC04My40NyIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDIyIgogICAgICAgICBzdHlsZT0iZmlsbDojNGNhYmU0O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJNIDMwOC45OTIsMTM3Ni43IEMgMTczLjAyLDEzMzEuNjQgNzguNDgwNSwxMjAxLjMgNzguNDgwNSwxMDU3LjkzIDc4LjQ4MDUsOTE4LjM0IDE2NC44Miw3OTMuNjggMjk0LjQwNiw3NDQuMzUyIGwgNDI2Ljk4MSwzODUuOTM4IC03OC4zOTUsMTY3LjUxIC0zMzQsNzguOSIgLz48cGF0aAogICAgICAgICBpZD0icGF0aDI0IgogICAgICAgICBzdHlsZT0iZmlsbDojODVjZTI2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgICBkPSJtIDEzMjMuOCwyOTguNDEgYyA0MS43NCwtMzIuMDkgOTIuODMsLTQ5LjU5IDE0NC45OCwtNDkuNTkgMTMyLjI1LDAgMjM5LjgxLDEwNy41NTkgMjM5LjgxLDIzOS44MjEgMCwyOS4xNiAtNC44OCw1Ny4xNjggLTE0LjUzLDgzLjQxOCBsIC0zMDQuMDgsNzEuMTYgLTY2LjE4LC0zNDQuODA5IiAvPjxwYXRoCiAgICAgICAgIGlkPSJwYXRoMjYiCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzMTc3YTc7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOm5vbmUiCiAgICAgICAgIGQ9Im0gMTM4NS42Nyw3MjIuOTMgMzM0Ljc2LC03OC4zMDEgYyAxMzYuMDIsNDQuOTYxIDIzMC41NiwxNzUuMzUxIDIzMC41NiwzMTguNzYyIDAsMTM5LjMzOSAtODYuNTQsMjYzLjg1OSAtMjE2LjM4LDMxMy4wMzkgbCAtNDM3Ljg0LC0zODMuNTkgODguOSwtMTY5LjkxIiAvPjwvZz48L2c+PC9zdmc+"
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="pencil"
+                        size="m"
                       />
-                    </div>
-                  </div>
-                  <div
-                    className="euiCard__content"
-                  >
-                    <span
-                      className="euiTitle euiTitle--small euiCard__title"
-                      id="generated-idTitle"
-                    >
-                      <button
-                        aria-describedby=" generated-idDescription"
-                        className="euiCard__titleButton"
-                        onClick={[Function]}
-                      >
-                        Custom Element 2
-                      </button>
-                    </span>
-                    <div
-                      className="euiText euiText--small euiCard__description"
-                      id="generated-idDescription"
-                    >
-                      <p>
-                        Aenean eu justo auctor, placerat felis non, scelerisque dolor. 
-                      </p>
-                    </div>
-                  </div>
-                  <div
-                    className="euiCard__footer"
-                  />
+                    </button>
+                  </span>
                 </div>
                 <div
-                  className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive canvasElementCard__controls"
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
-                  >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                    >
-                      <button
-                        aria-label="Edit element"
-                        className="euiButtonIcon euiButtonIcon--primary"
-                        data-test-subj="canvasElementCard__editButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="pencil"
-                          size="m"
-                        />
-                      </button>
-                    </span>
-                  </div>
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                  <span
+                    className="euiToolTipAnchor"
+                    onKeyUp={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
                   >
-                    <span
-                      className="euiToolTipAnchor"
-                      onKeyUp={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
+                    <button
+                      aria-label="Delete element"
+                      className="euiButtonIcon euiButtonIcon--danger"
+                      data-test-subj="canvasElementCard__deleteButton"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      type="button"
                     >
-                      <button
-                        aria-label="Delete element"
-                        className="euiButtonIcon euiButtonIcon--danger"
-                        data-test-subj="canvasElementCard__deleteButton"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <div
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          data-euiicon-type="trash"
-                          size="m"
-                        />
-                      </button>
-                    </span>
-                  </div>
+                      <div
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        data-euiicon-type="trash"
+                        size="m"
+                      />
+                    </button>
+                  </span>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div
-          className="euiModalFooter"
+      </div>
+      <div
+        className="euiModalFooter"
+      >
+        <button
+          className="euiButton euiButton--primary euiButton--small"
+          data-test-subj="saved-elements-modal-close-button"
+          onClick={[Function]}
+          type="button"
         >
-          <button
-            className="euiButton euiButton--primary euiButton--small"
-            data-test-subj="saved-elements-modal-close-button"
-            onClick={[Function]}
-            type="button"
+          <span
+            className="euiButtonContent euiButton__content"
           >
             <span
-              className="euiButtonContent euiButton__content"
+              className="euiButton__text"
             >
-              <span
-                className="euiButton__text"
-              >
-                Close
-              </span>
+              Close
             </span>
-          </button>
-        </div>
+          </span>
+        </button>
       </div>
     </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+  </div>
+</div>
 `;
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
index 04cc3e0f383b0..75e132863e47e 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
@@ -2,357 +2,328 @@
 
 exports[`<Settings /> can navigate Autoplay Settings 1`] = `
 <div>
-  <div>
+  <div
+    data-eui="EuiFocusTrap"
+  >
     <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-    <div
-      data-focus-lock-disabled="disabled"
+      aria-describedby="generated-id"
+      aria-live="assertive"
+      aria-modal="true"
+      class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
+      role="dialog"
+      style="top: -16px; left: -22px; z-index: 2000;"
     >
       <div
-        aria-describedby="generated-id"
-        aria-live="assertive"
-        aria-modal="true"
-        class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
-        role="dialog"
-        style="top: -16px; left: -22px; z-index: 2000;"
-      >
+        class="euiPopover__panelArrow euiPopover__panelArrow--top"
+        style="left: 10px; top: 0px;"
+      />
+      <div>
         <div
-          class="euiPopover__panelArrow euiPopover__panelArrow--top"
-          style="left: 10px; top: 0px;"
-        />
-        <div>
+          class="euiContextMenu"
+          style="height: 0px;"
+        >
           <div
-            class="euiContextMenu"
-            style="height: 0px;"
+            class="euiContextMenuPanel euiContextMenu__panel"
+            tabindex="0"
           >
             <div
-              class="euiContextMenuPanel euiContextMenu__panel"
-              tabindex="0"
+              class="euiPopoverTitle"
             >
-              <div
-                class="euiPopoverTitle"
+              <span
+                class="euiContextMenu__itemLayout"
               >
-                <span
-                  class="euiContextMenu__itemLayout"
-                >
-                  Settings
-                </span>
-              </div>
+                Settings
+              </span>
+            </div>
+            <div>
               <div>
-                <div>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="play"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="play"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Auto Play
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Auto Play
                     </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="boxesHorizontal"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="boxesHorizontal"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Toolbar
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Toolbar
                     </span>
-                  </button>
-                </div>
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
   </div>
 </div>
 `;
 
 exports[`<Settings /> can navigate Autoplay Settings 2`] = `
 <div>
-  <div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
+  <div
+    data-eui="EuiFocusTrap"
+  >
     <div
-      data-focus-lock-disabled="disabled"
+      aria-describedby="generated-id"
+      aria-live="assertive"
+      aria-modal="true"
+      class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle"
+      role="dialog"
+      style="top: -16px; left: -22px; z-index: 2000;"
     >
       <div
-        aria-describedby="generated-id"
-        aria-live="assertive"
-        aria-modal="true"
-        class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle"
-        role="dialog"
-        style="top: -16px; left: -22px; z-index: 2000;"
-      >
+        class="euiPopover__panelArrow euiPopover__panelArrow--top"
+        style="left: 10px; top: 0px;"
+      />
+      <div>
         <div
-          class="euiPopover__panelArrow euiPopover__panelArrow--top"
-          style="left: 10px; top: 0px;"
-        />
-        <div>
+          class="euiContextMenu"
+          style="height: 0px;"
+        >
           <div
-            class="euiContextMenu"
-            style="height: 0px;"
+            class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft"
+            tabindex="0"
           >
             <div
-              class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft"
-              tabindex="0"
+              class="euiPopoverTitle"
             >
-              <div
-                class="euiPopoverTitle"
+              <span
+                class="euiContextMenu__itemLayout"
               >
-                <span
-                  class="euiContextMenu__itemLayout"
-                >
-                  Settings
-                </span>
-              </div>
+                Settings
+              </span>
+            </div>
+            <div>
               <div>
-                <div>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="play"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="play"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Auto Play
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Auto Play
                     </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="boxesHorizontal"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="boxesHorizontal"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Toolbar
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Toolbar
                     </span>
-                  </button>
-                </div>
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
               </div>
             </div>
-            <div
-              class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft"
-              tabindex="0"
+          </div>
+          <div
+            class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft"
+            tabindex="0"
+          >
+            <button
+              class="euiContextMenuPanelTitle"
+              data-test-subj="contextMenuPanelTitleButton"
+              type="button"
             >
-              <button
-                class="euiContextMenuPanelTitle"
-                data-test-subj="contextMenuPanelTitleButton"
-                type="button"
+              <span
+                class="euiContextMenu__itemLayout"
               >
+                <div
+                  class="euiContextMenu__icon"
+                  data-euiicon-type="arrowLeft"
+                />
                 <span
-                  class="euiContextMenu__itemLayout"
+                  class="euiContextMenu__text"
                 >
-                  <div
-                    class="euiContextMenu__icon"
-                    data-euiicon-type="arrowLeft"
-                  />
-                  <span
-                    class="euiContextMenu__text"
-                  >
-                    Auto Play
-                  </span>
+                  Auto Play
                 </span>
-              </button>
+              </span>
+            </button>
+            <div>
               <div>
-                <div>
+                <div
+                  style="padding: 16px;"
+                >
                   <div
-                    style="padding: 16px;"
+                    class="euiSwitch"
                   >
-                    <div
-                      class="euiSwitch"
+                    <button
+                      aria-checked="false"
+                      aria-labelledby="generated-id"
+                      class="euiSwitch__button"
+                      id="cycle"
+                      name="cycle"
+                      role="switch"
+                      type="button"
                     >
-                      <button
-                        aria-checked="false"
-                        aria-labelledby="generated-id"
-                        class="euiSwitch__button"
-                        id="cycle"
-                        name="cycle"
-                        role="switch"
-                        type="button"
+                      <span
+                        class="euiSwitch__body"
                       >
                         <span
-                          class="euiSwitch__body"
+                          class="euiSwitch__thumb"
+                        />
+                        <span
+                          class="euiSwitch__track"
                         >
-                          <span
-                            class="euiSwitch__thumb"
+                          <div
+                            class="euiSwitch__icon"
+                            data-euiicon-type="cross"
+                          />
+                          <div
+                            class="euiSwitch__icon euiSwitch__icon--checked"
+                            data-euiicon-type="check"
                           />
-                          <span
-                            class="euiSwitch__track"
-                          >
-                            <div
-                              class="euiSwitch__icon"
-                              data-euiicon-type="cross"
-                            />
-                            <div
-                              class="euiSwitch__icon euiSwitch__icon--checked"
-                              data-euiicon-type="check"
-                            />
-                          </span>
                         </span>
-                      </button>
-                      <span
-                        class="euiSwitch__label"
-                        id="generated-id"
-                      >
-                        Cycle Slides
                       </span>
-                    </div>
-                    <hr
-                      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
-                    />
-                    <form>
+                    </button>
+                    <span
+                      class="euiSwitch__label"
+                      id="generated-id"
+                    >
+                      Cycle Slides
+                    </span>
+                  </div>
+                  <hr
+                    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
+                  />
+                  <form>
+                    <div
+                      class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+                        class="euiFlexItem"
                       >
                         <div
-                          class="euiFlexItem"
+                          class="euiFormRow euiFormRow--compressed"
+                          id="generated-id-row"
                         >
                           <div
-                            class="euiFormRow euiFormRow--compressed"
-                            id="generated-id-row"
+                            class="euiFormRow__labelWrapper"
                           >
-                            <div
-                              class="euiFormRow__labelWrapper"
+                            <label
+                              class="euiFormLabel euiFormRow__label"
+                              for="generated-id"
                             >
-                              <label
-                                class="euiFormLabel euiFormRow__label"
-                                for="generated-id"
-                              >
-                                Set a custom interval
-                              </label>
-                            </div>
+                              Set a custom interval
+                            </label>
+                          </div>
+                          <div
+                            class="euiFormRow__fieldWrapper"
+                          >
                             <div
-                              class="euiFormRow__fieldWrapper"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
-                                class="euiFormControlLayout euiFormControlLayout--compressed"
+                                class="euiFormControlLayout__childrenWrapper"
                               >
-                                <div
-                                  class="euiFormControlLayout__childrenWrapper"
-                                >
-                                  <input
-                                    aria-describedby="generated-id-help"
-                                    class="euiFieldText euiFieldText--compressed"
-                                    id="generated-id"
-                                    type="text"
-                                    value="5s"
-                                  />
-                                </div>
-                              </div>
-                              <div
-                                class="euiFormHelpText euiFormRow__text"
-                                id="generated-id-help"
-                              >
-                                Use shorthand notation, like 30s, 10m, or 1h
+                                <input
+                                  aria-describedby="generated-id-help"
+                                  class="euiFieldText euiFieldText--compressed"
+                                  id="generated-id"
+                                  type="text"
+                                  value="5s"
+                                />
                               </div>
                             </div>
+                            <div
+                              class="euiFormHelpText euiFormRow__text"
+                              id="generated-id-help"
+                            >
+                              Use shorthand notation, like 30s, 10m, or 1h
+                            </div>
                           </div>
                         </div>
+                      </div>
+                      <div
+                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                      >
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero"
+                          class="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--compressed"
+                          id="generated-id-row"
                         >
                           <div
-                            class="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--compressed"
-                            id="generated-id-row"
+                            class="euiFormRow__fieldWrapper"
                           >
-                            <div
-                              class="euiFormRow__fieldWrapper"
+                            <button
+                              class="euiButton euiButton--primary euiButton--small"
+                              id="generated-id"
+                              style="min-width: auto;"
+                              type="submit"
                             >
-                              <button
-                                class="euiButton euiButton--primary euiButton--small"
-                                id="generated-id"
-                                style="min-width: auto;"
-                                type="submit"
+                              <span
+                                class="euiButtonContent euiButton__content"
                               >
                                 <span
-                                  class="euiButtonContent euiButton__content"
+                                  class="euiButton__text"
                                 >
-                                  <span
-                                    class="euiButton__text"
-                                  >
-                                    Set
-                                  </span>
+                                  Set
                                 </span>
-                              </button>
-                            </div>
+                              </span>
+                            </button>
                           </div>
                         </div>
                       </div>
-                    </form>
-                  </div>
+                    </div>
+                  </form>
                 </div>
               </div>
             </div>
@@ -360,300 +331,266 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
         </div>
       </div>
     </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
   </div>
 </div>
 `;
 
 exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] = `
 <div>
-  <div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
+  <div
+    data-eui="EuiFocusTrap"
+  >
     <div
-      data-focus-lock-disabled="disabled"
+      aria-describedby="generated-id"
+      aria-live="assertive"
+      aria-modal="true"
+      class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
+      role="dialog"
+      style="top: -16px; left: -22px; z-index: 2000;"
     >
       <div
-        aria-describedby="generated-id"
-        aria-live="assertive"
-        aria-modal="true"
-        class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
-        role="dialog"
-        style="top: -16px; left: -22px; z-index: 2000;"
-      >
+        class="euiPopover__panelArrow euiPopover__panelArrow--top"
+        style="left: 10px; top: 0px;"
+      />
+      <div>
         <div
-          class="euiPopover__panelArrow euiPopover__panelArrow--top"
-          style="left: 10px; top: 0px;"
-        />
-        <div>
+          class="euiContextMenu"
+          style="height: 0px;"
+        >
           <div
-            class="euiContextMenu"
-            style="height: 0px;"
+            class="euiContextMenuPanel euiContextMenu__panel"
+            tabindex="0"
           >
             <div
-              class="euiContextMenuPanel euiContextMenu__panel"
-              tabindex="0"
+              class="euiPopoverTitle"
             >
-              <div
-                class="euiPopoverTitle"
+              <span
+                class="euiContextMenu__itemLayout"
               >
-                <span
-                  class="euiContextMenu__itemLayout"
-                >
-                  Settings
-                </span>
-              </div>
+                Settings
+              </span>
+            </div>
+            <div>
               <div>
-                <div>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="play"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="play"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Auto Play
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Auto Play
                     </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="boxesHorizontal"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="boxesHorizontal"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Toolbar
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Toolbar
                     </span>
-                  </button>
-                </div>
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
   </div>
 </div>
 `;
 
 exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] = `
 <div>
-  <div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
+  <div
+    data-eui="EuiFocusTrap"
+  >
     <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-    <div
-      data-focus-lock-disabled="disabled"
+      aria-describedby="generated-id"
+      aria-live="assertive"
+      aria-modal="true"
+      class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle"
+      role="dialog"
+      style="top: -16px; left: -22px; z-index: 2000;"
     >
       <div
-        aria-describedby="generated-id"
-        aria-live="assertive"
-        aria-modal="true"
-        class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle"
-        role="dialog"
-        style="top: -16px; left: -22px; z-index: 2000;"
-      >
+        class="euiPopover__panelArrow euiPopover__panelArrow--top"
+        style="left: 10px; top: 0px;"
+      />
+      <div>
         <div
-          class="euiPopover__panelArrow euiPopover__panelArrow--top"
-          style="left: 10px; top: 0px;"
-        />
-        <div>
+          class="euiContextMenu"
+          style="height: 0px;"
+        >
           <div
-            class="euiContextMenu"
-            style="height: 0px;"
+            class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft"
+            tabindex="0"
           >
             <div
-              class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft"
-              tabindex="0"
+              class="euiPopoverTitle"
             >
-              <div
-                class="euiPopoverTitle"
+              <span
+                class="euiContextMenu__itemLayout"
               >
-                <span
-                  class="euiContextMenu__itemLayout"
-                >
-                  Settings
-                </span>
-              </div>
+                Settings
+              </span>
+            </div>
+            <div>
               <div>
-                <div>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="play"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="play"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Auto Play
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Auto Play
                     </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    type="button"
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
+                <button
+                  class="euiContextMenuItem"
+                  type="button"
+                >
+                  <span
+                    class="euiContextMenu__itemLayout"
                   >
+                    <div
+                      class="euiContextMenu__icon"
+                      data-euiicon-type="boxesHorizontal"
+                    />
                     <span
-                      class="euiContextMenu__itemLayout"
+                      class="euiContextMenuItem__text"
                     >
-                      <div
-                        class="euiContextMenu__icon"
-                        data-euiicon-type="boxesHorizontal"
-                      />
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Toolbar
-                      </span>
-                      <div
-                        class="euiContextMenu__arrow"
-                        data-euiicon-type="arrowRight"
-                      />
+                      Toolbar
                     </span>
-                  </button>
-                </div>
+                    <div
+                      class="euiContextMenu__arrow"
+                      data-euiicon-type="arrowRight"
+                    />
+                  </span>
+                </button>
               </div>
             </div>
-            <div
-              class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft"
-              tabindex="0"
+          </div>
+          <div
+            class="euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft"
+            tabindex="0"
+          >
+            <button
+              class="euiContextMenuPanelTitle"
+              data-test-subj="contextMenuPanelTitleButton"
+              type="button"
             >
-              <button
-                class="euiContextMenuPanelTitle"
-                data-test-subj="contextMenuPanelTitleButton"
-                type="button"
+              <span
+                class="euiContextMenu__itemLayout"
               >
+                <div
+                  class="euiContextMenu__icon"
+                  data-euiicon-type="arrowLeft"
+                />
                 <span
-                  class="euiContextMenu__itemLayout"
+                  class="euiContextMenu__text"
                 >
-                  <div
-                    class="euiContextMenu__icon"
-                    data-euiicon-type="arrowLeft"
-                  />
-                  <span
-                    class="euiContextMenu__text"
-                  >
-                    Toolbar
-                  </span>
+                  Toolbar
                 </span>
-              </button>
+              </span>
+            </button>
+            <div>
               <div>
-                <div>
+                <div
+                  style="padding: 16px;"
+                >
                   <div
-                    style="padding: 16px;"
+                    class="euiFormRow"
+                    id="generated-id-row"
                   >
                     <div
-                      class="euiFormRow"
-                      id="generated-id-row"
+                      class="euiFormRow__fieldWrapper"
                     >
                       <div
-                        class="euiFormRow__fieldWrapper"
+                        class="euiSwitch"
                       >
-                        <div
-                          class="euiSwitch"
+                        <button
+                          aria-checked="false"
+                          aria-describedby="generated-id-help"
+                          aria-labelledby="generated-id"
+                          class="euiSwitch__button"
+                          data-test-subj="hideToolbarSwitch"
+                          id="generated-id"
+                          name="toolbarHide"
+                          role="switch"
+                          type="button"
                         >
-                          <button
-                            aria-checked="false"
-                            aria-describedby="generated-id-help"
-                            aria-labelledby="generated-id"
-                            class="euiSwitch__button"
-                            data-test-subj="hideToolbarSwitch"
-                            id="generated-id"
-                            name="toolbarHide"
-                            role="switch"
-                            type="button"
+                          <span
+                            class="euiSwitch__body"
                           >
                             <span
-                              class="euiSwitch__body"
+                              class="euiSwitch__thumb"
+                            />
+                            <span
+                              class="euiSwitch__track"
                             >
-                              <span
-                                class="euiSwitch__thumb"
+                              <div
+                                class="euiSwitch__icon"
+                                data-euiicon-type="cross"
+                              />
+                              <div
+                                class="euiSwitch__icon euiSwitch__icon--checked"
+                                data-euiicon-type="check"
                               />
-                              <span
-                                class="euiSwitch__track"
-                              >
-                                <div
-                                  class="euiSwitch__icon"
-                                  data-euiicon-type="cross"
-                                />
-                                <div
-                                  class="euiSwitch__icon euiSwitch__icon--checked"
-                                  data-euiicon-type="check"
-                                />
-                              </span>
                             </span>
-                          </button>
-                          <span
-                            class="euiSwitch__label"
-                            id="generated-id"
-                          >
-                            Hide Toolbar
                           </span>
-                        </div>
-                        <div
-                          class="euiFormHelpText euiFormRow__text"
-                          id="generated-id-help"
+                        </button>
+                        <span
+                          class="euiSwitch__label"
+                          id="generated-id"
                         >
-                          Hide the toolbar when the mouse is not within the Canvas?
-                        </div>
+                          Hide Toolbar
+                        </span>
+                      </div>
+                      <div
+                        class="euiFormHelpText euiFormRow__text"
+                        id="generated-id-help"
+                      >
+                        Hide the toolbar when the mouse is not within the Canvas?
                       </div>
                     </div>
                   </div>
@@ -664,13 +601,8 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
         </div>
       </div>
     </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
   </div>
 </div>
 `;
 
-exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"disabled\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aria-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Auto Play</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Toolbar</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><div data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></div><div data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></div></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div></div>"`;
+exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aria-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Auto Play</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Toolbar</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><div data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></div><div data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></div></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
diff --git a/x-pack/plugins/ingest_manager/dev_docs/definitions.md b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
index be5aeb923e903..d9ff597c5e84b 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/definitions.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
@@ -13,9 +13,9 @@ definitions for one or multiple inputs and each input can contain one or multipl
 With the example of the nginx Package policy, it contains two inputs: `logs` and `nginx/metrics`. Logs and metrics are collected
 differently. The `logs` input contains two streams, `access` and `error`, the `nginx/metrics` input contains the stubstatus stream.
 
-## Data Stream
+## Data stream
 
-Data Streams are a [new concept](https://github.com/elastic/elasticsearch/issues/53100) in Elasticsearch which simplify
+Data streams are a [new concept](https://github.com/elastic/elasticsearch/issues/53100) in Elasticsearch which simplify
 ingesting data and the setup of Elasticsearch.
 
 ## Elastic Agent
@@ -35,7 +35,7 @@ Fleet is the part of the Ingest Manager UI in Kibana that handles the part of en
 
 Ingest Management + Elastic Agent follow a strict new indexing strategy: `{type}-{dataset}-{namespace}`. An example
 for this is `logs-nginx.access-default`. More details about it can be found in the Index Strategy below. All data of
-the index strategy is sent to Data Streams.
+the index strategy is sent to data streams.
 
 ## Input
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
index 4a8dcfedc0936..c370f46b9f5a0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
@@ -53,7 +53,7 @@ export const PAGE_ROUTING_PATHS = {
   fleet_agent_details_events: '/fleet/agents/:agentId',
   fleet_agent_details_details: '/fleet/agents/:agentId/details',
   fleet_enrollment_tokens: '/fleet/enrollment-tokens',
-  data_streams: '/datasets',
+  data_streams: '/data-streams',
 };
 
 export const pagePathGetters: {
@@ -80,5 +80,5 @@ export const pagePathGetters: {
   fleet_agent_details: ({ agentId, tabId }) =>
     `/fleet/agents/${agentId}${tabId ? `/${tabId}` : ''}`,
   fleet_enrollment_tokens: () => '/fleet/enrollment-tokens',
-  data_streams: () => '/datasets',
+  data_streams: () => '/data-streams',
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
index 6ef1351dc5b60..1d80495d2b347 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
@@ -207,7 +207,7 @@ const breadcrumbGetters: {
     BASE_BREADCRUMB,
     {
       text: i18n.translate('xpack.ingestManager.breadcrumbs.datastreamsPageTitle', {
-        defaultMessage: 'Datasets',
+        defaultMessage: 'Data streams',
       }),
     },
   ],
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
index 726da7a790b97..30294779d1a3d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@@ -96,7 +96,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
                   <EuiTab isSelected={section === 'data_stream'} href={getHref('data_streams')}>
                     <FormattedMessage
                       id="xpack.ingestManager.appNavigation.dataStreamsLinkText"
-                      defaultMessage="Datasets"
+                      defaultMessage="Data streams"
                     />
                   </EuiTab>
                 </EuiTabs>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
index d8ab46fbf87f7..53fd6a713b523 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
@@ -32,7 +32,7 @@ const DataStreamListPageLayout: React.FunctionComponent = ({ children }) => (
             <h1>
               <FormattedMessage
                 id="xpack.ingestManager.dataStreamList.pageTitle"
-                defaultMessage="Datasets"
+                defaultMessage="Data streams"
               />
             </h1>
           </EuiText>
@@ -173,7 +173,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
           <h2>
             <FormattedMessage
               id="xpack.ingestManager.dataStreamList.noDataStreamsPrompt"
-              defaultMessage="No datasets"
+              defaultMessage="No data streams"
             />
           </h2>
         }
@@ -216,14 +216,14 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
           isLoading ? (
             <FormattedMessage
               id="xpack.ingestManager.dataStreamList.loadingDataStreamsMessage"
-              defaultMessage="Loading datasets…"
+              defaultMessage="Loading data streams…"
             />
           ) : dataStreamsData && !dataStreamsData.data_streams.length ? (
             emptyPrompt
           ) : (
             <FormattedMessage
               id="xpack.ingestManager.dataStreamList.noFilteredDataStreamsMessage"
-              defaultMessage="No matching datasets found"
+              defaultMessage="No matching data streams found"
             />
           )
         }
@@ -253,7 +253,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
             placeholder: i18n.translate(
               'xpack.ingestManager.dataStreamList.searchPlaceholderTitle',
               {
-                defaultMessage: 'Filter datasets',
+                defaultMessage: 'Filter data streams',
               }
             ),
             incremental: true,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
index abe834e7db19c..049ceca82b309 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
@@ -157,7 +157,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
           <EuiText>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.stepCheckForDataDescription"
-              defaultMessage="The agent should begin sending data. Go to Datasets to view your data."
+              defaultMessage="The agent should begin sending data. Go to data streams to view your data."
             />
           </EuiText>
         </>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/datastream_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/datastream_section.tsx
index 41c011de2da5c..bece6ec074b88 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/datastream_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/datastream_section.tsx
@@ -47,14 +47,14 @@ export const OverviewDatastreamSection: React.FC = () => {
     <EuiFlexItem component="section">
       <OverviewPanel
         title={i18n.translate('xpack.ingestManager.overviewPageDataStreamsPanelTitle', {
-          defaultMessage: 'Datasets',
+          defaultMessage: 'Data streams',
         })}
         tooltip={i18n.translate('xpack.ingestManager.overviewPageDataStreamsPanelTooltip', {
-          defaultMessage: 'Data that your agents collect are organized into various datasets.',
+          defaultMessage: 'Data that your agents collect are organized into various data streams.',
         })}
         linkTo={getHref('data_streams')}
         linkToText={i18n.translate('xpack.ingestManager.overviewPageDataStreamsPanelAction', {
-          defaultMessage: 'View datasets',
+          defaultMessage: 'View data streams',
         })}
       >
         <OverviewStats>
@@ -65,7 +65,7 @@ export const OverviewDatastreamSection: React.FC = () => {
               <EuiDescriptionListTitle>
                 <FormattedMessage
                   id="xpack.ingestManager.overviewDatastreamTotalTitle"
-                  defaultMessage="Datasets"
+                  defaultMessage="Data streams"
                 />
               </EuiDescriptionListTitle>
               <EuiDescriptionListDescription>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
index 80e27b7c4d0bf..30a6742af6ea6 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
@@ -43,7 +43,7 @@ export {
   CreatePackagePolicyResponse,
   UpdatePackagePolicyRequest,
   UpdatePackagePolicyResponse,
-  // API schemas - Data Streams
+  // API schemas - Data streams
   GetDataStreamsResponse,
   // API schemas - Agents
   GetAgentsResponse,
diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
index 442f82161512f..892058d82a80f 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -300,7 +300,7 @@ describe('Lens App', () => {
     ]);
   });
 
-  it('sets originatingApp breadcrumb when the document title changes', async () => {
+  it.skip('sets originatingApp breadcrumb when the document title changes', async () => {
     const defaultArgs = makeDefaultArgs();
     defaultArgs.originatingApp = 'ultraCoolDashboard';
     defaultArgs.getAppNameFromId = () => 'The Coolest Container Ever Made';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
index 5bcfbc64ec706..a0cc5ec352130 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
@@ -186,9 +186,13 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
           ? i18n.translate('xpack.lens.indexPattern.fieldItemTooltip', {
               defaultMessage: 'Drag and drop to visualize.',
             })
-          : i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
+          : exists
+          ? i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
               defaultMessage: 'Click for a field preview, or drag and drop to visualize.',
             })
+          : i18n.translate('xpack.lens.indexPattern.fieldStatsButtonEmptyLabel', {
+              defaultMessage: "This field doesn't have data. Drag and drop to visualize.",
+            })
       }
       type="iInCircle"
       color="subdued"
@@ -217,11 +221,7 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
             isDraggable
             isActive={infoIsOpen}
             data-test-subj={`lnsFieldListPanelField-${field.name}`}
-            onClick={() => {
-              if (exists) {
-                togglePopover();
-              }
-            }}
+            onClick={togglePopover}
             aria-label={i18n.translate('xpack.lens.indexPattern.fieldStatsButtonAriaLabel', {
               defaultMessage: '{fieldName}: {fieldType}. Hit enter for a field preview.',
               values: {
@@ -313,7 +313,8 @@ function FieldItemPopoverContents(props: State & FieldItemProps) {
     return (
       <EuiText size="s">
         {i18n.translate('xpack.lens.indexPattern.fieldStatsNoData', {
-          defaultMessage: 'No data to display.',
+          defaultMessage:
+            'This field is empty because it doesn’t exist in the 500 sampled documents.',
         })}
       </EuiText>
     );
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
index 1d60b0b5cbbee..af2ed97ad8125 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
@@ -64,9 +64,9 @@ export const InnerFieldsAccordion = function InnerFieldsAccordion({
   showExistenceFetchError,
 }: FieldsAccordionProps) {
   const renderField = useCallback(
-    (field: IndexPatternField) => {
-      return <FieldItem {...fieldProps} key={field.name} field={field} exists={!!exists} />;
-    },
+    (field: IndexPatternField) => (
+      <FieldItem {...fieldProps} key={field.name} field={field} exists={!!exists} />
+    ),
     [fieldProps, exists]
   );
 
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index 32e4d116f0a06..b3e2c055c6738 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -297,21 +297,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                           class="euiOverlayMask euiOverlayMask--aboveHeader"
                         >
                           <div
-                            aria-hidden="true"
-                            data-aria-hidden="true"
-                            data-focus-guard="true"
-                            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-                            tabindex="0"
-                          />
-                          <div
-                            aria-hidden="true"
-                            data-aria-hidden="true"
-                            data-focus-guard="true"
-                            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-                            tabindex="1"
-                          />
-                          <div
-                            data-focus-lock-disabled="false"
+                            data-eui="EuiFocusTrap"
                           >
                             <div
                               class="euiModal euiModal--maxWidth-default euiModal--confirmation"
@@ -407,13 +393,6 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                               </div>
                             </div>
                           </div>
-                          <div
-                            aria-hidden="true"
-                            data-aria-hidden="true"
-                            data-focus-guard="true"
-                            style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-                            tabindex="0"
-                          />
                         </div>
                       }
                     >
@@ -447,843 +426,209 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                           onClose={[Function]}
                         >
                           <EuiFocusTrap>
-                            <ForwardRef
-                              enabled={true}
-                              noIsolation={true}
-                              returnFocus={true}
-                              scrollLock={false}
+                            <div
+                              data-eui="EuiFocusTrap"
                             >
-                              <ForwardRef
-                                enabled={true}
-                                noIsolation={true}
-                                returnFocus={true}
-                                scrollLock={false}
-                                sideCar={[Function]}
+                              <div
+                                className="euiModal euiModal--maxWidth-default euiModal--confirmation"
+                                onKeyDown={[Function]}
+                                tabIndex={0}
                               >
-                                <ForwardRef
-                                  as={
-                                    Object {
-                                      "$$typeof": Symbol(react.forward_ref),
-                                      "classNames": Object {
-                                        "fullWidth": "width-before-scroll-bar",
-                                        "zeroRight": "right-scroll-bar-position",
-                                      },
-                                      "defaultProps": Object {
-                                        "enabled": true,
-                                        "inert": false,
-                                        "removeScrollBar": true,
-                                      },
-                                      "render": [Function],
-                                    }
-                                  }
-                                  autoFocus={true}
-                                  crossFrame={true}
-                                  disabled={false}
-                                  lockProps={
-                                    Object {
-                                      "allowPinchZoom": undefined,
-                                      "enabled": false,
-                                      "inert": undefined,
-                                      "onMouseDown": [Function],
-                                      "onTouchStart": [Function],
-                                      "shards": undefined,
-                                      "sideCar": [Function],
-                                    }
-                                  }
-                                  noFocusGuards={false}
-                                  onActivation={[Function]}
-                                  onDeactivation={[Function]}
-                                  persistentFocus={false}
-                                  returnFocus={true}
-                                  sideCar={[Function]}
+                                <EuiI18n
+                                  default="Closes this modal window"
+                                  token="euiModal.closeModal"
                                 >
-                                  <div
-                                    data-focus-guard={true}
-                                    key="guard-first"
-                                    style={
-                                      Object {
-                                        "height": "0px",
-                                        "left": "1px",
-                                        "overflow": "hidden",
-                                        "padding": 0,
-                                        "position": "fixed",
-                                        "top": "1px",
-                                        "width": "1px",
-                                      }
-                                    }
-                                    tabIndex={0}
-                                  />
-                                  <div
-                                    data-focus-guard={true}
-                                    key="guard-nearest"
-                                    style={
-                                      Object {
-                                        "height": "0px",
-                                        "left": "1px",
-                                        "overflow": "hidden",
-                                        "padding": 0,
-                                        "position": "fixed",
-                                        "top": "1px",
-                                        "width": "1px",
-                                      }
-                                    }
-                                    tabIndex={1}
-                                  />
-                                  <RequireSideCar
-                                    autoFocus={true}
-                                    crossFrame={true}
-                                    disabled={false}
-                                    id={Object {}}
-                                    observed={
-                                      <div
-                                        data-focus-lock-disabled="false"
+                                  <EuiButtonIcon
+                                    aria-label="Closes this modal window"
+                                    className="euiModal__closeIcon"
+                                    color="text"
+                                    iconType="cross"
+                                    onClick={[Function]}
+                                  >
+                                    <button
+                                      aria-label="Closes this modal window"
+                                      className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                      onClick={[Function]}
+                                      type="button"
+                                    >
+                                      <EuiIcon
+                                        aria-hidden="true"
+                                        className="euiButtonIcon__icon"
+                                        size="m"
+                                        type="cross"
                                       >
                                         <div
-                                          class="euiModal euiModal--maxWidth-default euiModal--confirmation"
-                                          tabindex="0"
-                                        >
-                                          <button
-                                            aria-label="Closes this modal window"
-                                            class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                                            type="button"
-                                          >
-                                            <div
-                                              aria-hidden="true"
-                                              class="euiButtonIcon__icon"
-                                              data-euiicon-type="cross"
-                                            />
-                                          </button>
-                                          <div
-                                            class="euiModal__flex"
-                                          >
-                                            <div
-                                              class="euiModalHeader"
-                                            >
-                                              <div
-                                                class="euiModalHeader__title"
-                                                data-test-subj="confirmModalTitleText"
-                                              >
-                                                Confirm License Upload
-                                              </div>
-                                            </div>
-                                            <div
-                                              class="euiModalBody"
-                                            >
-                                              <div
-                                                class="euiModalBody__overflow"
-                                              >
-                                                <div
-                                                  class="euiText euiText--medium"
-                                                  data-test-subj="confirmModalBodyText"
-                                                >
-                                                  <div>
-                                                    <div
-                                                      class="euiText euiText--medium"
-                                                    >
-                                                      Some functionality will be lost if you replace your TRIAL license with a BASIC license. Review the list of features below.
-                                                    </div>
-                                                    <div
-                                                      class="euiText euiText--medium"
-                                                    >
-                                                      <ul>
-                                                        <li>
-                                                          Watcher will be disabled
-                                                        </li>
-                                                      </ul>
-                                                    </div>
-                                                  </div>
-                                                </div>
-                                              </div>
-                                            </div>
-                                            <div
-                                              class="euiModalFooter"
-                                            >
-                                              <button
-                                                class="euiButtonEmpty euiButtonEmpty--primary"
-                                                data-test-subj="confirmModalCancelButton"
-                                                type="button"
-                                              >
-                                                <span
-                                                  class="euiButtonContent euiButtonEmpty__content"
-                                                >
-                                                  <span
-                                                    class="euiButtonEmpty__text"
-                                                  >
-                                                    Cancel
-                                                  </span>
-                                                </span>
-                                              </button>
-                                              <button
-                                                class="euiButton euiButton--primary euiButton--fill"
-                                                data-test-subj="confirmModalConfirmButton"
-                                                type="button"
-                                              >
-                                                <span
-                                                  class="euiButtonContent euiButton__content"
-                                                >
-                                                  <span
-                                                    class="euiButton__text"
-                                                  >
-                                                    Confirm
-                                                  </span>
-                                                </span>
-                                              </button>
-                                            </div>
-                                          </div>
-                                        </div>
-                                      </div>
-                                    }
-                                    onActivation={[Function]}
-                                    onDeactivation={[Function]}
-                                    persistentFocus={false}
-                                    returnFocus={[Function]}
-                                    shards={Array []}
-                                    sideCar={
-                                      Object {
-                                        "assignMedium": [Function],
-                                        "assignSyncMedium": [Function],
-                                        "options": Object {
-                                          "async": true,
-                                          "ssr": false,
-                                        },
-                                        "read": [Function],
-                                        "useMedium": [Function],
-                                      }
-                                    }
-                                  >
-                                    <SideCar
-                                      autoFocus={true}
-                                      crossFrame={true}
-                                      disabled={false}
-                                      id={Object {}}
-                                      observed={
+                                          aria-hidden="true"
+                                          className="euiButtonIcon__icon"
+                                          data-euiicon-type="cross"
+                                          size="m"
+                                        />
+                                      </EuiIcon>
+                                    </button>
+                                  </EuiButtonIcon>
+                                </EuiI18n>
+                                <div
+                                  className="euiModal__flex"
+                                >
+                                  <EuiModalHeader>
+                                    <div
+                                      className="euiModalHeader"
+                                    >
+                                      <EuiModalHeaderTitle
+                                        data-test-subj="confirmModalTitleText"
+                                      >
                                         <div
-                                          data-focus-lock-disabled="false"
+                                          className="euiModalHeader__title"
+                                          data-test-subj="confirmModalTitleText"
                                         >
-                                          <div
-                                            class="euiModal euiModal--maxWidth-default euiModal--confirmation"
-                                            tabindex="0"
+                                          <FormattedMessage
+                                            defaultMessage="Confirm License Upload"
+                                            id="xpack.licenseMgmt.uploadLicense.confirmModalTitle"
+                                            values={Object {}}
                                           >
-                                            <button
-                                              aria-label="Closes this modal window"
-                                              class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                                              type="button"
-                                            >
-                                              <div
-                                                aria-hidden="true"
-                                                class="euiButtonIcon__icon"
-                                                data-euiicon-type="cross"
-                                              />
-                                            </button>
-                                            <div
-                                              class="euiModal__flex"
-                                            >
-                                              <div
-                                                class="euiModalHeader"
-                                              >
-                                                <div
-                                                  class="euiModalHeader__title"
-                                                  data-test-subj="confirmModalTitleText"
-                                                >
-                                                  Confirm License Upload
-                                                </div>
-                                              </div>
-                                              <div
-                                                class="euiModalBody"
-                                              >
-                                                <div
-                                                  class="euiModalBody__overflow"
-                                                >
-                                                  <div
-                                                    class="euiText euiText--medium"
-                                                    data-test-subj="confirmModalBodyText"
-                                                  >
-                                                    <div>
-                                                      <div
-                                                        class="euiText euiText--medium"
-                                                      >
-                                                        Some functionality will be lost if you replace your TRIAL license with a BASIC license. Review the list of features below.
-                                                      </div>
-                                                      <div
-                                                        class="euiText euiText--medium"
-                                                      >
-                                                        <ul>
-                                                          <li>
-                                                            Watcher will be disabled
-                                                          </li>
-                                                        </ul>
-                                                      </div>
-                                                    </div>
-                                                  </div>
-                                                </div>
-                                              </div>
-                                              <div
-                                                class="euiModalFooter"
-                                              >
-                                                <button
-                                                  class="euiButtonEmpty euiButtonEmpty--primary"
-                                                  data-test-subj="confirmModalCancelButton"
-                                                  type="button"
-                                                >
-                                                  <span
-                                                    class="euiButtonContent euiButtonEmpty__content"
-                                                  >
-                                                    <span
-                                                      class="euiButtonEmpty__text"
-                                                    >
-                                                      Cancel
-                                                    </span>
-                                                  </span>
-                                                </button>
-                                                <button
-                                                  class="euiButton euiButton--primary euiButton--fill"
-                                                  data-test-subj="confirmModalConfirmButton"
-                                                  type="button"
-                                                >
-                                                  <span
-                                                    class="euiButtonContent euiButton__content"
-                                                  >
-                                                    <span
-                                                      class="euiButton__text"
-                                                    >
-                                                      Confirm
-                                                    </span>
-                                                  </span>
-                                                </button>
-                                              </div>
-                                            </div>
-                                          </div>
+                                            Confirm License Upload
+                                          </FormattedMessage>
                                         </div>
-                                      }
-                                      onActivation={[Function]}
-                                      onDeactivation={[Function]}
-                                      persistentFocus={false}
-                                      returnFocus={[Function]}
-                                      shards={Array []}
-                                      sideCar={
-                                        Object {
-                                          "assignMedium": [Function],
-                                          "assignSyncMedium": [Function],
-                                          "options": Object {
-                                            "async": true,
-                                            "ssr": false,
-                                          },
-                                          "read": [Function],
-                                          "useMedium": [Function],
-                                        }
-                                      }
+                                      </EuiModalHeaderTitle>
+                                    </div>
+                                  </EuiModalHeader>
+                                  <EuiModalBody>
+                                    <div
+                                      className="euiModalBody"
                                     >
-                                      <SideEffect(FocusWatcher)
-                                        autoFocus={true}
-                                        crossFrame={true}
-                                        disabled={false}
-                                        id={Object {}}
-                                        observed={
+                                      <div
+                                        className="euiModalBody__overflow"
+                                      >
+                                        <EuiText
+                                          data-test-subj="confirmModalBodyText"
+                                        >
                                           <div
-                                            data-focus-lock-disabled="false"
+                                            className="euiText euiText--medium"
+                                            data-test-subj="confirmModalBodyText"
                                           >
-                                            <div
-                                              class="euiModal euiModal--maxWidth-default euiModal--confirmation"
-                                              tabindex="0"
-                                            >
-                                              <button
-                                                aria-label="Closes this modal window"
-                                                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                                                type="button"
-                                              >
+                                            <div>
+                                              <EuiText>
                                                 <div
-                                                  aria-hidden="true"
-                                                  class="euiButtonIcon__icon"
-                                                  data-euiicon-type="cross"
-                                                />
-                                              </button>
-                                              <div
-                                                class="euiModal__flex"
-                                              >
-                                                <div
-                                                  class="euiModalHeader"
+                                                  className="euiText euiText--medium"
                                                 >
-                                                  <div
-                                                    class="euiModalHeader__title"
-                                                    data-test-subj="confirmModalTitleText"
-                                                  >
-                                                    Confirm License Upload
-                                                  </div>
+                                                  Some functionality will be lost if you replace your TRIAL license with a BASIC license. Review the list of features below.
                                                 </div>
+                                              </EuiText>
+                                              <EuiText>
                                                 <div
-                                                  class="euiModalBody"
+                                                  className="euiText euiText--medium"
                                                 >
-                                                  <div
-                                                    class="euiModalBody__overflow"
-                                                  >
-                                                    <div
-                                                      class="euiText euiText--medium"
-                                                      data-test-subj="confirmModalBodyText"
-                                                    >
-                                                      <div>
-                                                        <div
-                                                          class="euiText euiText--medium"
-                                                        >
-                                                          Some functionality will be lost if you replace your TRIAL license with a BASIC license. Review the list of features below.
-                                                        </div>
-                                                        <div
-                                                          class="euiText euiText--medium"
-                                                        >
-                                                          <ul>
-                                                            <li>
-                                                              Watcher will be disabled
-                                                            </li>
-                                                          </ul>
-                                                        </div>
-                                                      </div>
-                                                    </div>
-                                                  </div>
-                                                </div>
-                                                <div
-                                                  class="euiModalFooter"
-                                                >
-                                                  <button
-                                                    class="euiButtonEmpty euiButtonEmpty--primary"
-                                                    data-test-subj="confirmModalCancelButton"
-                                                    type="button"
-                                                  >
-                                                    <span
-                                                      class="euiButtonContent euiButtonEmpty__content"
-                                                    >
-                                                      <span
-                                                        class="euiButtonEmpty__text"
-                                                      >
-                                                        Cancel
-                                                      </span>
-                                                    </span>
-                                                  </button>
-                                                  <button
-                                                    class="euiButton euiButton--primary euiButton--fill"
-                                                    data-test-subj="confirmModalConfirmButton"
-                                                    type="button"
-                                                  >
-                                                    <span
-                                                      class="euiButtonContent euiButton__content"
+                                                  <ul>
+                                                    <li
+                                                      key="Watcher will be disabled"
                                                     >
-                                                      <span
-                                                        class="euiButton__text"
-                                                      >
-                                                        Confirm
-                                                      </span>
-                                                    </span>
-                                                  </button>
+                                                      Watcher will be disabled
+                                                    </li>
+                                                  </ul>
                                                 </div>
-                                              </div>
+                                              </EuiText>
                                             </div>
                                           </div>
-                                        }
-                                        onActivation={[Function]}
-                                        onDeactivation={[Function]}
-                                        persistentFocus={false}
-                                        returnFocus={[Function]}
-                                        shards={Array []}
-                                      >
-                                        <FocusWatcher
-                                          autoFocus={true}
-                                          crossFrame={true}
-                                          disabled={false}
-                                          id={Object {}}
-                                          observed={
-                                            <div
-                                              data-focus-lock-disabled="false"
-                                            >
-                                              <div
-                                                class="euiModal euiModal--maxWidth-default euiModal--confirmation"
-                                                tabindex="0"
-                                              >
-                                                <button
-                                                  aria-label="Closes this modal window"
-                                                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                                                  type="button"
-                                                >
-                                                  <div
-                                                    aria-hidden="true"
-                                                    class="euiButtonIcon__icon"
-                                                    data-euiicon-type="cross"
-                                                  />
-                                                </button>
-                                                <div
-                                                  class="euiModal__flex"
-                                                >
-                                                  <div
-                                                    class="euiModalHeader"
-                                                  >
-                                                    <div
-                                                      class="euiModalHeader__title"
-                                                      data-test-subj="confirmModalTitleText"
-                                                    >
-                                                      Confirm License Upload
-                                                    </div>
-                                                  </div>
-                                                  <div
-                                                    class="euiModalBody"
-                                                  >
-                                                    <div
-                                                      class="euiModalBody__overflow"
-                                                    >
-                                                      <div
-                                                        class="euiText euiText--medium"
-                                                        data-test-subj="confirmModalBodyText"
-                                                      >
-                                                        <div>
-                                                          <div
-                                                            class="euiText euiText--medium"
-                                                          >
-                                                            Some functionality will be lost if you replace your TRIAL license with a BASIC license. Review the list of features below.
-                                                          </div>
-                                                          <div
-                                                            class="euiText euiText--medium"
-                                                          >
-                                                            <ul>
-                                                              <li>
-                                                                Watcher will be disabled
-                                                              </li>
-                                                            </ul>
-                                                          </div>
-                                                        </div>
-                                                      </div>
-                                                    </div>
-                                                  </div>
-                                                  <div
-                                                    class="euiModalFooter"
-                                                  >
-                                                    <button
-                                                      class="euiButtonEmpty euiButtonEmpty--primary"
-                                                      data-test-subj="confirmModalCancelButton"
-                                                      type="button"
-                                                    >
-                                                      <span
-                                                        class="euiButtonContent euiButtonEmpty__content"
-                                                      >
-                                                        <span
-                                                          class="euiButtonEmpty__text"
-                                                        >
-                                                          Cancel
-                                                        </span>
-                                                      </span>
-                                                    </button>
-                                                    <button
-                                                      class="euiButton euiButton--primary euiButton--fill"
-                                                      data-test-subj="confirmModalConfirmButton"
-                                                      type="button"
-                                                    >
-                                                      <span
-                                                        class="euiButtonContent euiButton__content"
-                                                      >
-                                                        <span
-                                                          class="euiButton__text"
-                                                        >
-                                                          Confirm
-                                                        </span>
-                                                      </span>
-                                                    </button>
-                                                  </div>
-                                                </div>
-                                              </div>
-                                            </div>
-                                          }
-                                          onActivation={[Function]}
-                                          onDeactivation={[Function]}
-                                          persistentFocus={false}
-                                          returnFocus={[Function]}
-                                          shards={Array []}
-                                        />
-                                      </SideEffect(FocusWatcher)>
-                                    </SideCar>
-                                  </RequireSideCar>
-                                  <ForwardRef
-                                    data-focus-lock-disabled={false}
-                                    enabled={false}
-                                    inert={false}
-                                    onBlur={[Function]}
-                                    onFocus={[Function]}
-                                    onMouseDown={[Function]}
-                                    onTouchStart={[Function]}
-                                    removeScrollBar={true}
-                                    sideCar={[Function]}
-                                  >
+                                        </EuiText>
+                                      </div>
+                                    </div>
+                                  </EuiModalBody>
+                                  <EuiModalFooter>
                                     <div
-                                      data-focus-lock-disabled={false}
-                                      onBlur={[Function]}
-                                      onFocus={[Function]}
-                                      onMouseDown={[Function]}
-                                      onScrollCapture={[Function]}
-                                      onTouchMoveCapture={[Function]}
-                                      onTouchStart={[Function]}
-                                      onWheelCapture={[Function]}
+                                      className="euiModalFooter"
                                     >
-                                      <div
-                                        className="euiModal euiModal--maxWidth-default euiModal--confirmation"
-                                        onKeyDown={[Function]}
-                                        tabIndex={0}
+                                      <EuiButtonEmpty
+                                        buttonRef={[Function]}
+                                        data-test-subj="confirmModalCancelButton"
+                                        onClick={[Function]}
                                       >
-                                        <EuiI18n
-                                          default="Closes this modal window"
-                                          token="euiModal.closeModal"
+                                        <button
+                                          className="euiButtonEmpty euiButtonEmpty--primary"
+                                          data-test-subj="confirmModalCancelButton"
+                                          onClick={[Function]}
+                                          type="button"
                                         >
-                                          <EuiButtonIcon
-                                            aria-label="Closes this modal window"
-                                            className="euiModal__closeIcon"
-                                            color="text"
-                                            iconType="cross"
-                                            onClick={[Function]}
+                                          <EuiButtonContent
+                                            className="euiButtonEmpty__content"
+                                            iconSide="left"
+                                            textProps={
+                                              Object {
+                                                "className": "euiButtonEmpty__text",
+                                              }
+                                            }
                                           >
-                                            <button
-                                              aria-label="Closes this modal window"
-                                              className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                                              onClick={[Function]}
-                                              type="button"
+                                            <span
+                                              className="euiButtonContent euiButtonEmpty__content"
                                             >
-                                              <EuiIcon
-                                                aria-hidden="true"
-                                                className="euiButtonIcon__icon"
-                                                size="m"
-                                                type="cross"
+                                              <span
+                                                className="euiButtonEmpty__text"
                                               >
-                                                <div
-                                                  aria-hidden="true"
-                                                  className="euiButtonIcon__icon"
-                                                  data-euiicon-type="cross"
-                                                  size="m"
-                                                />
-                                              </EuiIcon>
-                                            </button>
-                                          </EuiButtonIcon>
-                                        </EuiI18n>
-                                        <div
-                                          className="euiModal__flex"
+                                                <FormattedMessage
+                                                  defaultMessage="Cancel"
+                                                  id="xpack.licenseMgmt.uploadLicense.confirmModal.cancelButtonLabel"
+                                                  values={Object {}}
+                                                >
+                                                  Cancel
+                                                </FormattedMessage>
+                                              </span>
+                                            </span>
+                                          </EuiButtonContent>
+                                        </button>
+                                      </EuiButtonEmpty>
+                                      <EuiButton
+                                        buttonRef={[Function]}
+                                        color="primary"
+                                        data-test-subj="confirmModalConfirmButton"
+                                        fill={true}
+                                        onClick={[Function]}
+                                      >
+                                        <EuiButtonDisplay
+                                          color="primary"
+                                          data-test-subj="confirmModalConfirmButton"
+                                          element="button"
+                                          fill={true}
+                                          onClick={[Function]}
+                                          type="button"
                                         >
-                                          <EuiModalHeader>
-                                            <div
-                                              className="euiModalHeader"
+                                          <button
+                                            className="euiButton euiButton--primary euiButton--fill"
+                                            data-test-subj="confirmModalConfirmButton"
+                                            onClick={[Function]}
+                                            type="button"
+                                          >
+                                            <EuiButtonContent
+                                              className="euiButton__content"
+                                              iconSide="left"
+                                              textProps={
+                                                Object {
+                                                  "className": "euiButton__text",
+                                                }
+                                              }
                                             >
-                                              <EuiModalHeaderTitle
-                                                data-test-subj="confirmModalTitleText"
+                                              <span
+                                                className="euiButtonContent euiButton__content"
                                               >
-                                                <div
-                                                  className="euiModalHeader__title"
-                                                  data-test-subj="confirmModalTitleText"
+                                                <span
+                                                  className="euiButton__text"
                                                 >
                                                   <FormattedMessage
-                                                    defaultMessage="Confirm License Upload"
-                                                    id="xpack.licenseMgmt.uploadLicense.confirmModalTitle"
+                                                    defaultMessage="Confirm"
+                                                    id="xpack.licenseMgmt.uploadLicense.confirmModal.confirmButtonLabel"
                                                     values={Object {}}
                                                   >
-                                                    Confirm License Upload
+                                                    Confirm
                                                   </FormattedMessage>
-                                                </div>
-                                              </EuiModalHeaderTitle>
-                                            </div>
-                                          </EuiModalHeader>
-                                          <EuiModalBody>
-                                            <div
-                                              className="euiModalBody"
-                                            >
-                                              <div
-                                                className="euiModalBody__overflow"
-                                              >
-                                                <EuiText
-                                                  data-test-subj="confirmModalBodyText"
-                                                >
-                                                  <div
-                                                    className="euiText euiText--medium"
-                                                    data-test-subj="confirmModalBodyText"
-                                                  >
-                                                    <div>
-                                                      <EuiText>
-                                                        <div
-                                                          className="euiText euiText--medium"
-                                                        >
-                                                          Some functionality will be lost if you replace your TRIAL license with a BASIC license. Review the list of features below.
-                                                        </div>
-                                                      </EuiText>
-                                                      <EuiText>
-                                                        <div
-                                                          className="euiText euiText--medium"
-                                                        >
-                                                          <ul>
-                                                            <li
-                                                              key="Watcher will be disabled"
-                                                            >
-                                                              Watcher will be disabled
-                                                            </li>
-                                                          </ul>
-                                                        </div>
-                                                      </EuiText>
-                                                    </div>
-                                                  </div>
-                                                </EuiText>
-                                              </div>
-                                            </div>
-                                          </EuiModalBody>
-                                          <EuiModalFooter>
-                                            <div
-                                              className="euiModalFooter"
-                                            >
-                                              <EuiButtonEmpty
-                                                buttonRef={[Function]}
-                                                data-test-subj="confirmModalCancelButton"
-                                                onClick={[Function]}
-                                              >
-                                                <button
-                                                  className="euiButtonEmpty euiButtonEmpty--primary"
-                                                  data-test-subj="confirmModalCancelButton"
-                                                  onClick={[Function]}
-                                                  type="button"
-                                                >
-                                                  <EuiButtonContent
-                                                    className="euiButtonEmpty__content"
-                                                    iconSide="left"
-                                                    textProps={
-                                                      Object {
-                                                        "className": "euiButtonEmpty__text",
-                                                      }
-                                                    }
-                                                  >
-                                                    <span
-                                                      className="euiButtonContent euiButtonEmpty__content"
-                                                    >
-                                                      <span
-                                                        className="euiButtonEmpty__text"
-                                                      >
-                                                        <FormattedMessage
-                                                          defaultMessage="Cancel"
-                                                          id="xpack.licenseMgmt.uploadLicense.confirmModal.cancelButtonLabel"
-                                                          values={Object {}}
-                                                        >
-                                                          Cancel
-                                                        </FormattedMessage>
-                                                      </span>
-                                                    </span>
-                                                  </EuiButtonContent>
-                                                </button>
-                                              </EuiButtonEmpty>
-                                              <EuiButton
-                                                buttonRef={[Function]}
-                                                color="primary"
-                                                data-test-subj="confirmModalConfirmButton"
-                                                fill={true}
-                                                onClick={[Function]}
-                                              >
-                                                <EuiButtonDisplay
-                                                  color="primary"
-                                                  data-test-subj="confirmModalConfirmButton"
-                                                  element="button"
-                                                  fill={true}
-                                                  onClick={[Function]}
-                                                  type="button"
-                                                >
-                                                  <button
-                                                    className="euiButton euiButton--primary euiButton--fill"
-                                                    data-test-subj="confirmModalConfirmButton"
-                                                    onClick={[Function]}
-                                                    type="button"
-                                                  >
-                                                    <EuiButtonContent
-                                                      className="euiButton__content"
-                                                      iconSide="left"
-                                                      textProps={
-                                                        Object {
-                                                          "className": "euiButton__text",
-                                                        }
-                                                      }
-                                                    >
-                                                      <span
-                                                        className="euiButtonContent euiButton__content"
-                                                      >
-                                                        <span
-                                                          className="euiButton__text"
-                                                        >
-                                                          <FormattedMessage
-                                                            defaultMessage="Confirm"
-                                                            id="xpack.licenseMgmt.uploadLicense.confirmModal.confirmButtonLabel"
-                                                            values={Object {}}
-                                                          >
-                                                            Confirm
-                                                          </FormattedMessage>
-                                                        </span>
-                                                      </span>
-                                                    </EuiButtonContent>
-                                                  </button>
-                                                </EuiButtonDisplay>
-                                              </EuiButton>
-                                            </div>
-                                          </EuiModalFooter>
-                                        </div>
-                                      </div>
+                                                </span>
+                                              </span>
+                                            </EuiButtonContent>
+                                          </button>
+                                        </EuiButtonDisplay>
+                                      </EuiButton>
                                     </div>
-                                  </ForwardRef>
-                                  <div
-                                    data-focus-guard={true}
-                                    style={
-                                      Object {
-                                        "height": "0px",
-                                        "left": "1px",
-                                        "overflow": "hidden",
-                                        "padding": 0,
-                                        "position": "fixed",
-                                        "top": "1px",
-                                        "width": "1px",
-                                      }
-                                    }
-                                    tabIndex={0}
-                                  />
-                                </ForwardRef>
-                                <RequireSideCar
-                                  noIsolation={true}
-                                  setLockProps={[Function]}
-                                  sideCar={
-                                    Object {
-                                      "assignMedium": [Function],
-                                      "assignSyncMedium": [Function],
-                                      "options": Object {
-                                        "async": true,
-                                        "ssr": false,
-                                      },
-                                      "read": [Function],
-                                      "useMedium": [Function],
-                                    }
-                                  }
-                                >
-                                  <SideCar
-                                    noIsolation={true}
-                                    setLockProps={[Function]}
-                                    sideCar={
-                                      Object {
-                                        "assignMedium": [Function],
-                                        "assignSyncMedium": [Function],
-                                        "options": Object {
-                                          "async": true,
-                                          "ssr": false,
-                                        },
-                                        "read": [Function],
-                                        "useMedium": [Function],
-                                      }
-                                    }
-                                  >
-                                    <Effect
-                                      noIsolation={true}
-                                      setLockProps={[Function]}
-                                    >
-                                      <Component>
-                                        <Sheet
-                                          styles="
- [data-focus-on-hidden] {
-   pointer-events: none !important;
- }
-"
-                                        />
-                                      </Component>
-                                    </Effect>
-                                  </SideCar>
-                                </RequireSideCar>
-                              </ForwardRef>
-                            </ForwardRef>
+                                  </EuiModalFooter>
+                                </div>
+                              </div>
+                            </div>
                           </EuiFocusTrap>
                         </EuiModal>
                       </EuiConfirmModal>
diff --git a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
index a8982a9683d03..49d4cd4968d5e 100644
--- a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
@@ -44,9 +44,7 @@ Array [
       <Portal
         containerInfo={
           <div
-            aria-hidden="true"
             class="euiOverlayMask euiOverlayMask--belowHeader"
-            data-aria-hidden="true"
           />
         }
       />
@@ -54,562 +52,92 @@ Array [
     <EuiFocusTrap
       clickOutsideDisables={true}
     >
-      <EuiOutsideClickDetector
-        isDisabled={false}
-        onOutsideClick={[Function]}
+      <div
+        data-eui="EuiFocusTrap"
       >
-        <OutsideEventDetector
-          handleEvent={[Function]}
-          onMouseDown={[Function]}
-          onMouseUp={[Function]}
-          onTouchEnd={[Function]}
-          onTouchStart={[Function]}
+        <div
+          aria-labelledby="flyoutTitle"
+          className="euiFlyout euiFlyout--small"
+          data-test-subj="reportInfoFlyout"
+          role="dialog"
+          tabIndex={0}
         >
-          <div
-            onMouseDown={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
+          <EuiI18n
+            default="Close this dialog"
+            token="euiFlyout.closeAriaLabel"
           >
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
+            <EuiButtonIcon
+              aria-label="Close this dialog"
+              className="euiFlyout__closeButton"
+              color="text"
+              data-test-subj="euiFlyoutCloseButton"
+              iconType="cross"
+              onClick={[Function]}
             >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
+              <button
+                aria-label="Close this dialog"
+                className="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
+                data-test-subj="euiFlyoutCloseButton"
+                onClick={[Function]}
+                type="button"
               >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
-                  }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  lockProps={
-                    Object {
-                      "allowPinchZoom": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
-                    }
-                  }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
+                <EuiIcon
+                  aria-hidden="true"
+                  className="euiButtonIcon__icon"
+                  size="m"
+                  type="cross"
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
+                    aria-hidden="true"
+                    className="euiButtonIcon__icon"
+                    data-euiicon-type="cross"
+                    size="m"
                   />
-                  <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={1}
-                  />
-                  <RequireSideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
-                      <div
-                        data-focus-lock-disabled="false"
-                      >
-                        <div
-                          aria-labelledby="flyoutTitle"
-                          class="euiFlyout euiFlyout--small"
-                          data-test-subj="reportInfoFlyout"
-                          role="dialog"
-                          tabindex="0"
-                        >
-                          <button
-                            aria-label="Close this dialog"
-                            class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                            data-test-subj="euiFlyoutCloseButton"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              class="euiButtonIcon__icon"
-                              data-euiicon-type="cross"
-                            />
-                          </button>
-                          <div
-                            class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                          >
-                            <h2
-                              class="euiTitle euiTitle--medium"
-                              id="flyoutTitle"
-                            >
-                              Unable to fetch report info
-                            </h2>
-                          </div>
-                          <div
-                            class="euiFlyoutBody"
-                          >
-                            <div
-                              class="euiFlyoutBody__overflow"
-                            >
-                              <div
-                                class="euiFlyoutBody__overflowContent"
-                              >
-                                <div
-                                  class="euiText euiText--medium"
-                                >
-                                  Could not fetch the job info
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideCar
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
-                        <div
-                          data-focus-lock-disabled="false"
-                        >
-                          <div
-                            aria-labelledby="flyoutTitle"
-                            class="euiFlyout euiFlyout--small"
-                            data-test-subj="reportInfoFlyout"
-                            role="dialog"
-                            tabindex="0"
-                          >
-                            <button
-                              aria-label="Close this dialog"
-                              class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                              data-test-subj="euiFlyoutCloseButton"
-                              type="button"
-                            >
-                              <div
-                                aria-hidden="true"
-                                class="euiButtonIcon__icon"
-                                data-euiicon-type="cross"
-                              />
-                            </button>
-                            <div
-                              class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                            >
-                              <h2
-                                class="euiTitle euiTitle--medium"
-                                id="flyoutTitle"
-                              >
-                                Unable to fetch report info
-                              </h2>
-                            </div>
-                            <div
-                              class="euiFlyoutBody"
-                            >
-                              <div
-                                class="euiFlyoutBody__overflow"
-                              >
-                                <div
-                                  class="euiFlyoutBody__overflowContent"
-                                >
-                                  <div
-                                    class="euiText euiText--medium"
-                                  >
-                                    Could not fetch the job info
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                      sideCar={
-                        Object {
-                          "assignMedium": [Function],
-                          "assignSyncMedium": [Function],
-                          "options": Object {
-                            "async": true,
-                            "ssr": false,
-                          },
-                          "read": [Function],
-                          "useMedium": [Function],
-                        }
-                      }
-                    >
-                      <SideEffect(FocusWatcher)
-                        autoFocus={true}
-                        crossFrame={true}
-                        disabled={false}
-                        id={Object {}}
-                        observed={
-                          <div
-                            data-focus-lock-disabled="false"
-                          >
-                            <div
-                              aria-labelledby="flyoutTitle"
-                              class="euiFlyout euiFlyout--small"
-                              data-test-subj="reportInfoFlyout"
-                              role="dialog"
-                              tabindex="0"
-                            >
-                              <button
-                                aria-label="Close this dialog"
-                                class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                                data-test-subj="euiFlyoutCloseButton"
-                                type="button"
-                              >
-                                <div
-                                  aria-hidden="true"
-                                  class="euiButtonIcon__icon"
-                                  data-euiicon-type="cross"
-                                />
-                              </button>
-                              <div
-                                class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                              >
-                                <h2
-                                  class="euiTitle euiTitle--medium"
-                                  id="flyoutTitle"
-                                >
-                                  Unable to fetch report info
-                                </h2>
-                              </div>
-                              <div
-                                class="euiFlyoutBody"
-                              >
-                                <div
-                                  class="euiFlyoutBody__overflow"
-                                >
-                                  <div
-                                    class="euiFlyoutBody__overflowContent"
-                                  >
-                                    <div
-                                      class="euiText euiText--medium"
-                                    >
-                                      Could not fetch the job info
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        }
-                        onActivation={[Function]}
-                        onDeactivation={[Function]}
-                        persistentFocus={false}
-                        returnFocus={[Function]}
-                        shards={Array []}
-                      >
-                        <FocusWatcher
-                          autoFocus={true}
-                          crossFrame={true}
-                          disabled={false}
-                          id={Object {}}
-                          observed={
-                            <div
-                              data-focus-lock-disabled="false"
-                            >
-                              <div
-                                aria-labelledby="flyoutTitle"
-                                class="euiFlyout euiFlyout--small"
-                                data-test-subj="reportInfoFlyout"
-                                role="dialog"
-                                tabindex="0"
-                              >
-                                <button
-                                  aria-label="Close this dialog"
-                                  class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                                  data-test-subj="euiFlyoutCloseButton"
-                                  type="button"
-                                >
-                                  <div
-                                    aria-hidden="true"
-                                    class="euiButtonIcon__icon"
-                                    data-euiicon-type="cross"
-                                  />
-                                </button>
-                                <div
-                                  class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                                >
-                                  <h2
-                                    class="euiTitle euiTitle--medium"
-                                    id="flyoutTitle"
-                                  >
-                                    Unable to fetch report info
-                                  </h2>
-                                </div>
-                                <div
-                                  class="euiFlyoutBody"
-                                >
-                                  <div
-                                    class="euiFlyoutBody__overflow"
-                                  >
-                                    <div
-                                      class="euiFlyoutBody__overflowContent"
-                                    >
-                                      <div
-                                        class="euiText euiText--medium"
-                                      >
-                                        Could not fetch the job info
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          }
-                          onActivation={[Function]}
-                          onDeactivation={[Function]}
-                          persistentFocus={false}
-                          returnFocus={[Function]}
-                          shards={Array []}
-                        />
-                      </SideEffect(FocusWatcher)>
-                    </SideCar>
-                  </RequireSideCar>
-                  <ForwardRef
-                    data-focus-lock-disabled={false}
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
-                  >
+                </EuiIcon>
+              </button>
+            </EuiButtonIcon>
+          </EuiI18n>
+          <EuiFlyoutHeader
+            hasBorder={true}
+          >
+            <div
+              className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
+            >
+              <EuiTitle
+                size="m"
+              >
+                <h2
+                  className="euiTitle euiTitle--medium"
+                  id="flyoutTitle"
+                >
+                  Unable to fetch report info
+                </h2>
+              </EuiTitle>
+            </div>
+          </EuiFlyoutHeader>
+          <EuiFlyoutBody>
+            <div
+              className="euiFlyoutBody"
+            >
+              <div
+                className="euiFlyoutBody__overflow"
+              >
+                <div
+                  className="euiFlyoutBody__overflowContent"
+                >
+                  <EuiText>
                     <div
-                      data-focus-lock-disabled={false}
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
+                      className="euiText euiText--medium"
                     >
-                      <div
-                        aria-labelledby="flyoutTitle"
-                        className="euiFlyout euiFlyout--small"
-                        data-test-subj="reportInfoFlyout"
-                        role="dialog"
-                        tabIndex={0}
-                      >
-                        <EuiI18n
-                          default="Close this dialog"
-                          token="euiFlyout.closeAriaLabel"
-                        >
-                          <EuiButtonIcon
-                            aria-label="Close this dialog"
-                            className="euiFlyout__closeButton"
-                            color="text"
-                            data-test-subj="euiFlyoutCloseButton"
-                            iconType="cross"
-                            onClick={[Function]}
-                          >
-                            <button
-                              aria-label="Close this dialog"
-                              className="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                              data-test-subj="euiFlyoutCloseButton"
-                              onClick={[Function]}
-                              type="button"
-                            >
-                              <EuiIcon
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                size="m"
-                                type="cross"
-                              >
-                                <div
-                                  aria-hidden="true"
-                                  className="euiButtonIcon__icon"
-                                  data-euiicon-type="cross"
-                                  size="m"
-                                />
-                              </EuiIcon>
-                            </button>
-                          </EuiButtonIcon>
-                        </EuiI18n>
-                        <EuiFlyoutHeader
-                          hasBorder={true}
-                        >
-                          <div
-                            className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                          >
-                            <EuiTitle
-                              size="m"
-                            >
-                              <h2
-                                className="euiTitle euiTitle--medium"
-                                id="flyoutTitle"
-                              >
-                                Unable to fetch report info
-                              </h2>
-                            </EuiTitle>
-                          </div>
-                        </EuiFlyoutHeader>
-                        <EuiFlyoutBody>
-                          <div
-                            className="euiFlyoutBody"
-                          >
-                            <div
-                              className="euiFlyoutBody__overflow"
-                            >
-                              <div
-                                className="euiFlyoutBody__overflowContent"
-                              >
-                                <EuiText>
-                                  <div
-                                    className="euiText euiText--medium"
-                                  >
-                                    Could not fetch the job info
-                                  </div>
-                                </EuiText>
-                              </div>
-                            </div>
-                          </div>
-                        </EuiFlyoutBody>
-                      </div>
+                      Could not fetch the job info
                     </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <Effect
-                      noIsolation={true}
-                      setLockProps={[Function]}
-                    >
-                      <Component>
-                        <Sheet
-                          styles="
- [data-focus-on-hidden] {
-   pointer-events: none !important;
- }
-"
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </div>
-        </OutsideEventDetector>
-      </EuiOutsideClickDetector>
+                  </EuiText>
+                </div>
+              </div>
+            </div>
+          </EuiFlyoutBody>
+        </div>
+      </div>
     </EuiFocusTrap>
   </EuiFlyout>,
   <div
@@ -717,9 +245,7 @@ Array [
       <Portal
         containerInfo={
           <div
-            aria-hidden="true"
             class="euiOverlayMask euiOverlayMask--belowHeader"
-            data-aria-hidden="true"
           />
         }
       />
@@ -727,552 +253,90 @@ Array [
     <EuiFocusTrap
       clickOutsideDisables={true}
     >
-      <EuiOutsideClickDetector
-        isDisabled={false}
-        onOutsideClick={[Function]}
+      <div
+        data-eui="EuiFocusTrap"
       >
-        <OutsideEventDetector
-          handleEvent={[Function]}
-          onMouseDown={[Function]}
-          onMouseUp={[Function]}
-          onTouchEnd={[Function]}
-          onTouchStart={[Function]}
+        <div
+          aria-labelledby="flyoutTitle"
+          className="euiFlyout euiFlyout--small"
+          data-test-subj="reportInfoFlyout"
+          role="dialog"
+          tabIndex={0}
         >
-          <div
-            onMouseDown={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
+          <EuiI18n
+            default="Close this dialog"
+            token="euiFlyout.closeAriaLabel"
           >
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
+            <EuiButtonIcon
+              aria-label="Close this dialog"
+              className="euiFlyout__closeButton"
+              color="text"
+              data-test-subj="euiFlyoutCloseButton"
+              iconType="cross"
+              onClick={[Function]}
             >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
+              <button
+                aria-label="Close this dialog"
+                className="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
+                data-test-subj="euiFlyoutCloseButton"
+                onClick={[Function]}
+                type="button"
               >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
-                  }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  lockProps={
-                    Object {
-                      "allowPinchZoom": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
-                    }
-                  }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
+                <EuiIcon
+                  aria-hidden="true"
+                  className="euiButtonIcon__icon"
+                  size="m"
+                  type="cross"
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
+                    aria-hidden="true"
+                    className="euiButtonIcon__icon"
+                    data-euiicon-type="cross"
+                    size="m"
                   />
-                  <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={1}
-                  />
-                  <RequireSideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
-                      <div
-                        data-focus-lock-disabled="false"
-                      >
-                        <div
-                          aria-labelledby="flyoutTitle"
-                          class="euiFlyout euiFlyout--small"
-                          data-test-subj="reportInfoFlyout"
-                          role="dialog"
-                          tabindex="0"
-                        >
-                          <button
-                            aria-label="Close this dialog"
-                            class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                            data-test-subj="euiFlyoutCloseButton"
-                            type="button"
-                          >
-                            <div
-                              aria-hidden="true"
-                              class="euiButtonIcon__icon"
-                              data-euiicon-type="cross"
-                            />
-                          </button>
-                          <div
-                            class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                          >
-                            <h2
-                              class="euiTitle euiTitle--medium"
-                              id="flyoutTitle"
-                            >
-                              Job Info
-                            </h2>
-                          </div>
-                          <div
-                            class="euiFlyoutBody"
-                          >
-                            <div
-                              class="euiFlyoutBody__overflow"
-                            >
-                              <div
-                                class="euiFlyoutBody__overflowContent"
-                              >
-                                <div
-                                  class="euiText euiText--medium"
-                                />
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideCar
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
-                        <div
-                          data-focus-lock-disabled="false"
-                        >
-                          <div
-                            aria-labelledby="flyoutTitle"
-                            class="euiFlyout euiFlyout--small"
-                            data-test-subj="reportInfoFlyout"
-                            role="dialog"
-                            tabindex="0"
-                          >
-                            <button
-                              aria-label="Close this dialog"
-                              class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                              data-test-subj="euiFlyoutCloseButton"
-                              type="button"
-                            >
-                              <div
-                                aria-hidden="true"
-                                class="euiButtonIcon__icon"
-                                data-euiicon-type="cross"
-                              />
-                            </button>
-                            <div
-                              class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                            >
-                              <h2
-                                class="euiTitle euiTitle--medium"
-                                id="flyoutTitle"
-                              >
-                                Job Info
-                              </h2>
-                            </div>
-                            <div
-                              class="euiFlyoutBody"
-                            >
-                              <div
-                                class="euiFlyoutBody__overflow"
-                              >
-                                <div
-                                  class="euiFlyoutBody__overflowContent"
-                                >
-                                  <div
-                                    class="euiText euiText--medium"
-                                  />
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                      sideCar={
-                        Object {
-                          "assignMedium": [Function],
-                          "assignSyncMedium": [Function],
-                          "options": Object {
-                            "async": true,
-                            "ssr": false,
-                          },
-                          "read": [Function],
-                          "useMedium": [Function],
-                        }
-                      }
-                    >
-                      <SideEffect(FocusWatcher)
-                        autoFocus={true}
-                        crossFrame={true}
-                        disabled={false}
-                        id={Object {}}
-                        observed={
-                          <div
-                            data-focus-lock-disabled="false"
-                          >
-                            <div
-                              aria-labelledby="flyoutTitle"
-                              class="euiFlyout euiFlyout--small"
-                              data-test-subj="reportInfoFlyout"
-                              role="dialog"
-                              tabindex="0"
-                            >
-                              <button
-                                aria-label="Close this dialog"
-                                class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                                data-test-subj="euiFlyoutCloseButton"
-                                type="button"
-                              >
-                                <div
-                                  aria-hidden="true"
-                                  class="euiButtonIcon__icon"
-                                  data-euiicon-type="cross"
-                                />
-                              </button>
-                              <div
-                                class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                              >
-                                <h2
-                                  class="euiTitle euiTitle--medium"
-                                  id="flyoutTitle"
-                                >
-                                  Job Info
-                                </h2>
-                              </div>
-                              <div
-                                class="euiFlyoutBody"
-                              >
-                                <div
-                                  class="euiFlyoutBody__overflow"
-                                >
-                                  <div
-                                    class="euiFlyoutBody__overflowContent"
-                                  >
-                                    <div
-                                      class="euiText euiText--medium"
-                                    />
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        }
-                        onActivation={[Function]}
-                        onDeactivation={[Function]}
-                        persistentFocus={false}
-                        returnFocus={[Function]}
-                        shards={Array []}
-                      >
-                        <FocusWatcher
-                          autoFocus={true}
-                          crossFrame={true}
-                          disabled={false}
-                          id={Object {}}
-                          observed={
-                            <div
-                              data-focus-lock-disabled="false"
-                            >
-                              <div
-                                aria-labelledby="flyoutTitle"
-                                class="euiFlyout euiFlyout--small"
-                                data-test-subj="reportInfoFlyout"
-                                role="dialog"
-                                tabindex="0"
-                              >
-                                <button
-                                  aria-label="Close this dialog"
-                                  class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                                  data-test-subj="euiFlyoutCloseButton"
-                                  type="button"
-                                >
-                                  <div
-                                    aria-hidden="true"
-                                    class="euiButtonIcon__icon"
-                                    data-euiicon-type="cross"
-                                  />
-                                </button>
-                                <div
-                                  class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                                >
-                                  <h2
-                                    class="euiTitle euiTitle--medium"
-                                    id="flyoutTitle"
-                                  >
-                                    Job Info
-                                  </h2>
-                                </div>
-                                <div
-                                  class="euiFlyoutBody"
-                                >
-                                  <div
-                                    class="euiFlyoutBody__overflow"
-                                  >
-                                    <div
-                                      class="euiFlyoutBody__overflowContent"
-                                    >
-                                      <div
-                                        class="euiText euiText--medium"
-                                      />
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          }
-                          onActivation={[Function]}
-                          onDeactivation={[Function]}
-                          persistentFocus={false}
-                          returnFocus={[Function]}
-                          shards={Array []}
-                        />
-                      </SideEffect(FocusWatcher)>
-                    </SideCar>
-                  </RequireSideCar>
-                  <ForwardRef
-                    data-focus-lock-disabled={false}
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
-                  >
-                    <div
-                      data-focus-lock-disabled={false}
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
-                    >
-                      <div
-                        aria-labelledby="flyoutTitle"
-                        className="euiFlyout euiFlyout--small"
-                        data-test-subj="reportInfoFlyout"
-                        role="dialog"
-                        tabIndex={0}
-                      >
-                        <EuiI18n
-                          default="Close this dialog"
-                          token="euiFlyout.closeAriaLabel"
-                        >
-                          <EuiButtonIcon
-                            aria-label="Close this dialog"
-                            className="euiFlyout__closeButton"
-                            color="text"
-                            data-test-subj="euiFlyoutCloseButton"
-                            iconType="cross"
-                            onClick={[Function]}
-                          >
-                            <button
-                              aria-label="Close this dialog"
-                              className="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-                              data-test-subj="euiFlyoutCloseButton"
-                              onClick={[Function]}
-                              type="button"
-                            >
-                              <EuiIcon
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                size="m"
-                                type="cross"
-                              >
-                                <div
-                                  aria-hidden="true"
-                                  className="euiButtonIcon__icon"
-                                  data-euiicon-type="cross"
-                                  size="m"
-                                />
-                              </EuiIcon>
-                            </button>
-                          </EuiButtonIcon>
-                        </EuiI18n>
-                        <EuiFlyoutHeader
-                          hasBorder={true}
-                        >
-                          <div
-                            className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-                          >
-                            <EuiTitle
-                              size="m"
-                            >
-                              <h2
-                                className="euiTitle euiTitle--medium"
-                                id="flyoutTitle"
-                              >
-                                Job Info
-                              </h2>
-                            </EuiTitle>
-                          </div>
-                        </EuiFlyoutHeader>
-                        <EuiFlyoutBody>
-                          <div
-                            className="euiFlyoutBody"
-                          >
-                            <div
-                              className="euiFlyoutBody__overflow"
-                            >
-                              <div
-                                className="euiFlyoutBody__overflowContent"
-                              >
-                                <EuiText>
-                                  <div
-                                    className="euiText euiText--medium"
-                                  />
-                                </EuiText>
-                              </div>
-                            </div>
-                          </div>
-                        </EuiFlyoutBody>
-                      </div>
-                    </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
+                </EuiIcon>
+              </button>
+            </EuiButtonIcon>
+          </EuiI18n>
+          <EuiFlyoutHeader
+            hasBorder={true}
+          >
+            <div
+              className="euiFlyoutHeader euiFlyoutHeader--hasBorder"
+            >
+              <EuiTitle
+                size="m"
+              >
+                <h2
+                  className="euiTitle euiTitle--medium"
+                  id="flyoutTitle"
                 >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <Effect
-                      noIsolation={true}
-                      setLockProps={[Function]}
-                    >
-                      <Component>
-                        <Sheet
-                          styles="
- [data-focus-on-hidden] {
-   pointer-events: none !important;
- }
-"
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </div>
-        </OutsideEventDetector>
-      </EuiOutsideClickDetector>
+                  Job Info
+                </h2>
+              </EuiTitle>
+            </div>
+          </EuiFlyoutHeader>
+          <EuiFlyoutBody>
+            <div
+              className="euiFlyoutBody"
+            >
+              <div
+                className="euiFlyoutBody__overflow"
+              >
+                <div
+                  className="euiFlyoutBody__overflowContent"
+                >
+                  <EuiText>
+                    <div
+                      className="euiText euiText--medium"
+                    />
+                  </EuiText>
+                </div>
+              </div>
+            </div>
+          </EuiFlyoutBody>
+        </div>
+      </div>
     </EuiFocusTrap>
   </EuiFlyout>,
   <div
diff --git a/x-pack/plugins/security_solution/public/cases/components/tag_list/index.tsx b/x-pack/plugins/security_solution/public/cases/components/tag_list/index.tsx
index b5af1934f379c..eeb7c49eceab5 100644
--- a/x-pack/plugins/security_solution/public/cases/components/tag_list/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/tag_list/index.tsx
@@ -102,8 +102,8 @@ export const TagList = React.memo(
           <EuiBadgeGroup>
             {tags.length > 0 &&
               !isEditTags &&
-              tags.map((tag, key) => (
-                <EuiBadge data-test-subj={`case-tag-${tag}`} color="hollow">
+              tags.map((tag) => (
+                <EuiBadge data-test-subj={`case-tag-${tag}`} color="hollow" key={tag}>
                   {tag}
                 </EuiBadge>
               ))}
diff --git a/x-pack/plugins/security_solution/public/cases/components/user_action_tree/helpers.tsx b/x-pack/plugins/security_solution/public/cases/components/user_action_tree/helpers.tsx
index 1401ac2c46528..e343c3da6cc8b 100644
--- a/x-pack/plugins/security_solution/public/cases/components/user_action_tree/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/user_action_tree/helpers.tsx
@@ -53,7 +53,7 @@ const getTagsLabelTitle = (action: CaseUserActions) => (
     <EuiBadgeGroup>
       {action.newValue != null &&
         action.newValue.split(',').map((tag) => (
-          <EuiBadge data-test-subj={`ua-tag`} color="default">
+          <EuiBadge data-test-subj={`ua-tag`} color="default" key={tag}>
             {tag}
           </EuiBadge>
         ))}
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
index f441baaec7d80..9720a325ce418 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
@@ -122,7 +122,11 @@ const ExceptionEntriesComponent = ({
             return (
               <ValueBadgeGroup gutterSize="xs">
                 {values.map((value) => {
-                  return <EuiBadge color="#DDD">{value}</EuiBadge>;
+                  return (
+                    <EuiBadge color="#DDD" key={value}>
+                      {value}
+                    </EuiBadge>
+                  );
                 })}
               </ValueBadgeGroup>
             );
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
index 917c41b998dec..a8e8117d85f5f 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
@@ -65,7 +65,7 @@ export const setup = async (): Promise<HomeTestBed> => {
     await act(async () => {
       const { href } = repositoryLink.props();
       router.navigateTo(href!);
-      await nextTick();
+      await nextTick(10);
       component.update();
     });
   };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6a7737d367005..b1e24958d5365 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -9934,7 +9934,6 @@
     "xpack.lens.indexPattern.fieldStatsButtonLabel": "フィールドプレビューを表示するには、クリックします。可視化するには、ドラッグアンドドロップします。",
     "xpack.lens.indexPattern.fieldStatsCountLabel": "カウント",
     "xpack.lens.indexPattern.fieldStatsDisplayToggle": "次のどちらかを切り替えます:",
-    "xpack.lens.indexPattern.fieldStatsNoData": "表示するデータがありません",
     "xpack.lens.indexPattern.fieldTimeDistributionLabel": "時間分布",
     "xpack.lens.indexPattern.fieldTopValuesLabel": "トップの値",
     "xpack.lens.indexPattern.groupByDropdown": "グループ分けの条件",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 4d0186141f38d..82abb924611fb 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9937,7 +9937,6 @@
     "xpack.lens.indexPattern.fieldStatsButtonLabel": "单击以进行字段预览，或拖放以进行可视化。",
     "xpack.lens.indexPattern.fieldStatsCountLabel": "计数",
     "xpack.lens.indexPattern.fieldStatsDisplayToggle": "切换",
-    "xpack.lens.indexPattern.fieldStatsNoData": "没有可显示的数据",
     "xpack.lens.indexPattern.fieldTimeDistributionLabel": "时间分布",
     "xpack.lens.indexPattern.fieldTopValuesLabel": "排名最前值",
     "xpack.lens.indexPattern.groupByDropdown": "分组依据",
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
index 97927a71118d5..b2f69b1676fb5 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
@@ -80,190 +80,173 @@ exports[`ML Flyout component renders without errors 1`] = `
 `;
 
 exports[`ML Flyout component shows license info if no ml available 1`] = `
-<div>
-  <div
-    data-focus-guard="true"
-    style="width:1px;height:0px;padding:0;overflow:hidden;position:fixed;top:1px;left:1px"
-    tabindex="-1"
-  />
-  <div
-    data-focus-guard="true"
-    style="width:1px;height:0px;padding:0;overflow:hidden;position:fixed;top:1px;left:1px"
-    tabindex="-1"
-  />
+<div
+  data-eui="EuiFocusTrap"
+>
   <div
-    data-focus-lock-disabled="disabled"
+    class="euiFlyout euiFlyout--small"
+    data-test-subj="uptimeMLFlyout"
+    role="dialog"
+    tabindex="0"
   >
+    <button
+      aria-label="Close this dialog"
+      class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
+      data-test-subj="euiFlyoutCloseButton"
+      type="button"
+    >
+      <div
+        aria-hidden="true"
+        class="euiButtonIcon__icon"
+        data-euiicon-type="cross"
+      />
+    </button>
     <div
-      class="euiFlyout euiFlyout--small"
-      data-test-subj="uptimeMLFlyout"
-      role="dialog"
-      tabindex="0"
+      class="euiFlyoutHeader"
     >
-      <button
-        aria-label="Close this dialog"
-        class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-        data-test-subj="euiFlyoutCloseButton"
-        type="button"
+      <h2
+        class="euiTitle euiTitle--medium"
       >
-        <div
-          aria-hidden="true"
-          class="euiButtonIcon__icon"
-          data-euiicon-type="cross"
-        />
-      </button>
+        Enable anomaly detection
+      </h2>
       <div
-        class="euiFlyoutHeader"
-      >
-        <h2
-          class="euiTitle euiTitle--medium"
-        >
-          Enable anomaly detection
-        </h2>
-        <div
-          class="euiSpacer euiSpacer--s"
-        />
-      </div>
+        class="euiSpacer euiSpacer--s"
+      />
+    </div>
+    <div
+      class="euiFlyoutBody"
+    >
       <div
-        class="euiFlyoutBody"
+        class="euiFlyoutBody__overflow"
       >
         <div
-          class="euiFlyoutBody__overflow"
+          class="euiFlyoutBody__overflowContent"
         >
           <div
-            class="euiFlyoutBody__overflowContent"
+            class="euiCallOut euiCallOut--primary license-info-trial"
+            data-test-subj="uptimeMLLicenseInfo"
           >
             <div
-              class="euiCallOut euiCallOut--primary license-info-trial"
-              data-test-subj="uptimeMLLicenseInfo"
+              class="euiCallOutHeader"
             >
               <div
-                class="euiCallOutHeader"
-              >
-                <div
-                  aria-hidden="true"
-                  class="euiCallOutHeader__icon"
-                  data-euiicon-type="help"
-                />
-                <span
-                  class="euiCallOutHeader__title"
-                >
-                  Start free 14-day trial
-                </span>
-              </div>
-              <div
-                class="euiText euiText--small"
+                aria-hidden="true"
+                class="euiCallOutHeader__icon"
+                data-euiicon-type="help"
+              />
+              <span
+                class="euiCallOutHeader__title"
               >
-                <p>
-                  In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
-                </p>
-                <span>
-                  <a
-                    class="euiButton euiButton--primary"
-                    href="/app/management/stack/license_management/home"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    <span
-                      class="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        class="euiButton__text"
-                      >
-                        Start free 14-day trial
-                      </span>
-                    </span>
-                  </a>
-                </span>
-              </div>
+                Start free 14-day trial
+              </span>
             </div>
             <div
-              class="euiSpacer euiSpacer--l"
-            />
-            <div
-              class="euiText euiText--medium"
+              class="euiText euiText--small"
             >
               <p>
-                Here you can create a machine learning job to calculate anomaly scores on
-    response durations for Uptime Monitor. Once enabled, the monitor duration chart on the details page
-    will show the expected bounds and annotate the graph with anomalies. You can also potentially
-     identify periods of increased latency across geographical regions.
+                In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
               </p>
-              <p>
-                Once a job is created, you can manage it and see more details in the 
+              <span>
                 <a
-                  class="euiLink euiLink--primary"
-                  href="/app/ml"
-                  rel="noreferrer"
+                  class="euiButton euiButton--primary"
+                  href="/app/management/stack/license_management/home"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  Machine Learning jobs management page
+                  <span
+                    class="euiButtonContent euiButton__content"
+                  >
+                    <span
+                      class="euiButton__text"
+                    >
+                      Start free 14-day trial
+                    </span>
+                  </span>
                 </a>
-                .
-              </p>
-              <p>
-                <em>
-                  Note: It might take a few minutes for the job to begin calculating results.
-                </em>
-              </p>
+              </span>
             </div>
-            <div
-              class="euiSpacer euiSpacer--l"
-            />
           </div>
+          <div
+            class="euiSpacer euiSpacer--l"
+          />
+          <div
+            class="euiText euiText--medium"
+          >
+            <p>
+              Here you can create a machine learning job to calculate anomaly scores on
+    response durations for Uptime Monitor. Once enabled, the monitor duration chart on the details page
+    will show the expected bounds and annotate the graph with anomalies. You can also potentially
+     identify periods of increased latency across geographical regions.
+            </p>
+            <p>
+              Once a job is created, you can manage it and see more details in the 
+              <a
+                class="euiLink euiLink--primary"
+                href="/app/ml"
+                rel="noreferrer"
+              >
+                Machine Learning jobs management page
+              </a>
+              .
+            </p>
+            <p>
+              <em>
+                Note: It might take a few minutes for the job to begin calculating results.
+              </em>
+            </p>
+          </div>
+          <div
+            class="euiSpacer euiSpacer--l"
+          />
         </div>
       </div>
+    </div>
+    <div
+      class="euiFlyoutFooter"
+    >
       <div
-        class="euiFlyoutFooter"
+        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexItem euiFlexItem--flexGrowZero"
         >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+          <button
+            class="euiButtonEmpty euiButtonEmpty--primary"
+            type="button"
           >
-            <button
-              class="euiButtonEmpty euiButtonEmpty--primary"
-              type="button"
+            <span
+              class="euiButtonContent euiButtonEmpty__content"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__text"
               >
-                <span
-                  class="euiButtonEmpty__text"
-                >
-                  Cancel
-                </span>
+                Cancel
               </span>
-            </button>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            </span>
+          </button>
+        </div>
+        <div
+          class="euiFlexItem euiFlexItem--flexGrowZero"
+        >
+          <button
+            class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+            data-test-subj="uptimeMLCreateJobBtn"
+            disabled=""
+            type="button"
           >
-            <button
-              class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
-              data-test-subj="uptimeMLCreateJobBtn"
-              disabled=""
-              type="button"
+            <span
+              class="euiButtonContent euiButton__content"
             >
               <span
-                class="euiButtonContent euiButton__content"
+                class="euiButton__text"
               >
-                <span
-                  class="euiButton__text"
-                >
-                  Create new job
-                </span>
+                Create new job
               </span>
-            </button>
-          </div>
+            </span>
+          </button>
         </div>
       </div>
     </div>
   </div>
-  <div
-    data-focus-guard="true"
-    style="width:1px;height:0px;padding:0;overflow:hidden;position:fixed;top:1px;left:1px"
-    tabindex="-1"
-  />
 </div>
 `;
diff --git a/yarn.lock b/yarn.lock
index ed9dda820d66a..f00bee1d13dc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1229,10 +1229,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@27.4.0":
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-27.4.0.tgz#4a96a6ac827f53c879451a3eeec093287fcc7255"
-  integrity sha512-wMr52SAWu5MwKUAIMb5Vfz2mw7VwKWuNxBaMlnmBKTo0WK7Trlp8cUyVTVZYy96p1MKyqDvKH6FxVDJ8JZVb6w==
+"@elastic/eui@27.4.1":
+  version "27.4.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-27.4.1.tgz#9803f6f6c6997c769720381f521e5319ef07a599"
+  integrity sha512-eGztErFlvkwI4BFxDs6tFBGFiN15NQdJdRHvSi5caOQFGabuR8XCRNUWcNFHlwKVJaDaGsJRuwbbSLh9XdWubQ==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.116"