diff --git a/embark-ui/src/components/FileExplorer.js b/embark-ui/src/components/FileExplorer.js
index 6d8212bff..9eacaf060 100644
--- a/embark-ui/src/components/FileExplorer.js
+++ b/embark-ui/src/components/FileExplorer.js
@@ -177,7 +177,7 @@ class FileExplorer extends React.Component {
 
   render() {
     return (
-      <React.Fragment>
+      <div className="h-100 d-flex flex-column">
         <Form.Switch type="checkbox" name="toggle" value={true} label="Show hidden files" onChange={this.onHiddenToggle.bind(this)} />
         <Treebeard
           data={this.filterHidden(this.props.files)}
@@ -185,7 +185,7 @@ class FileExplorer extends React.Component {
           onToggle={this.onToggle.bind(this)}
           style={style}
         />
-      </React.Fragment>
+      </div>
     );
   }
 }
diff --git a/embark-ui/src/components/Preview.js b/embark-ui/src/components/Preview.js
index 2882d23eb..a63153eb8 100644
--- a/embark-ui/src/components/Preview.js
+++ b/embark-ui/src/components/Preview.js
@@ -28,7 +28,7 @@ class Preview extends React.Component {
 
   render() {
     return (
-      <Form.Group className='h-100'>
+      <div className='h-100 d-flex flex-column'>
         <Form.InputGroup>
           <Form.Input placeholder="URL"
                       value={this.state.previewUrl}
@@ -44,7 +44,7 @@ class Preview extends React.Component {
                 ref={(iframe) => this.previewIframe = iframe}
                 onLoad={(e) => this.handlePreviewChange(e)} src={this.state.previewUrl}>
         </iframe>
-      </Form.Group>
+      </div>
     );
   }
 }
diff --git a/embark-ui/src/components/TextEditor.js b/embark-ui/src/components/TextEditor.js
index 4a60092e0..56ef9ea22 100644
--- a/embark-ui/src/components/TextEditor.js
+++ b/embark-ui/src/components/TextEditor.js
@@ -81,11 +81,11 @@ class TextEditor extends React.Component {
   }
 
   render() {
-    const style = {
-      height: "100%"
-    };
-
-    return <div style={style} id={EDITOR_ID} />;
+    return (
+      <div className="h-100 d-flex flex-column">
+        <div style={{height: '100%'}} id={EDITOR_ID} />
+      </div>
+    )
   }
 }
 
diff --git a/embark-ui/src/general.css b/embark-ui/src/index.css
similarity index 97%
rename from embark-ui/src/general.css
rename to embark-ui/src/index.css
index bebdfa65c..5073f69d4 100644
--- a/embark-ui/src/general.css
+++ b/embark-ui/src/index.css
@@ -1,3 +1,7 @@
+.app-body {
+  overflow-x: unset;
+}
+
 .logs {
   margin: 10px 0;
   background-color: #333333;
diff --git a/embark-ui/src/index.js b/embark-ui/src/index.js
index 4f5325cbc..9e9dd9219 100644
--- a/embark-ui/src/index.js
+++ b/embark-ui/src/index.js
@@ -5,6 +5,7 @@ import {Provider} from 'react-redux';
 
 import 'font-awesome/css/font-awesome.min.css';
 import '@coreui/coreui/dist/css/coreui.min.css';
+import './index.css';
 
 import AppContainer from './containers/AppContainer';
 import history from "./history";