diff --git a/app/web/src/components/EditorMenu/EditorMenu.tsx b/app/web/src/components/EditorMenu/EditorMenu.tsx
index cfcb1e6..c3f8556 100644
--- a/app/web/src/components/EditorMenu/EditorMenu.tsx
+++ b/app/web/src/components/EditorMenu/EditorMenu.tsx
@@ -1,6 +1,6 @@
 import { Menu } from '@headlessui/react'
 
-import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
+import { useIdeContext, ideTypeNameMap } from 'src/helpers/hooks/useIdeContext'
 import Svg from 'src/components/Svg/Svg'
 import { useRender } from 'src/components/IdeWrapper/useRender'
 import { makeStlDownloadHandler, PullTitleFromFirstLine } from './helpers'
@@ -14,30 +14,42 @@ const EditorMenu = () => {
     fileName: PullTitleFromFirstLine(state.code || ''),
     thunkDispatch,
   })
+  const cadName = ideTypeNameMap[state.ideType] || ''
+  const isOpenScad = state.ideType === 'openScad'
+  const isCadQuery = state.ideType === 'cadQuery'
   return (
-    <div className="bg-gray-500 flex items-center h-9 w-full cursor-grab">
-      <div className=" text-gray-500 bg-gray-300 cursor-grab px-2 h-full flex items-center">
-        <Svg name="drag-grid" className="w-4 p-px" />
+    <div className="flex justify-between bg-gray-500 text-gray-100">
+      <div className="flex items-center h-9 w-full cursor-grab">
+        <div className=" text-gray-500 bg-gray-300 cursor-grab px-2 h-full flex items-center">
+          <Svg name="drag-grid" className="w-4 p-px" />
+        </div>
+        <div className="flex gap-6 px-5">
+          <FileDropdown
+            handleRender={handleRender}
+            handleStlDownload={handleStlDownload}
+          />
+          <button className="cursor-not-allowed" disabled>
+            Edit
+          </button>
+          <button className="cursor-not-allowed" disabled>
+            View
+          </button>
+        </div>
+        <button
+          className="text-gray-300  h-full cursor-not-allowed"
+          aria-label="editor settings"
+          disabled
+        >
+          <Svg name="gear" className="w-6 p-px" />
+        </button>
       </div>
-      <button
-        className="text-gray-300 px-3 h-full cursor-not-allowed"
-        aria-label="editor settings"
-        disabled
-      >
-        <Svg name="gear" className="w-7 p-px" />
-      </button>
-      <div className="w-px h-full bg-gray-300" />
-      <div className="flex gap-6 px-6">
-        <FileDropdown
-          handleRender={handleRender}
-          handleStlDownload={handleStlDownload}
+      <div className="flex items-center cursor-default">
+        <div
+          className={`${isOpenScad && 'bg-yellow-200'} ${
+            isCadQuery && 'bg-blue-800'
+          } w-5 h-5 rounded-full`}
         />
-        <button className="text-gray-100 cursor-not-allowed" disabled>
-          Edit
-        </button>
-        <button className="text-gray-100 cursor-not-allowed" disabled>
-          View
-        </button>
+        <div className="px-2">{cadName}</div>
       </div>
     </div>
   )
diff --git a/app/web/src/components/EncodedUrl/ExternalScript.tsx b/app/web/src/components/EncodedUrl/ExternalScript.tsx
index 536b7c5..0cc04d2 100644
--- a/app/web/src/components/EncodedUrl/ExternalScript.tsx
+++ b/app/web/src/components/EncodedUrl/ExternalScript.tsx
@@ -1,16 +1,11 @@
 import { useState } from 'react'
-import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
+import { useIdeContext, ideTypeNameMap } from 'src/helpers/hooks/useIdeContext'
 import OutBound from 'src/components/OutBound/OutBound'
 import { prepareEncodedUrl, makeExternalUrl } from './helpers'
 import { copyTextToClipboard } from 'src/helpers/clipboard'
 import { useRender } from 'src/components/IdeWrapper/useRender'
 import { toast } from '@redwoodjs/web/toast'
 
