diff --git a/client/components/Dropdown.jsx b/client/components/Dropdown.jsx
index 48490f9c..5ca33ab1 100644
--- a/client/components/Dropdown.jsx
+++ b/client/components/Dropdown.jsx
@@ -13,8 +13,9 @@ const DropdownWrapper = styled.ul`
   color: ${prop('primaryTextColor')};
 
   position: absolute;
-  top: ${remSize(64)};
-  right: ${remSize(16)};
+  right: ${props => (props.right ? 0 : 'initial')};
+  left: ${props => (props.left ? 0 : 'initial')};
+
 
   text-align: left;
   width: ${remSize(180)};
@@ -56,8 +57,8 @@ const DropdownWrapper = styled.ul`
 // TODO: Add Icon to the left of the items in the menu
 // const MaybeIcon = (Element, label) => Element && <Element aria-label={label} />;
 
-const Dropdown = ({ items }) => (
-  <DropdownWrapper>
+const Dropdown = ({ items, right, left }) => (
+  <DropdownWrapper right={right} left={left}>
     {/* className="nav__items-left" */}
     {items && items.map(({ title, icon, href }) => (
       <li key={`nav-${title && title.toLowerCase()}`}>
@@ -72,6 +73,8 @@ const Dropdown = ({ items }) => (
 );
 
 Dropdown.propTypes = {
+  right: PropTypes.bool,
+  left: PropTypes.bool,
   items: PropTypes.arrayOf(PropTypes.shape({
     action: PropTypes.func,
     icon: PropTypes.func,
@@ -81,6 +84,8 @@ Dropdown.propTypes = {
 
 Dropdown.defaultProps = {
   items: [],
+  right: false,
+  left: false,
 };
 
 export default Dropdown;
diff --git a/client/components/OverlayManager.jsx b/client/components/OverlayManager.jsx
index 53025a7e..1b3b040c 100644
--- a/client/components/OverlayManager.jsx
+++ b/client/components/OverlayManager.jsx
@@ -1,45 +1,15 @@
-import React, { useRef, useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { createPortal } from 'react-dom';
 
-import Dropdown from './Dropdown';
-
-import { PreferencesIcon } from '../common/icons';
-
 const OverlayManager = ({ overlay, hideOverlay }) => {
-  const ref = useRef({});
-
-  const handleClickOutside = ({ target }) => {
-    if (ref && ref.current && !ref.current.contains(target)) {
-      hideOverlay();
-    }
-  };
-
-  useEffect(() => {
-    document.addEventListener('mousedown', handleClickOutside);
-
-    return () => document.removeEventListener('mousedown', handleClickOutside);
-  }, [ref]);
-
-  const headerNavOptions = [
-    {
-      icon: PreferencesIcon,
-      title: 'Preferences',
-      href: '/mobile/preferences',
-    },
-    { icon: PreferencesIcon, title: 'Examples', href: '/mobile/examples' },
-    {
-      icon: PreferencesIcon,
-      title: 'Original Editor',
-      href: '/mobile/preferences',
-    },
-  ];
+  // const [visible, trigger, setRef] = useModalBehavior();
 
   const jsx = (
     <React.Fragment>
-      <div ref={(r) => { ref.current = r; }} >
-        {overlay === 'dropdown' && <Dropdown items={headerNavOptions} />}
-      </div>
+      {/* <div ref={setRef} >
+        {visible && <Dropdown items={headerNavOptions} />}
+      </div> */}
     </React.Fragment>
   );
 
diff --git a/client/components/mobile/Header.jsx b/client/components/mobile/Header.jsx
index 9a40f170..bd223e91 100644
--- a/client/components/mobile/Header.jsx
+++ b/client/components/mobile/Header.jsx
@@ -37,7 +37,9 @@ const HeaderDiv = styled.div`
 
 const IconContainer = styled.div`
   margin-left: ${props => (props.leftButton ? remSize(32) : remSize(4))};
+  list-style: none;
   display: flex;
+  flex-direction: horizontal;
 `;
 
 
diff --git a/client/modules/IDE/components/Searchbar/Searchbar.jsx b/client/modules/IDE/components/Searchbar/Searchbar.jsx
index b81b3bea..765a240d 100644
--- a/client/modules/IDE/components/Searchbar/Searchbar.jsx
+++ b/client/modules/IDE/components/Searchbar/Searchbar.jsx
@@ -23,20 +23,13 @@ class Searchbar extends React.Component {
     });
   }
 
-  handleSearchEnter = (e) => {
-    if (e.key === 'Enter') {
-      this.searchChange();
-    }
-  }
-
   searchChange = () => {
-    if (this.state.searchValue.trim().length === 0) return;
     this.props.setSearchTerm(this.state.searchValue.trim());
   };
 
   handleSearchChange = (e) => {
     this.setState({ searchValue: e.target.value }, () => {
-      this.throttledSearchChange(this.state.searchValue);
+      this.throttledSearchChange(this.state.searchValue.trim());
     });
   }
 
@@ -53,7 +46,6 @@ class Searchbar extends React.Component {
           value={searchValue}
           placeholder={this.props.searchLabel}
           onChange={this.handleSearchChange}
-          onKeyUp={this.handleSearchEnter}
         />
         <button
           className="searchbar__clear-button"
diff --git a/client/modules/IDE/pages/MobileIDEView.jsx b/client/modules/IDE/pages/MobileIDEView.jsx
index 7a174e89..86cd1766 100644
--- a/client/modules/IDE/pages/MobileIDEView.jsx
+++ b/client/modules/IDE/pages/MobileIDEView.jsx
@@ -29,8 +29,11 @@ import Footer from '../../../components/mobile/Footer';
 import IDEWrapper from '../../../components/mobile/IDEWrapper';
 import Console from '../components/Console';
 import { remSize } from '../../../theme';
-import OverlayManager from '../../../components/OverlayManager';
+// import OverlayManager from '../../../components/OverlayManager';
 import ActionStrip from '../../../components/mobile/ActionStrip';
+import { useAsModal } from '../../../utils/custom-hooks';
+import { PreferencesIcon } from '../../../common/icons';
+import Dropdown from '../../../components/Dropdown';
 
 const isUserOwner = ({ project, user }) =>
   project.owner && project.owner.id === user.id;
@@ -39,6 +42,16 @@ const Expander = styled.div`
   height: ${props => (props.expanded ? remSize(160) : remSize(27))};
 `;
 
+const NavItem = styled.li`
+  position: relative;
+`;
+
+const headerNavOptions = [
+  { icon: PreferencesIcon, title: 'Preferences', href: '/mobile/preferences', },
+  { icon: PreferencesIcon, title: 'Examples', href: '/mobile/examples' },
+  { icon: PreferencesIcon, title: 'Original Editor', href: '/', },
+];
+
 
 const MobileIDEView = (props) => {
   const {
@@ -67,11 +80,9 @@ const MobileIDEView = (props) => {
   } = props;
 
   const [tmController, setTmController] = useState(null); // eslint-disable-line
-  const [overlayName, setOverlay] = useState(null); // eslint-disable-line
 
-  // TODO: Move this to OverlayController (?)
-  const hideOverlay = () => setOverlay(null);
-  // const overlayRef = useRef({});
+
+  const [triggerNavDropdown, NavDropDown] = useAsModal(<Dropdown right items={headerNavOptions} />);
 
   return (
     <Screen fullscreen>
@@ -86,19 +97,17 @@ const MobileIDEView = (props) => {
           />
         }
       >
-        <IconButton
-          onClick={() => setOverlay('dropdown')}
-          icon={MoreIcon}
-          aria-label="Options"
-        />
-        <IconButton
-          to="/mobile/preview"
-          onClick={() => {
-            startSketch();
-          }}
-          icon={PlayIcon}
-          aria-label="Run sketch"
-        />
+        <NavItem>
+          <IconButton
+            onClick={triggerNavDropdown}
+            icon={MoreIcon}
+            aria-label="Options"
+          />
+          <NavDropDown />
+        </NavItem>
+        <li>
+          <IconButton to="/mobile/preview" onClick={() => { startSketch(); }} icon={PlayIcon} aria-label="Run sketch" />
+        </li>
       </Header>
 
       <IDEWrapper>
@@ -116,9 +125,7 @@ const MobileIDEView = (props) => {
           editorOptionsVisible={ide.editorOptionsVisible}
           showEditorOptions={showEditorOptions}
           closeEditorOptions={closeEditorOptions}
-          showKeyboardShortcutModal={showKeyboardShortcutModal}
-          setUnsavedChanges={setUnsavedChanges}
-          isPlaying={ide.isPlaying}
+          showKeyboard={ide.isPlaying}
           theme={preferences.theme}
           startRefreshSketch={startRefreshSketch}
           stopSketch={stopSketch}
@@ -146,12 +153,6 @@ const MobileIDEView = (props) => {
         )}
         <ActionStrip />
       </Footer>
-
-      <OverlayManager
-        // ref={overlayRef}
-        overlay={overlayName}
-        hideOverlay={hideOverlay}
-      />
     </Screen>
   );
 };
diff --git a/client/modules/Mobile/MobileSketchView.jsx b/client/modules/Mobile/MobileSketchView.jsx
index 9e24d159..4d31c172 100644
--- a/client/modules/Mobile/MobileSketchView.jsx
+++ b/client/modules/Mobile/MobileSketchView.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
-import { connect, useSelector, useDispatch } from 'react-redux';
+import { useSelector, useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import Header from '../../components/mobile/Header';
 import IconButton from '../../components/mobile/IconButton';
@@ -21,7 +20,7 @@ import { remSize } from '../../theme';
 import Footer from '../../components/mobile/Footer';
 import Content from './MobileViewContent';
 
-const MobileSketchView = (props) => {
+const MobileSketchView = () => {
   const { files, ide, preferences } = useSelector(state => state);
 
   const htmlFile = useSelector(state => getHTMLFile(state.files));
diff --git a/client/utils/custom-hooks.js b/client/utils/custom-hooks.js
index 7e0a7b8f..2776b5bf 100644
--- a/client/utils/custom-hooks.js
+++ b/client/utils/custom-hooks.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useMemo, useState } from 'react';
 
 export const noop = () => {};
 
@@ -13,3 +13,39 @@ export const useDidUpdate = (callback, deps) => {
     }
   }, deps);
 };
+
+// Usage: const ref = useModalBehavior(() => setSomeState(false))
+// place this ref on a component
+export const useModalBehavior = (hideOverlay) => {
+  const ref = useRef({});
+
+  // Return values
+  const setRef = (r) => { ref.current = r; };
+  const [visible, setVisible] = useState(true);
+  const trigger = () => setVisible(true);
+
+  const hide = () => setVisible(false);
+
+
+  const handleClickOutside = ({ target }) => {
+    if (ref && ref.current && !ref.current.contains(target)) {
+      hide();
+    }
+  };
+
+  useEffect(() => {
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, [ref]);
+
+  return [visible, trigger, setRef];
+};
+
+// TODO: This is HOC, not a hook. Where do we put it?
+export const useAsModal = (component) => {
+  const [visible, trigger, setRef] = useModalBehavior();
+
+  const wrapper = () => (<div ref={setRef}> {visible && component} </div>); // eslint-disable-line
+
+  return [trigger, wrapper];
+};
diff --git a/developer_docs/installation.md b/developer_docs/installation.md
index fce3e44f..2a788c02 100644
--- a/developer_docs/installation.md
+++ b/developer_docs/installation.md
@@ -25,7 +25,7 @@ _Note_: The installation steps assume you are using a Unix-like shell. If you ar
    * For Mac OSX with [homebrew](http://brew.sh/): `brew tap mongodb/brew` then `brew install mongodb-community` and finally start the server with `brew services start mongodb-community` or you can visit the installation guide here [Installation Guide For MacOS](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x/)
    * For Windows and Linux: [MongoDB Installation](https://docs.mongodb.com/manual/installation/)
 7. `$ cp .env.example .env`
-8. (Optional) Update `.env` with necessary keys to enable certain app behavoirs, i.e. add Github ID and Github Secret if you want to be able to log in with Github.
+8. (Optional) Update `.env` with necessary keys to enable certain app behaviors, i.e. add Github ID and Github Secret if you want to be able to log in with Github.
 9. `$ npm run fetch-examples` - this downloads the example sketches into a user called 'p5'
 10. `$ npm start`
 11. Navigate to [http://localhost:8000](http://localhost:8000) in your browser