diff --git a/src/components/navbar/Navbar.vue b/src/components/navbar/Navbar.vue
index 079cdbc..1ca7659 100644
--- a/src/components/navbar/Navbar.vue
+++ b/src/components/navbar/Navbar.vue
@@ -4,7 +4,7 @@
       <div v-if="isMacOS" :style="{width: 80 / zoomFactor + 'px'}" />
       <div class="flex items-center">
         <h1
-          class="text-2xl min-w-32 app-titlebar-button text-zinc-100"
+          class="text-2xl min-w-32   app-titlebar-button text-zinc-100 text-nowrap"
           @click="$refs.zerooneTitle.scramble(1,100,0); $refs.zerooneSubtitle.scramble(1,75,30)">
           <ScrambleText
             ref="zerooneTitle"
@@ -12,7 +12,7 @@
             :replace-interval="100"
           />
         </h1>
-        <h2 class="text-sm min-w-[188px] text-muted-foreground font-mono">
+        <h2 class="text-sm min-w-[188px] text-muted-foreground font-mono text-nowrap">
           ::
           <ScrambleText
             ref="zerooneSubtitle"
@@ -25,16 +25,27 @@
       </div>
       <div class="flex gap-2">
         <MenubarMenu>
-          <MenubarTrigger v-t="'navbar.device.title'" class="app-titlebar-button" />
+          <MenubarTrigger class="app-titlebar-button">
+            <template v-if="store.multipleDevicesConnected">
+              Devices<span class="text-zinc-600">&nbsp;(2)</span>
+            </template>
+            <template v-else>
+              Device
+            </template>
+          </MenubarTrigger>
           <MenubarContent>
             <!-- TODO: Switch keyboard shortcut icons based on platform -->
             <MenubarItem>
-              {{ $t('navbar.device.disconnect') }}
+              {{ store.connected ? $t('navbar.device.disconnect') : $t('navbar.device.connect') }}
               <MenubarShortcut>⌘D</MenubarShortcut>
             </MenubarItem>
-            <MenubarItem>{{ $t('navbar.device.about') }}</MenubarItem>
+            <MenubarItem v-if="store.multipleDevicesConnected">Next Device
+              <MenubarShortcut>⌘N</MenubarShortcut>
+            </MenubarItem>
             <MenubarSeparator />
-            <MenubarItem>{{ $t('navbar.device.preferences') }}</MenubarItem>
+            <MenubarItem>{{ $t('navbar.device.preferences') }}
+              <MenubarShortcut>⌘,</MenubarShortcut>
+            </MenubarItem>
             <MenubarSeparator />
             <MenubarItem>{{ $t('navbar.device.export') }}
               <MenubarShortcut>⌘E</MenubarShortcut>
@@ -54,25 +65,16 @@
         <MenubarMenu>
           <MenubarTrigger class="app-titlebar-button">Help</MenubarTrigger>
           <MenubarContent>
-            <!-- TODO: Switch keyboard shortcut icons based on platform -->
-            <MenubarItem>
-              {{ $t('navbar.device.disconnect') }}
-              <MenubarShortcut>⌘D</MenubarShortcut>
-            </MenubarItem>
-            <MenubarItem>{{ $t('navbar.device.about') }}</MenubarItem>
+            <MenubarItem>Help?</MenubarItem>
+            <MenubarItem>HELP!</MenubarItem>
+            <MenubarItem>HEEEELLLP!!!</MenubarItem>
             <MenubarSeparator />
-            <MenubarItem>{{ $t('navbar.device.preferences') }}</MenubarItem>
+            <MenubarItem>Aaah!!!</MenubarItem>
+            <MenubarItem>AAAAAaaaaaahh!!!</MenubarItem>
+            <MenubarItem>AAAAAAAAAAAAAaaaaaargh!!!</MenubarItem>
             <MenubarSeparator />
-            <MenubarItem>{{ $t('navbar.device.export') }}
-              <MenubarShortcut>⌘E</MenubarShortcut>
-            </MenubarItem>
-            <MenubarItem>{{ $t('navbar.device.import') }}
-              <MenubarShortcut>⌘I</MenubarShortcut>
-            </MenubarItem>
-            <MenubarSeparator />
-            <MenubarItem>{{ $t('navbar.device.quit') }}
-              <MenubarShortcut>⌘Q</MenubarShortcut>
-            </MenubarItem>
+            <MenubarItem>Contact Support</MenubarItem>
+            <MenubarItem>Report a Bug</MenubarItem>
           </MenubarContent>
         </MenubarMenu>
       </div>
diff --git a/src/components/profile/ProfileManager.vue b/src/components/profile/ProfileManager.vue
index 233782e..2cbc284 100644
--- a/src/components/profile/ProfileManager.vue
+++ b/src/components/profile/ProfileManager.vue
@@ -18,7 +18,7 @@
         <Transition name="fade">
           <button
             v-if="!showProfileConfig"
-            class="bg-zinc-200 text-black hover:bg-zinc-100 rounded-full aspect-square h-7 flex justify-center items-center"
+            class="bg-zinc-200 text-black hover:bg-zinc-100 rounded-lg h-8 aspect-square flex justify-center items-center"
             @click="store.addProfile">
             <Plus class="h-4" />
           </button>
diff --git a/src/lang/en.json b/src/lang/en.json
index 77837b5..900b84a 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -90,8 +90,8 @@
       "about": "About Device",
       "connect": "Connect",
       "disconnect": "Disconnect",
-      "export": "Export JSON",
-      "import": "Import JSON",
+      "export": "Export Profiles",
+      "import": "Import Profiles",
       "preferences": "Preferences",
       "quit": "Quit",
       "title": "Device"
diff --git a/src/store.js b/src/store.js
index 703f18b..aa32b4b 100644
--- a/src/store.js
+++ b/src/store.js
@@ -18,6 +18,7 @@ export const useStore = defineStore('main', {
       profileCategories: [],
       selectedProfileId: null,
       connected: false,
+      connectedDevices: ['test1', 'test2'],
       selectedFeature: 'knob',
       selectedKey: 'a',
       currentConfigPage: 'mapping',
@@ -46,6 +47,7 @@ export const useStore = defineStore('main', {
     selectedProfile: (state) => state.profiles.find(p => p.id === state.selectedProfileId),
     currentConfigComponent: (state) => state.configPages[state.selectedFeature][state.currentConfigPage]?.component || WIP,
     currentConfigPages: (state) => state.configPages[state.selectedFeature] || {},
+    multipleDevicesConnected: (state) => state.connectedDevices.length > 1,
   }, actions: {
     selectProfile(id) {
       if (!this.profileIds.includes(id)) return false