-const ideTypeNameMap = {
-  openScad: 'OpenSCAD',
-  cadQuery: 'CadQuery',
-}
-
 const ExternalScript = () => {
   const { state, thunkDispatch } = useIdeContext()
   const handleRender = useRender()
diff --git a/app/web/src/components/IdeConsole/IdeConsole.js b/app/web/src/components/IdeConsole/IdeConsole.js
index fb3b205..cea6168 100644
--- a/app/web/src/components/IdeConsole/IdeConsole.js
+++ b/app/web/src/components/IdeConsole/IdeConsole.js
@@ -1,7 +1,6 @@
 import { useEffect } from 'react'
 import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
 import { matchEditorVsDarkTheme } from 'src/components/IdeEditor'
-import PanelToolbar from 'src/components/PanelToolbar'
 
 const IdeConsole = () => {
   const { state } = useIdeContext()
@@ -14,10 +13,9 @@ const IdeConsole = () => {
 
   return (
     <div
-      className="p-2 px-8 pt-14 min-h-full relative"
+      className="p-2 px-8 pt-14 min-h-full"
       style={matchEditorVsDarkTheme.Bg}
     >
-      <PanelToolbar panelName="console" />
       <div>
         {state.consoleMessages?.map(({ type, message, time }, index) => (
           <pre
diff --git a/app/web/src/components/IdeContainer/IdeContainer.js b/app/web/src/components/IdeContainer/IdeContainer.js
index 4eafe2d..a5ed4d8 100644
--- a/app/web/src/components/IdeContainer/IdeContainer.js
+++ b/app/web/src/components/IdeContainer/IdeContainer.js
@@ -7,6 +7,7 @@ import IdeViewer from 'src/components/IdeViewer'
 import IdeConsole from 'src/components/IdeConsole'
 import 'react-mosaic-component/react-mosaic-component.css'
 import EditorMenu from 'src/components/EditorMenu/EditorMenu'
+import PanelToolbar from 'src/components/PanelToolbar'
 
 const ELEMENT_MAP = {
   Editor: <IdeEditor />,
@@ -14,6 +15,24 @@ const ELEMENT_MAP = {
   Console: <IdeConsole />,
 }
 
+const TOOLBAR_MAP = {
+  Editor: (
+    <div className="w-full">
+      <EditorMenu />
+    </div>
+  ),
+  Viewer: (
+    <div>
+      <PanelToolbar panelName="Viewer" />
+    </div>
+  ),
+  Console: (
+    <div>
+      <PanelToolbar panelName="Console" />
+    </div>
+  ),
+}
+
 const IdeContainer = () => {
   const { state, thunkDispatch } = useIdeContext()
   const viewerDOM = useRef(null)
@@ -65,15 +84,7 @@ const IdeContainer = () => {
           return (
             <MosaicWindow
               path={path}
-              renderToolbar={() =>
-                id === 'Editor' ? (
-                  <div className="w-full">
-                    <EditorMenu />
-                  </div>
-                ) : (
-                  <div /> // needs an empty element, otherwise it adds it's own toolbar
-                )
-              }
+              renderToolbar={() => TOOLBAR_MAP[id]}
               className={`${id.toLowerCase()} ${id.toLowerCase()}-tile`}
             >
               {id === 'Viewer' ? (
diff --git a/app/web/src/components/IdeViewer/IdeViewer.js b/app/web/src/components/IdeViewer/IdeViewer.js
index 1bf134e..8f854e8 100644
--- a/app/web/src/components/IdeViewer/IdeViewer.js
+++ b/app/web/src/components/IdeViewer/IdeViewer.js
@@ -10,7 +10,6 @@ import {
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
 import { Vector3 } from 'three'
 import { requestRender } from 'src/helpers/hooks/useIdeState'
-import PanelToolbar from 'src/components/PanelToolbar'
 
 extend({ OrbitControls })
 
@@ -228,7 +227,6 @@ const IdeViewer = () => {
           <div className="h-16 w-16 bg-pink-600 rounded-full animate-ping"></div>
         </div>
       )}
-      <PanelToolbar panelName="3d-view" />
     </div>
   )
 }
diff --git a/app/web/src/components/IdeWrapper/IdeWrapper.tsx b/app/web/src/components/IdeWrapper/IdeWrapper.tsx
index f81763c..3743c9b 100644
--- a/app/web/src/components/IdeWrapper/IdeWrapper.tsx
+++ b/app/web/src/components/IdeWrapper/IdeWrapper.tsx
@@ -35,13 +35,10 @@ const IdeToolbarNew = ({ cadPackage }) => {
               .
             </div>
             <button
-              className="flex"
+              className="flex mr-3"
               onClick={() => setShouldShowConstructionMessage(false)}
             >
-              <Svg
-                className="h-4 w-6 text-gray-500 mr-3 items-center"
-                name="x"
-              />
+              <Svg className="h-4 w-6 text-gray-500 items-center" name="x" />
             </button>
           </div>
         )}
diff --git a/app/web/src/components/PanelToolbar/PanelToolbar.tsx b/app/web/src/components/PanelToolbar/PanelToolbar.tsx
index 62d1d22..1b88675 100644
--- a/app/web/src/components/PanelToolbar/PanelToolbar.tsx
+++ b/app/web/src/components/PanelToolbar/PanelToolbar.tsx
@@ -5,19 +5,19 @@ import Svg from 'src/components/Svg/Svg'
 const PanelToolbar = ({ panelName }: { panelName: string }) => {
   const { mosaicWindowActions } = useContext(MosaicWindowContext)
   return (
-    <div className="absolute top-0 left-0 flex items-center h-9">
-      {mosaicWindowActions.connectDragSource(
-        <div className=" text-gray-500 bg-gray-300 cursor-grab px-2 h-full flex items-center">
-          <Svg name="drag-grid" className="w-4 p-px" />
-        </div>
-      )}
+    <div className="absolute top-0 right-0 flex items-center h-9">
       <button
-        className="bg-gray-500 text-gray-300 px-3 rounded-br-lg h-full cursor-not-allowed"
+        className="bg-gray-500 text-gray-300 px-3 rounded-bl-lg h-full cursor-not-allowed"
         aria-label={`${panelName} settings`}
         disabled
       >
         <Svg name="gear" className="w-7 p-px" />
       </button>
+      {mosaicWindowActions.connectDragSource(
+        <div className=" text-gray-500 bg-gray-300 cursor-grab px-2 h-full flex items-center">
+          <Svg name="drag-grid" className="w-4 p-px" />
+        </div>
+      )}
     </div>
   )
 }
diff --git a/app/web/src/helpers/hooks/useIdeContext.ts b/app/web/src/helpers/hooks/useIdeContext.ts
index 279e937..dbd682a 100644
--- a/app/web/src/helpers/hooks/useIdeContext.ts
+++ b/app/web/src/helpers/hooks/useIdeContext.ts
@@ -4,3 +4,8 @@ import { useContext } from 'react'
 export function useIdeContext() {
   return useContext(IdeContext)
 }
+
+export const ideTypeNameMap = {
+  openScad: 'OpenSCAD',
+  cadQuery: 'CadQuery',
+}