diff --git a/packages/freesewing.lab/components/layouts/bare.js b/packages/freesewing.lab/components/layouts/bare.js
index f26b9bca699..e2c0953cbba 100644
--- a/packages/freesewing.lab/components/layouts/bare.js
+++ b/packages/freesewing.lab/components/layouts/bare.js
@@ -5,6 +5,7 @@ import Link from 'next/link'
 import Logo from 'shared/components/logos/freesewing.js'
 import Aside from 'shared/components/navigation/aside'
 import get from 'lodash.get'
+import { BeforeNav } from './lab'
 
 const PageTitle = ({ app, slug, title }) => {
   if (title) return <h1>{title}</h1>
@@ -56,10 +57,10 @@ const Breadcrumbs = ({ app, slug=false, title }) => {
 const DefaultLayout = ({ app, title=false, children=[] }) => {
   const router = useRouter()
   const slug = router.asPath.slice(1)
-
+console.log(BeforeNav)
   return (
     <>
-      <Aside app={app} slug={slug} mobileOnly />
+      <Aside app={app} slug={slug} before={<BeforeNav app={app}/>} mobileOnly />
       {children}
     </>
   )
diff --git a/packages/freesewing.lab/components/layouts/lab.js b/packages/freesewing.lab/components/layouts/lab.js
index 88a11b9dec7..b460248a007 100644
--- a/packages/freesewing.lab/components/layouts/lab.js
+++ b/packages/freesewing.lab/components/layouts/lab.js
@@ -1,3 +1,21 @@
+import ThemePicker from 'shared/components/theme-picker.js'
+import LocalePicker from 'shared/components/locale-picker.js'
+import PatternPicker from 'site/components/pattern-picker.js'
+import VersionPicker from 'site/components/version-picker.js'
+
+export const BeforeNav = ({ app }) => (
+  <>
+    <div className="md:hidden flex flex-row flex-wrap sm:flex-nowrap gap-2 mb-2">
+      <ThemePicker app={app} />
+      <LocalePicker app={app} />
+    </div>
+    <div className="md:hidden flex flex-row flex-wrap sm:flex-nowrap gap-2 mb-2">
+      <PatternPicker app={app} />
+      <VersionPicker app={app} />
+    </div>
+  </>
+)
+
 const LabLayout = ({ app, AltMenu, children=[] }) => (
   <div className="py-24 lg:py-36 flex flex-row">
     <div className="w-full px-8">
@@ -24,6 +42,7 @@ const LabLayout = ({ app, AltMenu, children=[] }) => (
       lg:w-96
       shrink-0
     `}>
+      <BeforeNav app={app}/>
       {AltMenu}
     </aside>
   </div>
diff --git a/packages/freesewing.lab/components/pattern-picker.js b/packages/freesewing.lab/components/pattern-picker.js
index 7de30101ecc..f253efa8a29 100644
--- a/packages/freesewing.lab/components/pattern-picker.js
+++ b/packages/freesewing.lab/components/pattern-picker.js
@@ -10,10 +10,10 @@ const PatternPicker = ({ app }) => {
   const version = useVersion()
 
   return (
-      <div className="dropdown">
+      <div className="dropdown w-full md:w-auto">
         <div tabIndex="0" className={`
-          m-0 btn btn-neutral flex flex-row gap-2
-          sm:btn-ghost
+          m-0 btn btn-neutral flex flex-row gap-2 btn-outline
+          md:btn-ghost
           hover:bg-neutral hover:border-neutral-content
         `}>
           <DesignIcon />
diff --git a/packages/freesewing.lab/components/version-picker.js b/packages/freesewing.lab/components/version-picker.js
index ecfcdd78643..d358d596fdc 100644
--- a/packages/freesewing.lab/components/version-picker.js
+++ b/packages/freesewing.lab/components/version-picker.js
@@ -24,10 +24,10 @@ const PatternPicker = ({ app }) => {
   const version = useVersion()
 
   return (
-      <div className="dropdown">
+      <div className="dropdown w-full md:w-auto">
         <div tabIndex="0" className={`
-          m-0 btn btn-neutral flex flex-row gap-2
-          sm:btn-ghost
+          m-0 btn btn-neutral flex flex-row gap-2 btn-outline
+          md:btn-ghost
           hover:bg-neutral hover:border-neutral-content
         `}>
           <VersionsIcon />
diff --git a/packages/freesewing.lab/components/wrappers/layout.js b/packages/freesewing.lab/components/wrappers/layout.js
index 095e8332197..77ccdb7fd16 100644
--- a/packages/freesewing.lab/components/wrappers/layout.js
+++ b/packages/freesewing.lab/components/wrappers/layout.js
@@ -11,7 +11,6 @@ import Left from 'shared/components/icons/left.js'
 // Site components
 import Header from 'site/components/header'
 import Footer from 'site/components/footer'
-import Search from 'site/components/search'
 
 export const PageTitle = ({ app, slug, title }) => {
   if (title) return <h1>{title}</h1>
@@ -60,30 +59,18 @@ export const Breadcrumbs = ({ app, slug=false, title }) => {
   )
 }
 
-const LayoutWrapper = ({
-  app,
-  title=false,
-  children=[],
-  search,
-  setSearch,
-  noSearch=false,
-  workbench=false,
-  AltMenu=null,
-}) => {
+const LayoutWrapper = ({ app, title=false, children=[] }) => {
+
   const startNavigation = () => {
     app.startLoading()
     // Force close of menu on mobile if it is open
     if (app.primaryNavigation) app.setPrimaryNavigation(false)
-    // Force close of search modal if it is open
-    if (search) setSearch(false)
   }
 
   const router = useRouter()
   router.events?.on('routeChangeStart', startNavigation)
-  router.events?.on('routeChangeComplete', () => app.stopLoading())
+  router.events?.on('routeChangeComplete', app.stopLoading)
   const slug = router.asPath.slice(1)
-  const [collapsePrimaryNav, setCollapsePrimaryNav] = useState(workbench || false)
-  const [collapseAltMenu, setCollapseAltMenu] = useState(false)
 
   return (
     <div className={`
@@ -91,22 +78,8 @@ const LayoutWrapper = ({
     min-h-screen
     bg-base-100
     `}>
-      <Header app={app} setSearch={setSearch} />
+      <Header app={app}/>
       <main className="grow">{children}</main>
-      {!noSearch && search && (
-        <>
-        <div className={`
-          fixed w-full max-h-screen bg-base-100 top-0 z-30 pt-0 pb-16 px-8
-          md:rounded-lg md:top-24
-          md:max-w-xl md:m-auto md:inset-x-12
-          md:max-w-2xl
-          lg:max-w-4xl
-        `}>
-          <Search app={app} search={search} setSearch={setSearch}/>
-        </div>
-        <div className="fixed top-0 left-0 w-full min-h-screen bg-neutral z-20 bg-opacity-70"></div>
-        </>
-      )}
       <Footer app={app} />
     </div>
   )
diff --git a/packages/freesewing.lab/components/wrappers/page.js b/packages/freesewing.lab/components/wrappers/page.js
index be3552e7395..8821c578c33 100644
--- a/packages/freesewing.lab/components/wrappers/page.js
+++ b/packages/freesewing.lab/components/wrappers/page.js
@@ -8,7 +8,6 @@ import LayoutWrapper from 'site/components/wrappers/layout'
 /* This component should wrap all page content */
 const PageWrapper= ({
   title="FIXME: No title set",
-  noSearch=false,
   app=false,
   layout=false,
   children=[]
@@ -25,19 +24,9 @@ const PageWrapper= ({
 
   useEffect(() => app.setSlug(slug), [slug])
 
-  // Trigger search with Ctrl+k
-  useHotkeys('ctrl+k', (evt) => {
-    evt.preventDefault()
-    setSearch(true)
-  })
-
-  const [search, setSearch] = useState(false)
-
   const childProps = {
     app: app,
     title: title,
-    search, setSearch, toggleSearch: () => setSearch(!search),
-    noSearch: noSearch,
   }
 
   const Layout = layout
diff --git a/packages/freesewing.lab/pages/index.js b/packages/freesewing.lab/pages/index.js
index 233da44e43f..3970912aa2c 100644
--- a/packages/freesewing.lab/pages/index.js
+++ b/packages/freesewing.lab/pages/index.js
@@ -33,7 +33,7 @@ const HomePage = (props) => {
           }}
           className="m-0 p-0 shadow drop-shadow-lg w-full mb-8"
         >
-          <div className="mx-auto px-8 flex flex-col items-center justify-center min-h-screen lg:min-h-0 lg:py-96">
+          <div className="mx-auto px-8 flex flex-col items-center justify-center min-h-screen py-24 lg:min-h-0 lg:py-96">
             <div className="flex flex-col items-end max-w-4xl">
               <h1
                 className={`
@@ -76,7 +76,7 @@ const HomePage = (props) => {
             </div>
             <Icons app={app}  active='/'
               ulClasses="flex flex-row flex-wrap mt-8 justify-around w-full max-w-6xl"
-              liClasses="text-neutral-content w-1/3 my-4 lg:mx-2 lg:w-24"
+              liClasses="text-neutral-content w-1/2 my-4 lg:mx-2 lg:w-24"
               linkClasses={`
                 text-lg lg:text-xl py-1 text-secondary text-center
                 hover:text-secondary sm:hover:text-secondary-focus hover:cursor-pointer
diff --git a/packages/freesewing.shared/components/locale-picker.js b/packages/freesewing.shared/components/locale-picker.js
index 2b2eb7e16cd..a0505579c95 100644
--- a/packages/freesewing.shared/components/locale-picker.js
+++ b/packages/freesewing.shared/components/locale-picker.js
@@ -9,10 +9,10 @@ const LocalePicker = ({ app }) => {
   const router = useRouter()
 
   return (
-    <div className="dropdown">
+    <div className="dropdown w-full md:w-auto">
       <div tabIndex="0" className={`
-        m-0 btn btn-neutral flex flex-row gap-2
-        sm:btn-ghost
+        m-0 btn btn-neutral flex flex-row gap-2 btn-outline
+        md:btn-ghost
         hover:bg-neutral hover:border-neutral-content
       `}>
         <LocaleIcon />
diff --git a/packages/freesewing.shared/components/navigation/aside.js b/packages/freesewing.shared/components/navigation/aside.js
index e7d5b3d6ca2..1f6fe7b7dd0 100644
--- a/packages/freesewing.shared/components/navigation/aside.js
+++ b/packages/freesewing.shared/components/navigation/aside.js
@@ -1,6 +1,6 @@
 import PrimaryNavigation from './primary'
 
-const Aside = ({ app, slug, mobileOnly=false }) => (
+const Aside = ({ app, slug, mobileOnly=false, before=[], after=[]}) => (
   <aside className={`
     fixed top-0 right-0 h-screen w-screen
     overflow-y-auto z-20
@@ -17,7 +17,9 @@ const Aside = ({ app, slug, mobileOnly=false }) => (
     2xl:pr-8
     ${mobileOnly ? 'block md:hidden' : ''}
   `}>
+    {before}
     <PrimaryNavigation app={app} active={slug}/>
+    {after}
   </aside>
 )
 
diff --git a/packages/freesewing.shared/components/navigation/primary.js b/packages/freesewing.shared/components/navigation/primary.js
index 2f24e569e59..54e2cc9557f 100644
--- a/packages/freesewing.shared/components/navigation/primary.js
+++ b/packages/freesewing.shared/components/navigation/primary.js
@@ -1,6 +1,5 @@
 import Link from 'next/link'
 import orderBy from 'lodash.orderby'
-import ThemePicker from 'shared/components/theme-picker.js'
 import RssIcon from 'shared/components/icons/rss.js'
 import TutorialIcon from 'shared/components/icons/tutorial.js'
 import GuideIcon from 'shared/components/icons/guide.js'
@@ -231,11 +230,12 @@ export const Icons = ({
   return <ul className={ulClasses}>{output}</ul>
 }
 
-const PrimaryMenu = ({ app, active }) => (
+const PrimaryMenu = ({ app, active, before=[], after=[] }) => (
   <nav className="mb-12">
-    <ThemePicker app={app} className="w-full md:hidden"/>
+    {before}
     <Icons app={app} ulClasses="hidden md:block lg:hidden flex flex-col items-center"/>
     <Navigation app={app} active={active} className="md:hidden lg:block"/>
+    {after}
   </nav>
 )
 
diff --git a/packages/freesewing.shared/components/theme-picker.js b/packages/freesewing.shared/components/theme-picker.js
index 5e8424b391d..cf2a6eaa46f 100644
--- a/packages/freesewing.shared/components/theme-picker.js
+++ b/packages/freesewing.shared/components/theme-picker.js
@@ -6,10 +6,10 @@ const ThemePicker = ({ app, className }) => {
   const { t } = useTranslation(['themes'])
 
   return (
-      <div className={`dropdown ${className}`}>
+      <div className={`dropdown ${className} w-full md:w-auto`}>
         <div tabIndex="0" className={`
-          m-0 btn btn-neutral flex flex-row gap-2
-          sm:btn-ghost
+          m-0 btn btn-neutral flex flex-row gap-2 btn-outline
+          md:btn-ghost
           hover:bg-neutral hover:border-neutral-content
         `}>
           <ThemeIcon />