diff --git a/desktop/app/src/App.tsx b/desktop/app/src/App.tsx
index dbcfcc71d..39e38ff50 100644
--- a/desktop/app/src/App.tsx
+++ b/desktop/app/src/App.tsx
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import {FlexColumn, FlexRow, styled} from 'flipper';
+import {FlexRow, styled, Layout} from 'flipper';
 import {connect} from 'react-redux';
 import TitleBar from './chrome/TitleBar';
 import MainSidebar2 from './chrome/mainsidebar/MainSidebar2';
@@ -65,19 +65,16 @@ type DispatchProps = {
   setActiveSheet: typeof setActiveSheet;
 };
 
-const MainContent = styled(FlexColumn)({
-  height: 'calc(100vh - 38px)',
-});
-
+/**
+ * This wrapper is only needed for hacky plugins that place contents out of
+ * contents, like hermes debugger
+ */
 const PluginContent = styled(FlexRow)({
   width: '100%',
   height: '100%',
   position: 'relative',
 });
-
 PluginContent.displayName = 'App:PluginContent';
-MainContent.displayName = 'App:MainContent';
-
 type Props = StateFromProps & OwnProps & DispatchProps;
 
 export class App extends React.Component<Props> {
@@ -152,13 +149,17 @@ export class App extends React.Component<Props> {
 
   render() {
     return (
-      <FlexColumn grow={true}>
-        <TitleBar version={version} />
-        <Sheet>{this.getSheet}</Sheet>
-        <MainContent>
-          <DoctorBar />
-          <ErrorBar />
-          <FlexRow grow scrollable>
+      <Layout.Top>
+        <Layout.Top>
+          <TitleBar version={version} />
+          <>
+            <Sheet>{this.getSheet}</Sheet>
+            <DoctorBar />
+            <ErrorBar />
+          </>
+        </Layout.Top>
+        <Layout.Bottom>
+          <Layout.Left>
             {this.props.leftSidebarVisible && <MainSidebar2 />}
             <PluginContent>
               {this.props.staticView != null ? (
@@ -180,10 +181,10 @@ export class App extends React.Component<Props> {
                 }}
               />
             </PluginContent>
-          </FlexRow>
-        </MainContent>
-        <StatusBar />
-      </FlexColumn>
+          </Layout.Left>
+          <StatusBar />
+        </Layout.Bottom>
+      </Layout.Top>
     );
   }
 }
diff --git a/desktop/static/icons.json b/desktop/static/icons.json
index 4b4b44598..d71fbec70 100644
--- a/desktop/static/icons.json
+++ b/desktop/static/icons.json
@@ -430,5 +430,8 @@
   ],
   "line-chart": [
     12
+  ],
+  "caution-circle": [
+    12
   ]
 }
\ No newline at end of file