diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 2b2098f..04294b7 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -54,16 +54,10 @@
           <MenubarTrigger class="app-titlebar-button text-muted-foreground">Help</MenubarTrigger>
         </MenubarMenu>
       </div>
-      <div class="h-8 px-2">
-        <Separator orientation="vertical" />
-      </div>
       <div class="grow" />
-      <div class="text-sm text-nowrap px-2">
-        Status: <span class="text-zinc-200">Connected :: Operation</span>
-      </div>
-      <Button variant="outline" class="app-titlebar-button">
-        Disconnect
-      </Button>
+      <MenubarMenu>
+        <MenubarTrigger class="app-titlebar-button text-muted-foreground border-2">Disconnect</MenubarTrigger>
+      </MenubarMenu>
       <div class="flex h-full">
         <button
           v-if="resizeable"
diff --git a/src/components/device/DevicePreview.vue b/src/components/device/DevicePreview.vue
index d51ff34..e8586f8 100644
--- a/src/components/device/DevicePreview.vue
+++ b/src/components/device/DevicePreview.vue
@@ -3,11 +3,12 @@
     <div
       class="bg-contain bg-top bg-no-repeat h-full w-full relative"
       :style="{backgroundImage: `linear-gradient(to bottom, black, rgba(0,0,0,0.2) 12%, rgba(0,0,0,0.3) 95%, black), url(${RenderNano})`}">
-      <div v-if="false" class="px-4 h-12 flex justify-center items-center">
+      <div class="px-10 h-12 flex justify-between items-center">
+        <h2>Nano_D++</h2>
         <!-- TODO: Remove later if not needed -->
         <div v-if="store.selectedProfile" class="font-mono text-sm">
-          <span class="text-muted-foreground">Profile: </span>
-          <ScrambleText :text="store.selectedProfile.name" />
+          <span class="text-muted-foreground">Firmware: </span>
+          <ScrambleText text="v1.3.2a" />
         </div>
       </div>
       <DeviceLEDRing :value="barValue" class="absolute h-[66%] top-[12.5%] left-0 right-0 mx-auto" />