diff --git a/src/App.css b/src/App.css
index be08fb6..2d47b5f 100644
--- a/src/App.css
+++ b/src/App.css
@@ -69,6 +69,11 @@ code {
   white-space: nowrap;
 }
 
+.menu-right {
+  display: flex;
+  align-items: center;
+}
+
 .page {
   display: flex;
   flex-direction: row;
@@ -131,10 +136,17 @@ code {
   }
 }
 
+.right-pane-top {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
 .spinner {
-  margin-top: 30vh;
   display: flex;
   justify-content: center;
+  align-items: center;
+  flex: 1;
 }
 
 .statistics {
diff --git a/src/Menu.jsx b/src/Menu.jsx
index de48ef9..c4b9b9b 100644
--- a/src/Menu.jsx
+++ b/src/Menu.jsx
@@ -91,38 +91,40 @@ export default function Menu({ connected, notifyRun, notifySampleChange, program
         {getDropDown()}
       </Form>
 
-      <div className="links">
-        <a href="https://flix.dev/">
-          <Button color="link" className="ml-3">
-            Website
-          </Button>
-        </a>
+      <div className="menu-right">
+        <div className="links">
+          <a href="https://flix.dev/">
+            <Button color="link" className="ml-3">
+              Website
+            </Button>
+          </a>
 
-        <a href="https://doc.flix.dev/">
-          <Button color="link" className="ml-3">
-            Documentation
-          </Button>
-        </a>
+          <a href="https://doc.flix.dev/">
+            <Button color="link" className="ml-3">
+              Documentation
+            </Button>
+          </a>
+
+          <a href="https://api.flix.dev/">
+            <Button color="link" className="ml-3">
+              Standard Library
+            </Button>
+          </a>
 
-        <a href="https://api.flix.dev/">
-          <Button color="link" className="ml-3">
-            Standard Library
+          <Button color="light" className="ml-3" onClick={updateLinkUrl}>
+            Shareable Link <i className="fa fa-clipboard ml-2" />
           </Button>
-        </a>
+        </div>
 
-        <Button color="light" className="ml-3" onClick={updateLinkUrl}>
-          Shareable Link <i className="fa fa-clipboard ml-2" />
+        <Button
+          color="light"
+          onClick={toggleDarkMode}
+          style={{ width: '38px', height: '38px', padding: 0, marginLeft: '0.5rem' }}
+          title={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
+        >
+          <i className={isDark ? 'fa fa-sun-o' : 'fa fa-moon-o'} />
         </Button>
       </div>
-
-      <Button
-        color="light"
-        onClick={toggleDarkMode}
-        style={{ width: '38px', height: '38px', padding: 0, marginLeft: '0.5rem' }}
-        title={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
-      >
-        <i className={isDark ? 'fa fa-sun-o' : 'fa fa-moon-o'} />
-      </Button>
     </div>
   )
 }