diff --git a/components/Editor.js b/components/Editor.js
index a3404bf..8e9b2e5 100644
--- a/components/Editor.js
+++ b/components/Editor.js
@@ -449,7 +449,7 @@ class Editor extends React.Component {
             .toolbar-second-row {
               height: 40px;
               display: flex;
-              flex: 1;
+              flex: 1 1 auto;
             }
             .toolbar-second-row > :global(div:not(:last-of-type)) {
               margin-right: 0.5rem;
diff --git a/components/Page.js b/components/Page.js
index c8ee2b1..1596f4a 100644
--- a/components/Page.js
+++ b/components/Page.js
@@ -16,7 +16,7 @@ class Page extends React.Component {
   render() {
     const { children, enableHeroText, flex } = this.props
     return (
-      <main className="main mt4 mb4">
+      <main className="main mb3">
         <Meta />
         <AuthContext>
           <Announcement />
@@ -33,6 +33,7 @@ class Page extends React.Component {
           {`
             .main {
               ${flex ? COLUMN : ''}
+              margin-top: 6rem;
             }
             .login-button-container {
               position: absolute;
@@ -42,7 +43,6 @@ class Page extends React.Component {
             @media (min-width: 1024px) {
               .main {
                 ${COLUMN};
-                min-width: 1080px; /* temporary fix for mobile overflow issue */
               }
             }
           `}
diff --git a/components/Toolbar.js b/components/Toolbar.js
index e06a3be..4dd8d5d 100644
--- a/components/Toolbar.js
+++ b/components/Toolbar.js
@@ -23,7 +23,7 @@ const Toolbar = props => (
           margin-right: 0px;
         }
 
-        @media (max-width: 768px) {
+        @media (max-width: 920px) {
           .toolbar {
             max-width: 100%;
             height: auto;
diff --git a/components/style/Typography.js b/components/style/Typography.js
index f44e80b..c6d0776 100644
--- a/components/style/Typography.js
+++ b/components/style/Typography.js
@@ -32,7 +32,6 @@ export default () => (
       body {
         font-size: var(--h4);
         line-height: var(--lh);
-        margin: 6rem 0;
       }
 
       h1,