diff --git a/src/dashboard/Dashboard.js b/src/dashboard/Dashboard.js
index 1369d93..f3fa489 100644
--- a/src/dashboard/Dashboard.js
+++ b/src/dashboard/Dashboard.js
@@ -9,7 +9,6 @@ import {
   recordingDataAtom,
   activeTrackIdAtom,
   activeSetIdAtom,
-  selectedChannelAtom,
   flashingConstructorsAtom,
   recordingStateAtom,
   useFlashingChannels,
@@ -39,7 +38,6 @@ const Dashboard = () => {
   const [activeTrackId, setActiveTrackId] = useAtom(activeTrackIdAtom);
   const [activeSetId, setActiveSetId] = useAtom(activeSetIdAtom);
   const [predefinedModules, setPredefinedModules] = useState([]);
-  const [selectedChannel, setSelectedChannel] = useAtom(selectedChannelAtom);
   const [, flashChannel] = useFlashingChannels();
   const [, setFlashingConstructors] = useAtom(flashingConstructorsAtom);
 
@@ -49,35 +47,12 @@ const Dashboard = () => {
   const {
     workspacePath,
     setWorkspacePath,
-    isWorkspaceModalOpen,
-    setIsWorkspaceModalOpen,
     workspaceModalMode,
     setWorkspaceModalMode,
     workspaceModalPath,
     setWorkspaceModalPath,
-    isCreateTrackOpen,
-    setIsCreateTrackOpen,
-    isCreateSetOpen,
-    setIsCreateSetOpen,
-    isSelectTrackModalOpen,
-    setIsSelectTrackModalOpen,
-    isSelectSetModalOpen,
-    setIsSelectSetModalOpen,
-    isSettingsModalOpen,
-    setIsSettingsModalOpen,
-    isInputMappingsModalOpen,
-    setIsInputMappingsModalOpen,
-    isReleaseNotesOpen,
-    setIsReleaseNotesOpen,
-    isAddModuleModalOpen,
-    setIsAddModuleModalOpen,
-    isManageModulesModalOpen,
-    setIsManageModulesModalOpen,
-    isDebugOverlayOpen,
-    setIsDebugOverlayOpen,
     selectedTrackForModuleMenu,
     setSelectedTrackForModuleMenu,
-    openAddModuleModal,
     handleCreateNewModule,
     handleCreateModule,
     handleEditModule,
@@ -87,10 +62,7 @@ const Dashboard = () => {
     editingTemplateType,
     isNewModuleDialogOpen,
     setIsNewModuleDialogOpen,
-    confirmationModal,
-    setConfirmationModal,
     openAlertModal,
-    openConfirmationModal,
     debugLogs,
     setDebugLogs,
     isSequencerMuted,
@@ -99,11 +71,8 @@ const Dashboard = () => {
     setIsProjectorReady,
     perfStats,
     setPerfStats,
-    editChannelModalState,
-    setEditChannelModalState,
-    handleEditChannel,
     handleDeleteChannel,
-  } = useDashboardUiState({ selectedChannel, setUserData, activeSetId });
+  } = useDashboardUiState({ setUserData, activeSetId });
 
   const userDataRef = useLatestRef(userData);
   const recordingDataRef = useLatestRef(recordingData);
@@ -167,7 +136,6 @@ const Dashboard = () => {
     setInputStatus,
     setDebugLogs,
     sendToProjector,
-    isDebugOverlayOpen,
     setIsProjectorReady,
   });
 
@@ -200,7 +168,6 @@ const Dashboard = () => {
 
   useWorkspaceModules({
     workspacePath,
-    isWorkspaceModalOpen,
     sendToProjector,
     userData,
     setUserData,
@@ -236,7 +203,6 @@ const Dashboard = () => {
     setWorkspacePath,
     setWorkspaceModalMode,
     setWorkspaceModalPath,
-    setIsWorkspaceModalOpen,
   });
 
   const handleSelectWorkspace = useCallback(async () => {
@@ -293,14 +259,7 @@ const Dashboard = () => {
 
   return (
     <div className="relative bg-[#101010] font-mono h-screen flex flex-col">
-      <DashboardHeader
-        onSets={() => setIsSelectSetModalOpen(true)}
-        onTracks={() => setIsSelectTrackModalOpen(true)}
-        onModules={() => setIsManageModulesModalOpen(true)}
-        onSettings={() => setIsSettingsModalOpen(true)}
-        onDebugOverlay={() => setIsDebugOverlayOpen(true)}
-        onReleases={() => setIsReleaseNotesOpen(true)}
-      />
+      <DashboardHeader />
 
       <div className="flex-1 overflow-y-auto pt-12 pb-32">
         <div className="bg-[#101010] p-6 font-mono">
@@ -309,8 +268,6 @@ const Dashboard = () => {
             activeSetId={activeSetId}
             activeTrackId={activeTrackId}
             predefinedModules={predefinedModules}
-            openAddModuleModal={openAddModuleModal}
-            openConfirmationModal={openConfirmationModal}
             setActiveTrackId={setActiveTrackId}
             inputConfig={inputConfig}
             config={userData.config}
@@ -338,33 +295,12 @@ const Dashboard = () => {
         inputStatus={inputStatus}
         inputConfig={inputConfig}
         config={userData.config}
-        onSettingsClick={() => setIsSettingsModalOpen(true)}
         isMuted={isSequencerMuted}
         onMuteChange={setIsSequencerMuted}
         isProjectorReady={isProjectorReady}
       />
 
       <DashboardModalLayer
-        isCreateTrackOpen={isCreateTrackOpen}
-        setIsCreateTrackOpen={setIsCreateTrackOpen}
-        isCreateSetOpen={isCreateSetOpen}
-        setIsCreateSetOpen={setIsCreateSetOpen}
-        isSelectTrackModalOpen={isSelectTrackModalOpen}
-        setIsSelectTrackModalOpen={setIsSelectTrackModalOpen}
-        isSelectSetModalOpen={isSelectSetModalOpen}
-        setIsSelectSetModalOpen={setIsSelectSetModalOpen}
-        isSettingsModalOpen={isSettingsModalOpen}
-        setIsSettingsModalOpen={setIsSettingsModalOpen}
-        isInputMappingsModalOpen={isInputMappingsModalOpen}
-        setIsInputMappingsModalOpen={setIsInputMappingsModalOpen}
-        isReleaseNotesOpen={isReleaseNotesOpen}
-        setIsReleaseNotesOpen={setIsReleaseNotesOpen}
-        isAddModuleModalOpen={isAddModuleModalOpen}
-        setIsAddModuleModalOpen={setIsAddModuleModalOpen}
-        isManageModulesModalOpen={isManageModulesModalOpen}
-        setIsManageModulesModalOpen={setIsManageModulesModalOpen}
-        isDebugOverlayOpen={isDebugOverlayOpen}
-        setIsDebugOverlayOpen={setIsDebugOverlayOpen}
         userData={userData}
         setUserData={setUserData}
         recordingData={recordingData}
@@ -398,23 +334,14 @@ const Dashboard = () => {
         onCreateModule={handleCreateModule}
         debugLogs={debugLogs}
         perfStats={perfStats}
-        selectedChannel={selectedChannel}
-        setSelectedChannel={setSelectedChannel}
-        onEditChannel={handleEditChannel}
         onDeleteChannel={handleDeleteChannel}
         workspaceModuleFiles={workspaceModuleFiles}
         workspaceModuleLoadFailures={workspaceModuleLoadFailures}
         workspaceModuleSkipped={workspaceModuleSkipped}
-        editChannelModalState={editChannelModalState}
-        setEditChannelModalState={setEditChannelModalState}
-        confirmationModal={confirmationModal}
-        setConfirmationModal={setConfirmationModal}
         openAlertModal={openAlertModal}
-        openConfirmationModal={openConfirmationModal}
       />
 
       <WorkspaceGateModal
-        isOpen={isWorkspaceModalOpen}
         mode={workspaceModalMode}
         workspacePath={workspacePath}
         workspaceModalPath={workspaceModalPath}
diff --git a/src/dashboard/components/DashboardBody.tsx b/src/dashboard/components/DashboardBody.tsx
index 954f821..72d338c 100644
--- a/src/dashboard/components/DashboardBody.tsx
+++ b/src/dashboard/components/DashboardBody.tsx
@@ -6,8 +6,6 @@ type DashboardBodyProps = {
   activeSetId: unknown;
   activeTrackId: string | number | null;
   predefinedModules: unknown[];
-  openAddModuleModal: (trackIndex: number) => void;
-  openConfirmationModal: (message: string, onConfirm: () => void) => void;
   setActiveTrackId: (id: string | number | null) => void;
   inputConfig: unknown;
   config: Record<string, unknown> | null;
@@ -24,8 +22,6 @@ export const DashboardBody = ({
   activeSetId,
   activeTrackId,
   predefinedModules,
-  openAddModuleModal,
-  openConfirmationModal,
   setActiveTrackId,
   inputConfig,
   config,
@@ -55,8 +51,6 @@ export const DashboardBody = ({
               track={track}
               trackIndex={trackIndex}
               predefinedModules={predefinedModules}
-              openRightMenu={openAddModuleModal}
-              onConfirmDelete={openConfirmationModal}
               setActiveTrackId={setActiveTrackId}
               inputConfig={inputConfig}
               config={config}
diff --git a/src/dashboard/components/DashboardFooter.tsx b/src/dashboard/components/DashboardFooter.tsx
index 0107c31..22c0880 100644
--- a/src/dashboard/components/DashboardFooter.tsx
+++ b/src/dashboard/components/DashboardFooter.tsx
@@ -1,8 +1,9 @@
-import { useAtom } from "jotai";
+import { useAtom, useSetAtom } from "jotai";
 import { FaPlay, FaStop } from "react-icons/fa";
 import { recordingDataAtom } from "../core/state";
 import { Checkbox } from "./FormInputs";
 import { Button } from "./Button";
+import { settingsModalAtom } from "../core/modalAtoms";
 
 type InputConfig = {
   type?: string;
@@ -25,7 +26,6 @@ type DashboardFooterProps = {
   onStop: () => void;
   inputStatus: InputStatus;
   inputConfig: InputConfig | null;
-  onSettingsClick: () => void;
   config: DashboardConfig | null;
   isMuted: boolean;
   onMuteChange: (next: boolean) => void;
@@ -39,13 +39,13 @@ export const DashboardFooter = ({
   onStop,
   inputStatus,
   inputConfig,
-  onSettingsClick,
   config,
   isMuted,
   onMuteChange,
   isProjectorReady,
 }: DashboardFooterProps) => {
   const [_recordingData] = useAtom(recordingDataAtom);
+  const setSettingsModalIsOpen = useSetAtom(settingsModalAtom)
 
   const getStatusColor = () => {
     switch (inputStatus.status) {
@@ -103,7 +103,7 @@ export const DashboardFooter = ({
           <div className="text-neutral-300/30 text-[11px]">No track selected</div>
           {!config?.sequencerMode && (
             <button
-              onClick={onSettingsClick}
+              onClick={() => setSettingsModalIsOpen(true)}
               className={`text-[10px] font-mono flex items-center gap-2 cursor-pointer hover:opacity-70 transition-opacity ${getStatusColor()}`}
               title={`${inputStatus.status}: ${getStatusText()}`}
             >
@@ -169,7 +169,7 @@ export const DashboardFooter = ({
             </>
           ) : (
             <button
-              onClick={onSettingsClick}
+              onClick={() => setSettingsModalIsOpen(true)}
               className={`text-[10px] font-mono flex items-center gap-2 cursor-pointer hover:opacity-70 transition-opacity ${getStatusColor()}`}
               title={`${inputStatus.status}: ${getStatusText()}`}
             >
diff --git a/src/dashboard/components/DashboardHeader.tsx b/src/dashboard/components/DashboardHeader.tsx
index ad1ba92..2a475a8 100644
--- a/src/dashboard/components/DashboardHeader.tsx
+++ b/src/dashboard/components/DashboardHeader.tsx
@@ -1,51 +1,44 @@
 import { FaBars, FaCog, FaCode, FaMusic, FaTag } from "react-icons/fa";
 import { Button } from "./Button";
 import { useUpdateCheck } from "../core/hooks/useUpdateCheck";
+import {
+  debugOverlayModalAtom,
+  addModuleModalAtom,
+  releaseNotesModalAtom,
+  selectSetModalAtom,
+  selectTrackModalAtom,
+  settingsModalAtom
+} from "../core/modalAtoms";
+import { useSetAtom } from "jotai";
 
-type DashboardHeaderProps = {
-  onSets?: (() => void) | null;
-  onTracks?: (() => void) | null;
-  onModules?: (() => void) | null;
-  onSettings?: (() => void) | null;
-  onDebugOverlay?: (() => void) | null;
-  onReleases?: (() => void) | null;
-};
+export const DashboardHeader = () => {
+  const openSelectSet = useSetAtom(selectSetModalAtom)
+  const openSelectTracks = useSetAtom(selectTrackModalAtom)
+  const openAddModule = useSetAtom(addModuleModalAtom)
+  const openSettings = useSetAtom(settingsModalAtom)
+  const openDebugOverlay = useSetAtom(debugOverlayModalAtom)
+  const openReleaseNotes = useSetAtom(releaseNotesModalAtom)
 
-export const DashboardHeader = ({
-  onSets,
-  onTracks,
-  onModules,
-  onSettings,
-  onDebugOverlay,
-  onReleases,
-}: DashboardHeaderProps) => {
   const update = useUpdateCheck();
   const hasUpdate = update.status === "updateAvailable";
 
-  const handleOpenUpdates = () => {
-    if (typeof onReleases === "function") {
-      onReleases();
-      return;
-    }
-  };
-
   return (
     <div className="fixed top-0 left-0 right-0 z-50 bg-[#101010] border-b border-neutral-800 px-6 py-4">
       <div className="flex justify-between items-center">
         <div className="flex items-center gap-6">
-          <Button onClick={onSets} icon={<FaBars />}>
+          <Button onClick={() => openSelectSet(true)} icon={<FaBars />}>
             SETS
           </Button>
-          <Button onClick={onTracks} icon={<FaMusic />}>
+          <Button onClick={() => openSelectTracks(true)} icon={<FaMusic />}>
             TRACKS
           </Button>
-          <Button onClick={onModules} icon={<FaCode />}>
+          <Button onClick={() => openAddModule('manage-modules')} icon={<FaCode />}>
             MODULES
           </Button>
-          <Button onClick={onSettings} icon={<FaCog />}>
+          <Button onClick={() => openSettings(true)} icon={<FaCog />}>
             SETTINGS
           </Button>
-          <Button onClick={onDebugOverlay} icon={<FaCode />}>
+          <Button onClick={() => openDebugOverlay(true)} icon={<FaCode />}>
             DEBUG
           </Button>
         </div>
@@ -54,7 +47,7 @@ export const DashboardHeader = ({
             <div className="opacity-50 text-[11px] text-neutral-300">nw_wrld</div>
             <button
               type="button"
-              onClick={handleOpenUpdates}
+              onClick={() => openReleaseNotes(true)}
               className={`relative flex items-center ${
                 hasUpdate ? "text-red-500/80 opacity-100" : "text-neutral-300 opacity-50"
               }`}
diff --git a/src/dashboard/components/DashboardModalLayer.tsx b/src/dashboard/components/DashboardModalLayer.tsx
index 81b2471..3b06002 100644
--- a/src/dashboard/components/DashboardModalLayer.tsx
+++ b/src/dashboard/components/DashboardModalLayer.tsx
@@ -13,34 +13,11 @@ import { ConfirmationModal } from "../modals/ConfirmationModal";
 import { ModuleEditorModal } from "./ModuleEditorModal";
 import { NewModuleDialog } from "./NewModuleDialog";
 
-type Confirmation = { message: string; onConfirm?: () => void; type?: "confirm" | "alert" } | null;
-
 type UserData = Parameters<typeof SelectSetModal>[0]["userData"];
 type ProjectorSettings = Parameters<typeof SettingsModal>[0]["settings"];
 type PredefinedModules = Parameters<typeof AddModuleModal>[0]["predefinedModules"];
 
 type DashboardModalLayerProps = {
-  isCreateTrackOpen: boolean;
-  setIsCreateTrackOpen: (next: boolean) => void;
-  isCreateSetOpen: boolean;
-  setIsCreateSetOpen: (next: boolean) => void;
-  isSelectTrackModalOpen: boolean;
-  setIsSelectTrackModalOpen: (next: boolean) => void;
-  isSelectSetModalOpen: boolean;
-  setIsSelectSetModalOpen: (next: boolean) => void;
-  isSettingsModalOpen: boolean;
-  setIsSettingsModalOpen: (next: boolean) => void;
-  isInputMappingsModalOpen: boolean;
-  setIsInputMappingsModalOpen: (next: boolean) => void;
-  isReleaseNotesOpen: boolean;
-  setIsReleaseNotesOpen: (next: boolean) => void;
-  isAddModuleModalOpen: boolean;
-  setIsAddModuleModalOpen: (next: boolean) => void;
-  isManageModulesModalOpen: boolean;
-  setIsManageModulesModalOpen: (next: boolean) => void;
-  isDebugOverlayOpen: boolean;
-  setIsDebugOverlayOpen: (next: boolean) => void;
-
   userData: UserData;
   setUserData: (
     updater: ((prev: Record<string, unknown>) => Record<string, unknown>) | Record<string, unknown>
@@ -65,8 +42,6 @@ type DashboardModalLayerProps = {
   onSelectWorkspace: () => void;
 
   predefinedModules: PredefinedModules;
-  selectedTrackForModuleMenu: number | null;
-  setSelectedTrackForModuleMenu: (next: number | null) => void;
   onCreateNewModule: () => void;
   onEditModule: (moduleName: string) => void;
   isModuleEditorOpen: boolean;
@@ -80,48 +55,15 @@ type DashboardModalLayerProps = {
   debugLogs: string[];
   perfStats: { fps: number; frameMsAvg: number; longFramePct: number; at: number } | null;
 
-  selectedChannel: unknown;
-  setSelectedChannel: (next: unknown) => void;
-  onEditChannel: (channelNumber: number) => void;
   onDeleteChannel: (channelNumber: number) => void;
   workspaceModuleFiles: string[];
   workspaceModuleLoadFailures: string[];
   workspaceModuleSkipped: Array<{ file: string; reason: string }>;
 
-  editChannelModalState: { isOpen: boolean; trackIndex: number | null; channelNumber: number | null };
-  setEditChannelModalState: (next: {
-    isOpen: boolean;
-    trackIndex: number | null;
-    channelNumber: number | null;
-  }) => void;
-
-  confirmationModal: Confirmation;
-  setConfirmationModal: (next: Confirmation) => void;
   openAlertModal: (message: string) => void;
-  openConfirmationModal: (message: string, onConfirm: () => void) => void;
 };
 
 export const DashboardModalLayer = ({
-  isCreateTrackOpen,
-  setIsCreateTrackOpen,
-  isCreateSetOpen,
-  setIsCreateSetOpen,
-  isSelectTrackModalOpen,
-  setIsSelectTrackModalOpen,
-  isSelectSetModalOpen,
-  setIsSelectSetModalOpen,
-  isSettingsModalOpen,
-  setIsSettingsModalOpen,
-  isInputMappingsModalOpen,
-  setIsInputMappingsModalOpen,
-  isReleaseNotesOpen,
-  setIsReleaseNotesOpen,
-  isAddModuleModalOpen,
-  setIsAddModuleModalOpen,
-  isManageModulesModalOpen,
-  setIsManageModulesModalOpen,
-  isDebugOverlayOpen,
-  setIsDebugOverlayOpen,
   userData,
   setUserData,
   recordingData,
@@ -142,49 +84,29 @@ export const DashboardModalLayer = ({
   workspacePath,
   onSelectWorkspace,
   predefinedModules,
-  selectedTrackForModuleMenu,
-  setSelectedTrackForModuleMenu,
   onCreateNewModule,
   onEditModule,
-  isModuleEditorOpen,
-  onCloseModuleEditor,
   editingModuleName,
   editingTemplateType,
-  isNewModuleDialogOpen,
-  onCloseNewModuleDialog,
   onCreateModule,
   debugLogs,
   perfStats,
-  selectedChannel,
-  setSelectedChannel,
-  onEditChannel,
   onDeleteChannel,
   workspaceModuleFiles,
   workspaceModuleLoadFailures,
   workspaceModuleSkipped,
-  editChannelModalState,
-  setEditChannelModalState,
-  confirmationModal,
-  setConfirmationModal,
   openAlertModal,
-  openConfirmationModal,
 }: DashboardModalLayerProps) => {
   return (
     <>
       <CreateTrackModal
-        isOpen={isCreateTrackOpen}
-        onClose={() => setIsCreateTrackOpen(false)}
         inputConfig={inputConfig}
         onAlert={openAlertModal}
       />
       <CreateSetModal
-        isOpen={isCreateSetOpen}
-        onClose={() => setIsCreateSetOpen(false)}
         onAlert={openAlertModal}
       />
       <SelectTrackModal
-        isOpen={isSelectTrackModalOpen}
-        onClose={() => setIsSelectTrackModalOpen(false)}
         userData={userData}
         setUserData={setUserData}
         activeTrackId={activeTrackId}
@@ -192,15 +114,8 @@ export const DashboardModalLayer = ({
         activeSetId={activeSetId}
         recordingData={recordingData}
         setRecordingData={setRecordingData}
-        onCreateTrack={() => {
-          setIsSelectTrackModalOpen(false);
-          setIsCreateTrackOpen(true);
-        }}
-        onConfirmDelete={openConfirmationModal}
       />
       <SelectSetModal
-        isOpen={isSelectSetModalOpen}
-        onClose={() => setIsSelectSetModalOpen(false)}
         userData={userData}
         setUserData={setUserData}
         activeTrackId={activeTrackId}
@@ -209,15 +124,8 @@ export const DashboardModalLayer = ({
         setActiveSetId={setActiveSetId}
         recordingData={recordingData}
         setRecordingData={setRecordingData}
-        onCreateSet={() => {
-          setIsSelectSetModalOpen(false);
-          setIsCreateSetOpen(true);
-        }}
-        onConfirmDelete={openConfirmationModal}
       />
       <SettingsModal
-        isOpen={isSettingsModalOpen}
-        onClose={() => setIsSettingsModalOpen(false)}
         aspectRatio={aspectRatio}
         setAspectRatio={setAspectRatio}
         bgColor={bgColor}
@@ -226,50 +134,22 @@ export const DashboardModalLayer = ({
         inputConfig={inputConfig}
         setInputConfig={setInputConfig}
         availableMidiDevices={availableMidiDevices}
-        onOpenMappings={() => {
-          setIsSettingsModalOpen(false);
-          setIsInputMappingsModalOpen(true);
-        }}
         config={userData?.config}
         updateConfig={updateConfig}
         workspacePath={workspacePath}
         onSelectWorkspace={onSelectWorkspace}
       />
-      <InputMappingsModal
-        isOpen={isInputMappingsModalOpen}
-        onClose={() => setIsInputMappingsModalOpen(false)}
-      />
-      <ReleaseNotesModal isOpen={isReleaseNotesOpen} onClose={() => setIsReleaseNotesOpen(false)} />
+      <InputMappingsModal />
+      <ReleaseNotesModal />
       <AddModuleModal
-        isOpen={isAddModuleModalOpen}
-        onClose={() => {
-          setIsAddModuleModalOpen(false);
-          setSelectedTrackForModuleMenu(null);
-        }}
-        trackIndex={selectedTrackForModuleMenu}
         userData={userData}
         setUserData={setUserData}
         predefinedModules={predefinedModules}
         onCreateNewModule={onCreateNewModule}
         onEditModule={onEditModule}
         skippedWorkspaceModules={workspaceModuleSkipped}
-        mode="add-to-track"
-      />
-      <AddModuleModal
-        isOpen={isManageModulesModalOpen}
-        onClose={() => setIsManageModulesModalOpen(false)}
-        trackIndex={null}
-        userData={userData}
-        setUserData={setUserData}
-        predefinedModules={predefinedModules}
-        onCreateNewModule={onCreateNewModule}
-        onEditModule={onEditModule}
-        skippedWorkspaceModules={workspaceModuleSkipped}
-        mode="manage-modules"
       />
       <ModuleEditorModal
-        isOpen={isModuleEditorOpen}
-        onClose={onCloseModuleEditor}
         moduleName={editingModuleName}
         templateType={editingTemplateType}
         onModuleSaved={null}
@@ -277,48 +157,25 @@ export const DashboardModalLayer = ({
         workspacePath={workspacePath}
       />
       <NewModuleDialog
-        isOpen={isNewModuleDialogOpen}
-        onClose={onCloseNewModuleDialog}
         onCreateModule={onCreateModule}
         workspacePath={workspacePath}
       />
       <DebugOverlayModal
-        isOpen={isDebugOverlayOpen}
-        onClose={() => setIsDebugOverlayOpen(false)}
         debugLogs={debugLogs}
         perfStats={perfStats}
       />
       <MethodConfiguratorModal
-        isOpen={!!selectedChannel}
-        onClose={() => setSelectedChannel(null)}
         predefinedModules={predefinedModules}
-        onEditChannel={onEditChannel}
         onDeleteChannel={onDeleteChannel}
         workspacePath={workspacePath}
         workspaceModuleFiles={workspaceModuleFiles}
         workspaceModuleLoadFailures={workspaceModuleLoadFailures}
       />
       <EditChannelModal
-        isOpen={editChannelModalState.isOpen}
-        onClose={() =>
-          setEditChannelModalState({
-            isOpen: false,
-            trackIndex: null,
-            channelNumber: null,
-          })
-        }
-        trackIndex={editChannelModalState.trackIndex}
-        channelNumber={editChannelModalState.channelNumber}
         inputConfig={inputConfig}
         config={userData?.config}
       />
-      <ConfirmationModal
-        isOpen={!!confirmationModal}
-        onClose={() => setConfirmationModal(null)}
-        message={confirmationModal?.message || ""}
-        onConfirm={confirmationModal?.onConfirm}
-        type={confirmationModal?.type || "confirm"}
-      />
+      <ConfirmationModal />
     </>
   );
 };
diff --git a/src/dashboard/components/ModuleEditorModal.tsx b/src/dashboard/components/ModuleEditorModal.tsx
index 3b06d3c..06d2805 100644
--- a/src/dashboard/components/ModuleEditorModal.tsx
+++ b/src/dashboard/components/ModuleEditorModal.tsx
@@ -2,6 +2,8 @@ import { useState, useEffect, useMemo, useCallback } from "react";
 import { FaTimes } from "react-icons/fa";
 import { Button } from "./Button";
 import { getBaseMethodNames } from "../utils/moduleUtils";
+import { useAtom } from "jotai";
+import { moduleEditorModalAtom } from "../core/modalAtoms";
 
 const getBridge = () => globalThis.nwWrldBridge;
 
@@ -30,8 +32,6 @@ type MethodWithValues = {
 };
 
 type ModuleEditorModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   moduleName: string | null;
   templateType?: TemplateType | null;
   onModuleSaved?: ((moduleName: string) => void) | null;
@@ -229,14 +229,14 @@ export default ${moduleName};
 };
 
 export const ModuleEditorModal = ({
-  isOpen,
-  onClose,
   moduleName,
   templateType = null,
   onModuleSaved: _onModuleSaved,
   predefinedModules = [],
   workspacePath = null,
 }: ModuleEditorModalProps) => {
+  const [isOpen, setIsOpen] = useAtom(moduleEditorModalAtom)
+  const onClose = () => setIsOpen(false)
   const [code, setCode] = useState("");
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(true);
diff --git a/src/dashboard/components/NewModuleDialog.tsx b/src/dashboard/components/NewModuleDialog.tsx
index 94677c5..9dd715e 100644
--- a/src/dashboard/components/NewModuleDialog.tsx
+++ b/src/dashboard/components/NewModuleDialog.tsx
@@ -3,6 +3,8 @@ import { Button } from "./Button";
 import { ModalHeader } from "./ModalHeader";
 import { ModalFooter } from "./ModalFooter";
 import { TextInput, Select, Label } from "./FormInputs";
+import { useAtom } from "jotai";
+import { newModuleDialogAtom } from "../core/modalAtoms";
 
 type ModalProps = {
   isOpen: boolean;
@@ -28,18 +30,16 @@ const Modal = ({ isOpen, children, size = "small" }: ModalProps) => {
 };
 
 type NewModuleDialogProps = {
-  isOpen: boolean;
-  onClose: () => void;
   onCreateModule: (moduleName: string, templateType: string) => void;
   workspacePath?: string | null;
 };
 
 export const NewModuleDialog = ({
-  isOpen,
-  onClose,
   onCreateModule,
   workspacePath = null,
 }: NewModuleDialogProps) => {
+  const [isOpen, setIsOpen] = useAtom(newModuleDialogAtom)
+  const onClose = () => setIsOpen(false)
   const [moduleName, setModuleName] = useState("");
   const [templateType, setTemplateType] = useState("basic");
   const [error, setError] = useState("");
diff --git a/src/dashboard/components/WorkspaceGateModal.tsx b/src/dashboard/components/WorkspaceGateModal.tsx
index af7bf34..69d4e86 100644
--- a/src/dashboard/components/WorkspaceGateModal.tsx
+++ b/src/dashboard/components/WorkspaceGateModal.tsx
@@ -2,9 +2,10 @@ import { Modal } from "../shared/Modal";
 import { ModalHeader } from "./ModalHeader";
 import { ModalFooter } from "./ModalFooter";
 import { Button } from "./Button";
+import { useAtomValue } from "jotai";
+import { workspaceModalAtom } from "../core/modalAtoms";
 
 type WorkspaceGateModalProps = {
-  isOpen: boolean;
   mode: "initial" | "lostSync";
   workspacePath: string | null;
   workspaceModalPath: string | null;
@@ -12,12 +13,12 @@ type WorkspaceGateModalProps = {
 };
 
 export const WorkspaceGateModal = ({
-  isOpen,
   mode,
   workspacePath,
   workspaceModalPath,
   onSelectWorkspace,
 }: WorkspaceGateModalProps) => {
+  const isOpen = useAtomValue(workspaceModalAtom)
   return (
     <Modal isOpen={isOpen} onClose={() => {}}>
       <ModalHeader
diff --git a/src/dashboard/components/track/TrackItem.tsx b/src/dashboard/components/track/TrackItem.tsx
index f396308..85e7246 100644
--- a/src/dashboard/components/track/TrackItem.tsx
+++ b/src/dashboard/components/track/TrackItem.tsx
@@ -1,5 +1,5 @@
 import { memo, useState, useEffect, useCallback, useRef, useMemo } from "react";
-import { useAtom } from "jotai";
+import { useAtom, useSetAtom } from "jotai";
 import { remove } from "lodash";
 import { FaPlus } from "react-icons/fa";
 import { SortableList, arrayMove } from "../../shared/SortableList";
@@ -10,6 +10,7 @@ import {
   activeSetIdAtom,
   flashingConstructorsAtom,
   useFlashingChannels,
+  selectedTrackForModuleMenuAtom,
 } from "../../core/state";
 import { updateActiveSet } from "../../core/utils";
 import { getRecordingForTrack } from "../../../shared/json/recordingUtils";
@@ -17,6 +18,7 @@ import MidiPlayback from "../../../shared/midi/midiPlayback";
 import { Button } from "../Button";
 import { TrackDataModal } from "../../modals/TrackDataModal";
 import { ModuleSelector, SortableModuleItem } from "./ModuleComponents";
+import { addModuleModalAtom, confirmationModalAtom } from "../../core/modalAtoms";
 
 type ModuleInstance = { id: string; type: string };
 
@@ -42,8 +44,6 @@ type TrackItemProps = {
   track: Track;
   trackIndex: number;
   predefinedModules: unknown[];
-  openRightMenu: (trackIndex: number) => void;
-  onConfirmDelete: (message: string, onConfirm: () => void) => void;
   setActiveTrackId: (id: string | null) => void;
   inputConfig: unknown;
   config: Record<string, unknown> | null;
@@ -60,8 +60,6 @@ export const TrackItem = memo(
     track,
     trackIndex,
     predefinedModules,
-    openRightMenu,
-    onConfirmDelete,
     setActiveTrackId: _setActiveTrackId,
     inputConfig,
     config: _config,
@@ -74,6 +72,13 @@ export const TrackItem = memo(
   }: TrackItemProps) => {
     const [_userData, setUserData] = useAtom(userDataAtom);
     const [recordingData] = useAtom(recordingDataAtom);
+    const setSelectedTrackForModuleMenu = useSetAtom(selectedTrackForModuleMenuAtom)
+    const setIsAddModuleModalOpen = useSetAtom(addModuleModalAtom)
+    const setConfirmationModal = useSetAtom(confirmationModalAtom)
+    const openRightMenu = (trackIndex: number) => {
+      setSelectedTrackForModuleMenu(trackIndex)
+      setIsAddModuleModalOpen('add-to-track')
+    }
     const [activeSetId] = useAtom(activeSetIdAtom);
     const [_flashingChannels, flashChannel] = useFlashingChannels();
     const [_flashingConstructors, setFlashingConstructors] = useAtom(flashingConstructorsAtom);
@@ -131,7 +136,7 @@ export const TrackItem = memo(
         const module = track.modules.find((m) => m.id === instanceId);
         if (!module) return;
 
-        onConfirmDelete(`Are you sure you want to delete the ${module.type} module?`, () => {
+        const onConfirm = () => {
           updateActiveSet(setUserData, activeSetId, (activeSet) => {
             if (!isPlainObject(activeSet)) return;
             const tracksUnknown = (activeSet as Record<string, unknown>).tracks;
@@ -147,9 +152,14 @@ export const TrackItem = memo(
               delete (modulesDataUnknown as Record<string, unknown>)[instanceId];
             }
           });
+        }
+        setConfirmationModal({
+          message: `Are you sure you want to delete the ${module.type} module?`,
+          onConfirm,
+          type: 'confirm'
         });
       },
-      [setUserData, trackIndex, track.modules, onConfirmDelete, activeSetId]
+      [setUserData, trackIndex, track.modules, setConfirmationModal, activeSetId]
     );
 
     const _handlePlayPause = useCallback(async () => {
diff --git a/src/dashboard/core/hooks/useDashboardBootstrap.ts b/src/dashboard/core/hooks/useDashboardBootstrap.ts
index bfbac5f..bfa9d15 100644
--- a/src/dashboard/core/hooks/useDashboardBootstrap.ts
+++ b/src/dashboard/core/hooks/useDashboardBootstrap.ts
@@ -5,6 +5,8 @@ import { loadRecordingData } from "../../../shared/json/recordingUtils";
 import { loadAppState } from "../../../shared/json/appStateUtils";
 import { loadUserData } from "../utils";
 import { useIPCListener } from "./useIPC";
+import { useSetAtom } from "jotai";
+import { workspaceModalAtom } from "../modalAtoms";
 
 type UseDashboardBootstrapArgs = {
   isInitialMountRef: { current: boolean };
@@ -19,7 +21,6 @@ type UseDashboardBootstrapArgs = {
   setWorkspacePath: (next: string | null) => void;
   setWorkspaceModalMode: (mode: "initial" | "lostSync") => void;
   setWorkspaceModalPath: (path: string | null) => void;
-  setIsWorkspaceModalOpen: (open: boolean) => void;
 };
 
 export const useDashboardBootstrap = ({
@@ -35,8 +36,8 @@ export const useDashboardBootstrap = ({
   setWorkspacePath,
   setWorkspaceModalMode,
   setWorkspaceModalPath,
-  setIsWorkspaceModalOpen,
 }: UseDashboardBootstrapArgs) => {
+  const setIsWorkspaceModalOpen = useSetAtom(workspaceModalAtom)
   useEffect(() => {
     const initializeUserData = async () => {
       const data = await loadUserData();
diff --git a/src/dashboard/core/hooks/useDashboardUiState.ts b/src/dashboard/core/hooks/useDashboardUiState.ts
index 36c4adc..852b6d2 100644
--- a/src/dashboard/core/hooks/useDashboardUiState.ts
+++ b/src/dashboard/core/hooks/useDashboardUiState.ts
@@ -1,12 +1,10 @@
 import { useCallback, useState, type Dispatch, type SetStateAction } from "react";
 import { updateActiveSet } from "../utils";
-
-type Confirmation = { message: string; onConfirm?: () => void; type?: "confirm" | "alert" } | null;
-
-type EditChannelModalState = { isOpen: boolean; trackIndex: number | null; channelNumber: number | null };
+import { useAtomValue, useSetAtom } from "jotai";
+import { confirmationModalAtom } from "../modalAtoms";
+import { selectedChannelAtom } from "../state";
 
 type UseDashboardUiStateArgs = {
-  selectedChannel: unknown;
   setUserData: (
     updater:
       | ((prev: Record<string, unknown>) => Record<string, unknown>)
@@ -15,32 +13,20 @@ type UseDashboardUiStateArgs = {
   activeSetId: string | null;
 };
 
-export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId }: UseDashboardUiStateArgs) => {
+export const useDashboardUiState = ({ setUserData, activeSetId }: UseDashboardUiStateArgs) => {
   const [workspacePath, setWorkspacePath] = useState<string | null>(null);
-  const [isWorkspaceModalOpen, setIsWorkspaceModalOpen] = useState(false);
   const [workspaceModalMode, setWorkspaceModalMode] = useState<"initial" | "lostSync">("initial");
   const [workspaceModalPath, setWorkspaceModalPath] = useState<string | null>(null);
-
+  
   const [isModuleEditorOpen, setIsModuleEditorOpen] = useState(false);
   const [editingModuleName, setEditingModuleName] = useState<string | null>(null);
   const [editingTemplateType, setEditingTemplateType] = useState<"basic" | "threejs" | "p5js" | null>(
     null
   );
   const [isNewModuleDialogOpen, setIsNewModuleDialogOpen] = useState(false);
-
-  const [isCreateTrackOpen, setIsCreateTrackOpen] = useState(false);
-  const [isCreateSetOpen, setIsCreateSetOpen] = useState(false);
-  const [isSelectTrackModalOpen, setIsSelectTrackModalOpen] = useState(false);
-  const [isSelectSetModalOpen, setIsSelectSetModalOpen] = useState(false);
-  const [isSettingsModalOpen, setIsSettingsModalOpen] = useState(false);
-  const [isAddModuleModalOpen, setIsAddModuleModalOpen] = useState(false);
-  const [isManageModulesModalOpen, setIsManageModulesModalOpen] = useState(false);
-  const [isDebugOverlayOpen, setIsDebugOverlayOpen] = useState(false);
-  const [isReleaseNotesOpen, setIsReleaseNotesOpen] = useState(false);
-  const [isInputMappingsModalOpen, setIsInputMappingsModalOpen] = useState(false);
-
-  const [selectedTrackForModuleMenu, setSelectedTrackForModuleMenu] = useState<number | null>(null);
-  const [confirmationModal, setConfirmationModal] = useState<Confirmation>(null);
+  
+  const selectedChannel = useAtomValue(selectedChannelAtom)
+  const setConfirmationModal = useSetAtom(confirmationModalAtom)
   const [debugLogs, setDebugLogs] = useState<string[]>([]);
   const [isSequencerMuted, setIsSequencerMuted] = useState(false);
   const [isProjectorReady, setIsProjectorReady] = useState(false);
@@ -51,12 +37,6 @@ export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId
     at: number;
   } | null>(null);
 
-  const [editChannelModalState, setEditChannelModalState] = useState<EditChannelModalState>({
-    isOpen: false,
-    trackIndex: null,
-    channelNumber: null,
-  });
-
   const handleCreateNewModule = () => {
     setIsNewModuleDialogOpen(true);
   };
@@ -79,35 +59,16 @@ export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId
     setEditingTemplateType(null);
   };
 
-  const openConfirmationModal = useCallback((message: string, onConfirm: () => void) => {
-    setConfirmationModal({ message, onConfirm, type: "confirm" });
-  }, []);
-
   const openAlertModal = useCallback((message: string) => {
     setConfirmationModal({ message, type: "alert" });
   }, []);
 
-  const openAddModuleModal = useCallback((trackIndex: number) => {
-    setSelectedTrackForModuleMenu(trackIndex);
-    setIsAddModuleModalOpen(true);
-  }, []);
-
-  const handleEditChannel = useCallback(
-    (channelNumber: number) => {
-      if (!selectedChannel) return;
-      setEditChannelModalState({
-        isOpen: true,
-        trackIndex: (selectedChannel as unknown as { trackIndex: number }).trackIndex,
-        channelNumber,
-      });
-    },
-    [selectedChannel]
-  );
+  
 
   const handleDeleteChannel = useCallback(
     (channelNumber: number) => {
       if (!selectedChannel) return;
-      openConfirmationModal(`Are you sure you want to delete Channel ${channelNumber}?`, () => {
+      const onConfirm = () => {
         updateActiveSet(setUserData, activeSetId, (activeSet) => {
           const tracks = (activeSet as unknown as { tracks: unknown[] }).tracks;
           const currentTrack = tracks[
@@ -134,46 +95,20 @@ export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId
             }
           });
         });
-      });
+      }
+      setConfirmationModal({ message: `Are you sure you want to delete Channel ${channelNumber}?`, onConfirm, type: "confirm" });
     },
-    [selectedChannel, setUserData, openConfirmationModal, activeSetId]
+    [selectedChannel, setUserData, setConfirmationModal, activeSetId]
   );
 
   return {
     workspacePath,
     setWorkspacePath,
-    isWorkspaceModalOpen,
-    setIsWorkspaceModalOpen,
     workspaceModalMode,
     setWorkspaceModalMode,
     workspaceModalPath,
     setWorkspaceModalPath,
 
-    isCreateTrackOpen,
-    setIsCreateTrackOpen,
-    isCreateSetOpen,
-    setIsCreateSetOpen,
-    isSelectTrackModalOpen,
-    setIsSelectTrackModalOpen,
-    isSelectSetModalOpen,
-    setIsSelectSetModalOpen,
-    isSettingsModalOpen,
-    setIsSettingsModalOpen,
-    isAddModuleModalOpen,
-    setIsAddModuleModalOpen,
-    isManageModulesModalOpen,
-    setIsManageModulesModalOpen,
-    isDebugOverlayOpen,
-    setIsDebugOverlayOpen,
-    isReleaseNotesOpen,
-    setIsReleaseNotesOpen,
-    isInputMappingsModalOpen,
-    setIsInputMappingsModalOpen,
-
-    selectedTrackForModuleMenu,
-    setSelectedTrackForModuleMenu,
-    openAddModuleModal,
-
     handleCreateNewModule,
     handleCreateModule,
     handleEditModule,
@@ -184,10 +119,7 @@ export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId
     isNewModuleDialogOpen,
     setIsNewModuleDialogOpen,
 
-    confirmationModal,
-    setConfirmationModal,
     openAlertModal,
-    openConfirmationModal,
 
     debugLogs,
     setDebugLogs,
@@ -198,45 +130,15 @@ export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId
     perfStats,
     setPerfStats,
 
-    editChannelModalState,
-    setEditChannelModalState,
-    handleEditChannel,
     handleDeleteChannel,
   } as {
     workspacePath: string | null;
     setWorkspacePath: Dispatch<SetStateAction<string | null>>;
-    isWorkspaceModalOpen: boolean;
-    setIsWorkspaceModalOpen: Dispatch<SetStateAction<boolean>>;
     workspaceModalMode: "initial" | "lostSync";
     setWorkspaceModalMode: Dispatch<SetStateAction<"initial" | "lostSync">>;
     workspaceModalPath: string | null;
     setWorkspaceModalPath: Dispatch<SetStateAction<string | null>>;
 
-    isCreateTrackOpen: boolean;
-    setIsCreateTrackOpen: Dispatch<SetStateAction<boolean>>;
-    isCreateSetOpen: boolean;
-    setIsCreateSetOpen: Dispatch<SetStateAction<boolean>>;
-    isSelectTrackModalOpen: boolean;
-    setIsSelectTrackModalOpen: Dispatch<SetStateAction<boolean>>;
-    isSelectSetModalOpen: boolean;
-    setIsSelectSetModalOpen: Dispatch<SetStateAction<boolean>>;
-    isSettingsModalOpen: boolean;
-    setIsSettingsModalOpen: Dispatch<SetStateAction<boolean>>;
-    isAddModuleModalOpen: boolean;
-    setIsAddModuleModalOpen: Dispatch<SetStateAction<boolean>>;
-    isManageModulesModalOpen: boolean;
-    setIsManageModulesModalOpen: Dispatch<SetStateAction<boolean>>;
-    isDebugOverlayOpen: boolean;
-    setIsDebugOverlayOpen: Dispatch<SetStateAction<boolean>>;
-    isReleaseNotesOpen: boolean;
-    setIsReleaseNotesOpen: Dispatch<SetStateAction<boolean>>;
-    isInputMappingsModalOpen: boolean;
-    setIsInputMappingsModalOpen: Dispatch<SetStateAction<boolean>>;
-
-    selectedTrackForModuleMenu: number | null;
-    setSelectedTrackForModuleMenu: Dispatch<SetStateAction<number | null>>;
-    openAddModuleModal: (trackIndex: number) => void;
-
     handleCreateNewModule: () => void;
     handleCreateModule: (moduleName: string, templateType: string) => void;
     handleEditModule: (moduleName: string) => void;
@@ -247,10 +149,7 @@ export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId
     isNewModuleDialogOpen: boolean;
     setIsNewModuleDialogOpen: Dispatch<SetStateAction<boolean>>;
 
-    confirmationModal: Confirmation;
-    setConfirmationModal: Dispatch<SetStateAction<Confirmation>>;
     openAlertModal: (message: string) => void;
-    openConfirmationModal: (message: string, onConfirm: () => void) => void;
 
     debugLogs: string[];
     setDebugLogs: Dispatch<SetStateAction<string[]>>;
@@ -263,9 +162,6 @@ export const useDashboardUiState = ({ selectedChannel, setUserData, activeSetId
       SetStateAction<{ fps: number; frameMsAvg: number; longFramePct: number; at: number } | null>
     >;
 
-    editChannelModalState: EditChannelModalState;
-    setEditChannelModalState: Dispatch<SetStateAction<EditChannelModalState>>;
-    handleEditChannel: (channelNumber: number) => void;
     handleDeleteChannel: (channelNumber: number) => void;
   };
 };
diff --git a/src/dashboard/core/hooks/useWorkspaceModules.ts b/src/dashboard/core/hooks/useWorkspaceModules.ts
index b066eb7..18564e9 100644
--- a/src/dashboard/core/hooks/useWorkspaceModules.ts
+++ b/src/dashboard/core/hooks/useWorkspaceModules.ts
@@ -3,6 +3,8 @@ import type { Dispatch, SetStateAction, MutableRefObject } from "react";
 import { getProjectDir } from "../../../shared/utils/projectDir";
 import { updateUserData } from "../utils";
 import { useIPCListener } from "./useIPC";
+import { useAtomValue } from "jotai";
+import { workspaceModalAtom } from "../modalAtoms";
 
 type ModuleStatus = "uninspected" | "ready" | "failed";
 
@@ -22,7 +24,6 @@ type ModuleEntry = {
 
 type UseWorkspaceModulesArgs = {
   workspacePath: string | null;
-  isWorkspaceModalOpen: boolean;
   sendToProjector: (type: string, props: Record<string, unknown>) => void;
   userData: unknown;
   setUserData: Parameters<typeof updateUserData>[0];
@@ -39,7 +40,6 @@ type UseWorkspaceModulesArgs = {
 
 export const useWorkspaceModules = ({
   workspacePath,
-  isWorkspaceModalOpen,
   sendToProjector,
   userData,
   setUserData,
@@ -53,6 +53,7 @@ export const useWorkspaceModules = ({
   didMigrateWorkspaceModuleTypesRef,
   loadModulesRunIdRef,
 }: UseWorkspaceModulesArgs) => {
+  const isWorkspaceModalOpen = useAtomValue(workspaceModalAtom)
   const loadModules = useCallback(async () => {
     const runId = ++loadModulesRunIdRef.current;
     const isStale = () => runId !== loadModulesRunIdRef.current;
diff --git a/src/dashboard/core/modalAtoms.ts b/src/dashboard/core/modalAtoms.ts
new file mode 100644
index 0000000..6f691a5
--- /dev/null
+++ b/src/dashboard/core/modalAtoms.ts
@@ -0,0 +1,28 @@
+import { atom } from "jotai"
+import { Confirmation } from "../modals/ConfirmationModal"
+
+type EditChannelModalState = { isOpen: boolean; trackIndex: number | null; channelNumber: number | null };
+type EditTrackmodalState = {isOpen: boolean, trackIndex: number | null}
+
+export const confirmationModalAtom = atom<Confirmation>()
+
+export const workspaceModalAtom = atom(false)
+export const selectSetModalAtom = atom(false)
+export const selectTrackModalAtom = atom(false)
+export const createSetModalAtom = atom(false)
+export const createTrackModalAtom = atom(false)
+export const settingsModalAtom = atom(false)
+export const inputMappingsModalAtom = atom(false)
+export const releaseNotesModalAtom = atom(false)
+export const addModuleModalAtom = atom<"add-to-track" | "manage-modules" | false>(false)
+export const moduleEditorModalAtom = atom(false)
+export const debugOverlayModalAtom = atom(false)
+export const editTrackModalAtom = atom<EditTrackmodalState>({isOpen: false, trackIndex: null})
+
+export const newModuleDialogAtom = atom(false)
+
+export const editChannelModalAtom = atom<EditChannelModalState>({
+  isOpen: false,
+  trackIndex: null,
+  channelNumber: null,
+})
diff --git a/src/dashboard/core/state.ts b/src/dashboard/core/state.ts
index 3a474f9..1ae37a8 100644
--- a/src/dashboard/core/state.ts
+++ b/src/dashboard/core/state.ts
@@ -1,5 +1,6 @@
 import { atom, useAtom } from "jotai";
 import { useRef, useCallback, useEffect } from "react";
+import { SelectedChannel } from "../modals/MethodConfiguratorModal";
 
 export const userDataAtom = atom<{ config: Record<string, unknown>; sets: unknown[] }>({
   config: {},
@@ -8,13 +9,14 @@ export const userDataAtom = atom<{ config: Record<string, unknown>; sets: unknow
 export const recordingDataAtom = atom<Record<string, unknown>>({});
 export const activeTrackIdAtom = atom<string | number | null>(null);
 export const activeSetIdAtom = atom<string | null>(null);
-export const selectedChannelAtom = atom<unknown>(null);
+export const selectedChannelAtom = atom<SelectedChannel>();
 export const flashingChannelsAtom = atom<Set<string>>(new Set<string>());
 export const flashingConstructorsAtom = atom<Set<string>>(new Set<string>());
 export const recordingStateAtom = atom<Record<string, { startTime: number; isRecording: boolean }>>(
   {}
 );
 export const helpTextAtom = atom<string>("");
+export const selectedTrackForModuleMenuAtom = atom<number>()
 
 export const useFlashingChannels = (): [
   Set<string>,
diff --git a/src/dashboard/modals/AddModuleModal.tsx b/src/dashboard/modals/AddModuleModal.tsx
index 1963935..331bea2 100644
--- a/src/dashboard/modals/AddModuleModal.tsx
+++ b/src/dashboard/modals/AddModuleModal.tsx
@@ -7,10 +7,11 @@ import { ModalHeader } from "../components/ModalHeader";
 import { Button } from "../components/Button";
 import { HelpIcon } from "../components/HelpIcon";
 import { Tooltip } from "../components/Tooltip";
-import { activeSetIdAtom, activeTrackIdAtom } from "../core/state";
+import { activeSetIdAtom, activeTrackIdAtom, selectedTrackForModuleMenuAtom } from "../core/state";
 import { updateActiveSet } from "../core/utils";
 import { getActiveSetTracks } from "../../shared/utils/setUtils";
 import { HELP_TEXT } from "../../shared/helpText";
+import { addModuleModalAtom } from "../core/modalAtoms";
 
 type ModuleMethod = {
   name: string;
@@ -41,29 +42,21 @@ type UserData = {
 };
 
 type AddModuleModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
-  trackIndex: number | null;
   userData: UserData;
   setUserData: (updater: unknown) => void;
   predefinedModules: PredefinedModule[];
   skippedWorkspaceModules?: Array<{ file: string; reason: string }>;
   onCreateNewModule?: () => void;
   onEditModule: (moduleId: string) => void;
-  mode?: "add-to-track" | "manage-modules";
 };
 
 export const AddModuleModal = ({
-  isOpen,
-  onClose,
-  trackIndex,
   userData,
   setUserData,
   predefinedModules,
   skippedWorkspaceModules,
   onCreateNewModule: _onCreateNewModule,
   onEditModule,
-  mode = "add-to-track",
 }: AddModuleModalProps) => {
   const sendToProjector = useIPCSend("dashboard-to-projector");
   const [hoveredPreviewModuleId, setHoveredPreviewModuleId] = useState<string | null>(null);
@@ -73,6 +66,13 @@ export const AddModuleModal = ({
     requestId: null,
   });
   const lastAutoPreviewSentRef = useRef<string | null>(null);
+  const [mode, setMode] = useAtom(addModuleModalAtom)
+  const [trackIndex, setSelectedTrackForModuleMenu] = useAtom(selectedTrackForModuleMenuAtom)
+  const isOpen = !!mode
+  const onClose = () => {
+    setMode(false);
+    if (mode === "add-to-track") setSelectedTrackForModuleMenu(null);
+  }
 
   const handleClose = () => {
     setHoveredPreviewModuleId(null);
diff --git a/src/dashboard/modals/ConfirmationModal.tsx b/src/dashboard/modals/ConfirmationModal.tsx
index 118cc7d..1ff88ef 100644
--- a/src/dashboard/modals/ConfirmationModal.tsx
+++ b/src/dashboard/modals/ConfirmationModal.tsx
@@ -3,23 +3,22 @@ import { Modal } from "../shared/Modal";
 import { ModalHeader } from "../components/ModalHeader";
 import { ModalFooter } from "../components/ModalFooter";
 import { Button } from "../components/Button";
+import { useAtom } from "jotai";
+import { confirmationModalAtom } from "../core/modalAtoms";
 
-type ConfirmationModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
+export interface Confirmation {
   message: string | null;
   onConfirm?: (() => void) | null;
   type?: "confirm" | "alert";
 };
 
-export const ConfirmationModal = ({
-  isOpen,
-  onClose,
-  message,
-  onConfirm,
-  type = "confirm",
-}: ConfirmationModalProps) => {
+export const ConfirmationModal = () => {
+  const [confirmationData, setConfirmation] = useAtom(confirmationModalAtom)
+  const isOpen = !!confirmationData
+  const onClose = () => setConfirmation(null)
+
   if (!isOpen) return null;
+  const {message, onConfirm, type} = confirmationData
 
   const handleConfirm = () => {
     if (onConfirm) {
diff --git a/src/dashboard/modals/CreateSetModal.tsx b/src/dashboard/modals/CreateSetModal.tsx
index c2d3fc9..22efbc3 100644
--- a/src/dashboard/modals/CreateSetModal.tsx
+++ b/src/dashboard/modals/CreateSetModal.tsx
@@ -8,14 +8,15 @@ import { TextInput, Label, ValidationError } from "../components/FormInputs";
 import { useNameValidation } from "../core/hooks/useNameValidation";
 import { userDataAtom, activeTrackIdAtom, activeSetIdAtom } from "../core/state";
 import { updateUserData } from "../core/utils";
+import { createSetModalAtom } from "../core/modalAtoms";
 
 type CreateSetModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   onAlert?: ((message: string) => void) | null;
 };
 
-export const CreateSetModal = ({ isOpen, onClose, onAlert }: CreateSetModalProps) => {
+export const CreateSetModal = ({ onAlert }: CreateSetModalProps) => {
+  const [isOpen, setIsOpen] = useAtom(createSetModalAtom)
+  const onClose = () => setIsOpen(false)
   const [userData, setUserData] = useAtom(userDataAtom);
   const [, setActiveTrackId] = useAtom(activeTrackIdAtom as unknown as PrimitiveAtom<string | null>);
   const [, setActiveSetId] = useAtom(activeSetIdAtom as unknown as PrimitiveAtom<string | null>);
diff --git a/src/dashboard/modals/CreateTrackModal.tsx b/src/dashboard/modals/CreateTrackModal.tsx
index 6ca552c..35517c0 100644
--- a/src/dashboard/modals/CreateTrackModal.tsx
+++ b/src/dashboard/modals/CreateTrackModal.tsx
@@ -13,6 +13,7 @@ import { HELP_TEXT } from "../../shared/helpText";
 import { useNameValidation } from "../core/hooks/useNameValidation";
 import { useTrackSlots } from "../core/hooks/useTrackSlots";
 import { parsePitchClass, pitchClassToName } from "../../shared/midi/midiUtils";
+import { createTrackModalAtom } from "../core/modalAtoms";
 
 type InputConfigLike = {
   type?: unknown;
@@ -20,13 +21,13 @@ type InputConfigLike = {
 };
 
 type CreateTrackModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   inputConfig?: InputConfigLike | null;
   onAlert?: ((message: string) => void) | null;
 };
 
-export const CreateTrackModal = ({ isOpen, onClose, inputConfig, onAlert }: CreateTrackModalProps) => {
+export const CreateTrackModal = ({ inputConfig, onAlert }: CreateTrackModalProps) => {
+  const [isOpen, setIsOpen] = useAtom(createTrackModalAtom)
+  const onClose = () => setIsOpen(false)
   const [userData, setUserData] = useAtom(userDataAtom);
   const [, setActiveTrackId] = useAtom(activeTrackIdAtom as unknown as PrimitiveAtom<string | null>);
   const [activeSetId] = useAtom(activeSetIdAtom);
diff --git a/src/dashboard/modals/DebugOverlayModal.tsx b/src/dashboard/modals/DebugOverlayModal.tsx
index e336424..39e4bec 100644
--- a/src/dashboard/modals/DebugOverlayModal.tsx
+++ b/src/dashboard/modals/DebugOverlayModal.tsx
@@ -2,6 +2,8 @@ import React, { memo, useRef, useEffect, useMemo } from "react";
 import { Button } from "../components/Button";
 import { HelpIcon } from "../components/HelpIcon";
 import { HELP_TEXT } from "../../shared/helpText";
+import { debugOverlayModalAtom } from "../core/modalAtoms";
+import { useAtom } from "jotai";
 
 const renderColoredLog = (log: string) => {
   const lines = log.split("\n");
@@ -209,16 +211,16 @@ const LogItem = memo(({ log }: LogItemProps) => {
 LogItem.displayName = "LogItem";
 
 type DebugOverlayModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   debugLogs: string[];
   perfStats?: { fps: number; frameMsAvg: number; longFramePct: number; at: number } | null;
 };
 
 export const DebugOverlayModal = memo(
-  ({ isOpen, onClose, debugLogs, perfStats }: DebugOverlayModalProps) => {
+  ({ debugLogs, perfStats }: DebugOverlayModalProps) => {
   const logContainerRef = useRef<HTMLDivElement | null>(null);
   const scrollTimeoutRef = useRef<number | null>(null);
+  const [isOpen, setIsOpen] = useAtom(debugOverlayModalAtom)
+  const onClose = () => setIsOpen(false)
 
   const visibleLogs = useMemo(() => {
     return debugLogs.slice(-200);
diff --git a/src/dashboard/modals/EditChannelModal.tsx b/src/dashboard/modals/EditChannelModal.tsx
index 4601994..1c2b8e0 100644
--- a/src/dashboard/modals/EditChannelModal.tsx
+++ b/src/dashboard/modals/EditChannelModal.tsx
@@ -11,6 +11,7 @@ import { updateActiveSet, updateUserData } from "../core/utils";
 import { getActiveSetTracks } from "../../shared/utils/setUtils";
 import { HELP_TEXT } from "../../shared/helpText";
 import { parsePitchClass, pitchClassToName, resolveChannelTrigger } from "../../shared/midi/midiUtils";
+import { editChannelModalAtom } from "../core/modalAtoms";
 
 const asPlainObject = (value: unknown): Record<string, unknown> | null => {
   if (!value) return null;
@@ -37,23 +38,18 @@ type AppConfigLike = {
 };
 
 type EditChannelModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
-  trackIndex: number;
-  channelNumber: number;
   inputConfig?: InputConfigLike | null;
   config?: AppConfigLike | null;
 };
 
 export const EditChannelModal = ({
-  isOpen,
-  onClose,
-  trackIndex,
-  channelNumber,
   inputConfig,
   config,
 }: EditChannelModalProps) => {
   const [userData, setUserData] = useAtom(userDataAtom);
+  const [editChannelData, dispatch] = useAtom(editChannelModalAtom)
+  const onClose = () => dispatch({isOpen: false, channelNumber: null, trackIndex: null})
+  const {channelNumber, trackIndex, isOpen} = editChannelData
   const [activeSetId] = useAtom(activeSetIdAtom);
   const [newChannelNumber, setNewChannelNumber] = useState(1);
 
diff --git a/src/dashboard/modals/EditSetModal.tsx b/src/dashboard/modals/EditSetModal.tsx
index 7022ca2..4624093 100644
--- a/src/dashboard/modals/EditSetModal.tsx
+++ b/src/dashboard/modals/EditSetModal.tsx
@@ -1,5 +1,5 @@
-import React, { useState, useEffect } from "react";
-import { useAtom } from "jotai";
+import { useState, useEffect } from "react";
+import { useAtom, useSetAtom } from "jotai";
 import { Modal } from "../shared/Modal";
 import { ModalHeader } from "../components/ModalHeader";
 import { ModalFooter } from "../components/ModalFooter";
@@ -8,12 +8,12 @@ import { TextInput, Label, ValidationError } from "../components/FormInputs";
 import { userDataAtom } from "../core/state";
 import { updateUserData } from "../core/utils";
 import { useNameValidation } from "../core/hooks/useNameValidation";
+import { confirmationModalAtom } from "../core/modalAtoms";
 
 type EditSetModalProps = {
   isOpen: boolean;
   onClose: () => void;
   setId: string | null;
-  onAlert?: ((message: string) => void) | null;
 };
 
 type SetLike = {
@@ -21,8 +21,9 @@ type SetLike = {
   name?: unknown;
 };
 
-export const EditSetModal = ({ isOpen, onClose, setId, onAlert }: EditSetModalProps) => {
+export const EditSetModal = ({ isOpen, onClose, setId }: EditSetModalProps) => {
   const [userData, setUserData] = useAtom(userDataAtom);
+  const setConfirmationModal = useSetAtom(confirmationModalAtom)
   const [setName, setSetName] = useState("");
   const [submitting, setSubmitting] = useState(false);
 
@@ -65,7 +66,10 @@ export const EditSetModal = ({ isOpen, onClose, setId, onAlert }: EditSetModalPr
       onClose();
     } catch (e) {
       console.error("Error updating set:", e);
-      if (onAlert) onAlert("Failed to update set.");
+      setConfirmationModal({
+        message: "Failed to update set.",
+        type: 'alert'
+      });
     } finally {
       setSubmitting(false);
     }
diff --git a/src/dashboard/modals/EditTrackModal.tsx b/src/dashboard/modals/EditTrackModal.tsx
index 1ecbd2c..def0630 100644
--- a/src/dashboard/modals/EditTrackModal.tsx
+++ b/src/dashboard/modals/EditTrackModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from "react";
+import { useState, useEffect, useMemo } from "react";
 import { useAtom } from "jotai";
 import { Modal } from "../shared/Modal";
 import { ModalHeader } from "../components/ModalHeader";
@@ -13,6 +13,7 @@ import { HELP_TEXT } from "../../shared/helpText";
 import { useNameValidation } from "../core/hooks/useNameValidation";
 import { useTrackSlots } from "../core/hooks/useTrackSlots";
 import { parsePitchClass, pitchClassToName } from "../../shared/midi/midiUtils";
+import { editTrackModalAtom } from "../core/modalAtoms";
 
 type InputConfigLike = {
   type?: unknown;
@@ -20,14 +21,14 @@ type InputConfigLike = {
 };
 
 type EditTrackModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
-  trackIndex: number;
   inputConfig?: InputConfigLike | null;
 };
 
-export const EditTrackModal = ({ isOpen, onClose, trackIndex, inputConfig }: EditTrackModalProps) => {
+export const EditTrackModal = ({ inputConfig }: EditTrackModalProps) => {
   const [userData, setUserData] = useAtom(userDataAtom);
+  const [editTrackData, dispatch] = useAtom(editTrackModalAtom)
+  const {isOpen, trackIndex} = editTrackData
+  const onClose = () => dispatch({isOpen: false, trackIndex: null})
   const [activeSetId] = useAtom(activeSetIdAtom);
   const [trackName, setTrackName] = useState("");
   const [trackSlot, setTrackSlot] = useState(1);
@@ -83,7 +84,7 @@ export const EditTrackModal = ({ isOpen, onClose, trackIndex, inputConfig }: Edi
     }
   }, [isOpen, track]);
 
-  if (!isOpen) return null;
+  if (!isOpen || !trackIndex) return null;
 
   const canSubmit = validation.isValid && trackSlot && availableSlots.includes(trackSlot);
 
diff --git a/src/dashboard/modals/InputMappingsModal.tsx b/src/dashboard/modals/InputMappingsModal.tsx
index c10251b..1441553 100644
--- a/src/dashboard/modals/InputMappingsModal.tsx
+++ b/src/dashboard/modals/InputMappingsModal.tsx
@@ -7,16 +7,14 @@ import { userDataAtom } from "../core/state";
 import { updateUserData } from "../core/utils";
 import { DEFAULT_GLOBAL_MAPPINGS } from "../../shared/config/defaultConfig";
 import { parsePitchClass, pitchClassToName } from "../../shared/midi/midiUtils";
+import { inputMappingsModalAtom } from "../core/modalAtoms";
 
 type ActiveTab = "midi-pitchClass" | "midi-exactNote" | "osc";
 
-type InputMappingsModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
-};
-
-export const InputMappingsModal = ({ isOpen, onClose }: InputMappingsModalProps) => {
+export const InputMappingsModal = () => {
   const [userData, setUserData] = useAtom(userDataAtom);
+  const [isOpen, setIsOpen] = useAtom(inputMappingsModalAtom)
+  const onClose = () => setIsOpen(false)
   const [activeTab, setActiveTab] = useState<ActiveTab>("midi-pitchClass");
   const wasOpenRef = useRef(false);
 
diff --git a/src/dashboard/modals/MethodConfiguratorModal.tsx b/src/dashboard/modals/MethodConfiguratorModal.tsx
index 267e66b..37223cb 100644
--- a/src/dashboard/modals/MethodConfiguratorModal.tsx
+++ b/src/dashboard/modals/MethodConfiguratorModal.tsx
@@ -1,5 +1,5 @@
 import { memo, Fragment, useState, useMemo, useCallback, useEffect, useRef, type ChangeEvent } from "react";
-import { useAtom } from "jotai";
+import { useAtom, useSetAtom } from "jotai";
 import { remove } from "lodash";
 import { useIPCSend } from "../core/hooks/useIPC";
 import { Modal } from "../shared/Modal";
@@ -20,6 +20,7 @@ import { getActiveSetTracks } from "../../shared/utils/setUtils";
 import { getBaseMethodNames } from "../utils/moduleUtils";
 import { HELP_TEXT } from "../../shared/helpText";
 import { MethodCodeModal } from "./MethodCodeModal";
+import { editChannelModalAtom } from "../core/modalAtoms";
 
 type MethodOption = {
   name: string;
@@ -262,7 +263,7 @@ const SortableItem = memo(
 
 SortableItem.displayName = "SortableItem";
 
-type SelectedChannel = {
+export type SelectedChannel = {
   trackIndex: number;
   instanceId: string;
   moduleType: string;
@@ -271,10 +272,7 @@ type SelectedChannel = {
 };
 
 type MethodConfiguratorModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   predefinedModules: PredefinedModule[];
-  onEditChannel?: (channelNumber: number) => void;
   onDeleteChannel?: (channelNumber: number) => void;
   workspacePath?: string | null;
   workspaceModuleFiles?: string[];
@@ -282,17 +280,25 @@ type MethodConfiguratorModalProps = {
 };
 
 export const MethodConfiguratorModal = ({
-  isOpen,
-  onClose,
   predefinedModules,
-  onEditChannel,
   onDeleteChannel,
   workspacePath = null,
   workspaceModuleFiles = [],
   workspaceModuleLoadFailures = [],
 }: MethodConfiguratorModalProps) => {
   const [userData, setUserData] = useAtom(userDataAtom);
-  const [selectedChannel] = useAtom(selectedChannelAtom);
+  const [selectedChannel, setSelectedChannel] = useAtom(selectedChannelAtom);
+  const setEditChannelModal = useSetAtom(editChannelModalAtom);
+  const isOpen = !!selectedChannel
+  const onClose = () => setSelectedChannel(null)
+  const onEditChannel = (channelNumber: number) => {
+    if (!selectedChannel) return;
+    setEditChannelModal({
+      isOpen: true,
+      trackIndex: (selectedChannel as unknown as { trackIndex: number }).trackIndex,
+      channelNumber,
+    });
+  }
   const [selectedMethodForCode, setSelectedMethodForCode] = useState<{
     moduleName: string | null;
     methodName: string;
diff --git a/src/dashboard/modals/ReleaseNotesModal.tsx b/src/dashboard/modals/ReleaseNotesModal.tsx
index e2f861f..7fbcfe3 100644
--- a/src/dashboard/modals/ReleaseNotesModal.tsx
+++ b/src/dashboard/modals/ReleaseNotesModal.tsx
@@ -3,6 +3,8 @@ import { Modal } from "../shared/Modal";
 import { ModalHeader } from "../components/ModalHeader";
 import { ModalFooter } from "../components/ModalFooter";
 import { Button } from "../components/Button";
+import { useAtom } from "jotai";
+import { releaseNotesModalAtom } from "../core/modalAtoms";
 
 const REQUEST_TIMEOUT_MS = 6000;
 
@@ -62,12 +64,7 @@ type Release = {
 
 type Status = "idle" | "loading" | "ready" | "error";
 
-type ReleaseNotesModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
-};
-
-export const ReleaseNotesModal = ({ isOpen, onClose }: ReleaseNotesModalProps) => {
+export const ReleaseNotesModal = () => {
   const repoInfo = useMemo(() => {
     const bridge = getBridge();
     const repoUrl =
@@ -82,6 +79,8 @@ export const ReleaseNotesModal = ({ isOpen, onClose }: ReleaseNotesModalProps) =
     return bridge?.app?.getVersion ? bridge.app.getVersion() : null;
   }, []);
 
+  const [isOpen, setIsOpen] = useAtom(releaseNotesModalAtom)
+  const onClose = () => setIsOpen(false)
   const [status, setStatus] = useState<Status>("idle");
   const [releases, setReleases] = useState<Release[]>([]);
 
diff --git a/src/dashboard/modals/SelectSetModal.tsx b/src/dashboard/modals/SelectSetModal.tsx
index 3c2bf8e..6a89056 100644
--- a/src/dashboard/modals/SelectSetModal.tsx
+++ b/src/dashboard/modals/SelectSetModal.tsx
@@ -9,8 +9,9 @@ import { Button } from "../components/Button";
 import { RadioButton, Label } from "../components/FormInputs";
 import { updateUserData } from "../core/utils";
 import { EditSetModal } from "./EditSetModal";
-import { ConfirmationModal } from "./ConfirmationModal";
 import { deleteRecordingsForTracks } from "../../shared/json/recordingUtils";
+import { confirmationModalAtom, createSetModalAtom, selectSetModalAtom } from "../core/modalAtoms";
+import { useAtom, useSetAtom } from "jotai";
 
 type Set = {
   id: string;
@@ -89,8 +90,6 @@ type UserData = {
 };
 
 type SelectSetModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   userData: UserData;
   setUserData: (updater: unknown) => void;
   activeTrackId: string | number | null;
@@ -99,13 +98,9 @@ type SelectSetModalProps = {
   setActiveSetId: (id: string | null) => void;
   recordingData: Record<string, unknown>;
   setRecordingData: (updater: (prev: Record<string, unknown>) => Record<string, unknown>) => void;
-  onCreateSet: () => void;
-  onConfirmDelete: (message: string, onConfirm: () => void) => void;
 };
 
 export const SelectSetModal = ({
-  isOpen,
-  onClose,
   userData,
   setUserData,
   activeTrackId: _activeTrackId,
@@ -114,14 +109,20 @@ export const SelectSetModal = ({
   setActiveSetId,
   recordingData: _recordingData,
   setRecordingData,
-  onCreateSet,
-  onConfirmDelete,
 }: SelectSetModalProps) => {
+  const [isOpen, setIsOpen] = useAtom(selectSetModalAtom)
+  const onClose = () => setIsOpen(false)
+  const toggleCreateSet = useSetAtom(createSetModalAtom)
   const [editingSetId, setEditingSetId] = useState<string | null>(null);
-  const [alertMessage, setAlertMessage] = useState<string | null>(null);
+  const setConfirmationModal = useSetAtom(confirmationModalAtom)
 
   const sets = userData.sets || [];
 
+  const handleCreateSet = () => {
+    onClose();
+    toggleCreateSet(true)
+  }
+
   const handleSetSelect = (setId: string) => {
     setActiveSetId(setId);
 
@@ -139,47 +140,52 @@ export const SelectSetModal = ({
 
   const handleDeleteSet = (setId: string) => {
     if (sets.length <= 1) {
-      setAlertMessage("Cannot delete the last set.");
+      setConfirmationModal({
+        message: "Cannot delete the last set.",
+        type: 'alert'
+      });
       return;
     }
 
     const setToDelete = sets.find((s) => s.id === setId);
     if (!setToDelete) return;
 
-    onConfirmDelete(
-      `Are you sure you want to delete "${setToDelete.name}"?`,
-      () => {
-        const trackIdsToDelete = setToDelete.tracks.map((t) => t.id);
+    const onConfirm = () => {
+      const trackIdsToDelete = setToDelete.tracks.map((t) => t.id);
 
-        updateUserData(setUserData, (draft) => {
-          const d = draft as unknown as UserData;
-          d.sets = d.sets.filter((s) => s.id !== setId);
-        });
+      updateUserData(setUserData, (draft) => {
+        const d = draft as unknown as UserData;
+        d.sets = d.sets.filter((s) => s.id !== setId);
+      });
 
-        if (trackIdsToDelete.length > 0) {
-          setRecordingData((prev) =>
-            deleteRecordingsForTracks(prev, trackIdsToDelete.map(String))
-          );
-        }
+      if (trackIdsToDelete.length > 0) {
+        setRecordingData((prev) =>
+          deleteRecordingsForTracks(prev, trackIdsToDelete.map(String))
+        );
+      }
 
-        if (activeSetId === setId) {
-          const newSet = sets.find((s) => s.id !== setId);
-          if (newSet) {
-            setActiveSetId(newSet.id);
-            if (newSet.tracks.length > 0) {
-              const firstTrack =
-                newSet.tracks.find((t) => t.isVisible) || newSet.tracks[0];
-              setActiveTrackId(firstTrack.id);
-            } else {
-              setActiveTrackId(null);
-            }
+      if (activeSetId === setId) {
+        const newSet = sets.find((s) => s.id !== setId);
+        if (newSet) {
+          setActiveSetId(newSet.id);
+          if (newSet.tracks.length > 0) {
+            const firstTrack =
+              newSet.tracks.find((t) => t.isVisible) || newSet.tracks[0];
+            setActiveTrackId(firstTrack.id);
           } else {
-            setActiveSetId(null);
             setActiveTrackId(null);
           }
+        } else {
+          setActiveSetId(null);
+          setActiveTrackId(null);
         }
       }
-    );
+    }
+    setConfirmationModal({
+      message: `Are you sure you want to delete "${setToDelete.name}"?`,
+      onConfirm,
+      type: 'confirm'
+    });
   };
 
   return (
@@ -217,7 +223,7 @@ export const SelectSetModal = ({
         </div>
 
         <ModalFooter>
-          <Button onClick={onCreateSet} icon={<FaPlus />}>
+          <Button onClick={handleCreateSet} icon={<FaPlus />}>
             Create Set
           </Button>
         </ModalFooter>
@@ -227,14 +233,6 @@ export const SelectSetModal = ({
         isOpen={!!editingSetId}
         onClose={() => setEditingSetId(null)}
         setId={editingSetId}
-        onAlert={setAlertMessage}
-      />
-
-      <ConfirmationModal
-        isOpen={!!alertMessage}
-        onClose={() => setAlertMessage(null)}
-        message={alertMessage}
-        type="alert"
       />
     </>
   );
diff --git a/src/dashboard/modals/SelectTrackModal.tsx b/src/dashboard/modals/SelectTrackModal.tsx
index 1cb2d73..9b7a957 100644
--- a/src/dashboard/modals/SelectTrackModal.tsx
+++ b/src/dashboard/modals/SelectTrackModal.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { FaPlus, FaEdit, FaTrash } from "react-icons/fa";
 import { Modal } from "../shared/Modal";
 import { SortableWrapper } from "../shared/SortableWrapper";
@@ -16,6 +15,8 @@ import {
   pitchClassToName,
   resolveTrackTrigger,
 } from "../../shared/midi/midiUtils";
+import { useAtom, useSetAtom } from "jotai";
+import { confirmationModalAtom, createTrackModalAtom, editTrackModalAtom, selectTrackModalAtom } from "../core/modalAtoms";
 
 type Track = {
   id: string | number;
@@ -29,7 +30,6 @@ type SortableTrackItemProps = {
   inputType: string;
   globalMappings: Record<string, unknown>;
   onTrackSelect: (id: string | number) => void;
-  onEdit: (index: number) => void;
   onDelete: (index: number) => void;
 };
 
@@ -40,9 +40,9 @@ const SortableTrackItem = ({
   inputType,
   globalMappings,
   onTrackSelect,
-  onEdit,
   onDelete,
 }: SortableTrackItemProps) => {
+  const setEditTrack = useSetAtom(editTrackModalAtom)
   return (
     <SortableWrapper id={track.id}>
       {({ dragHandleProps, isDragging: _isDragging }) => (
@@ -90,7 +90,7 @@ const SortableTrackItem = ({
             })()}
           </label>
           <button
-            onClick={() => onEdit(trackIndex)}
+            onClick={() => setEditTrack({isOpen: true, trackIndex})}
             className="text-neutral-500 hover:text-neutral-300 text-[11px]"
           >
             <FaEdit />
@@ -118,8 +118,6 @@ type UserData = {
 };
 
 type SelectTrackModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   userData: UserData;
   setUserData: (updater: unknown) => void;
   activeTrackId: string | number | null;
@@ -127,13 +125,9 @@ type SelectTrackModalProps = {
   activeSetId: string | null;
   recordingData: Record<string, unknown>;
   setRecordingData: (updater: (prev: Record<string, unknown>) => Record<string, unknown>) => void;
-  onCreateTrack: () => void;
-  onConfirmDelete: (message: string, onConfirm: () => void) => void;
 };
 
 export const SelectTrackModal = ({
-  isOpen,
-  onClose,
   userData,
   setUserData,
   activeTrackId,
@@ -141,10 +135,11 @@ export const SelectTrackModal = ({
   activeSetId,
   recordingData: _recordingData,
   setRecordingData,
-  onCreateTrack,
-  onConfirmDelete,
 }: SelectTrackModalProps) => {
-  const [editingTrackIndex, setEditingTrackIndex] = useState<number | null>(null);
+  const [isOpen, setIsOpen] = useAtom(selectTrackModalAtom)
+  const [_, setCreateTrackIsOpen] = useAtom(createTrackModalAtom)
+  const setConfirmationModal = useSetAtom(confirmationModalAtom)
+  const onClose = () => setIsOpen(false)
 
   const tracks = getActiveSetTracks(userData, activeSetId);
   const _activeSet = getActiveSet(userData, activeSetId);
@@ -156,11 +151,16 @@ export const SelectTrackModal = ({
     onClose();
   };
 
+  const handleCreateTrack = () => {
+    onClose()
+    setCreateTrackIsOpen(true);
+  }
+
   const handleDeleteTrack = (trackIndex: number) => {
     const track = tracks[trackIndex];
     if (!track) return;
 
-    onConfirmDelete(`Are you sure you want to delete track "${track.name}"?`, () => {
+    const onConfirm = () => {
       updateActiveSet(setUserData, activeSetId, (activeSet) => {
         const tracksUnknown = (activeSet as Record<string, unknown>).tracks;
         if (Array.isArray(tracksUnknown)) {
@@ -178,6 +178,10 @@ export const SelectTrackModal = ({
           setActiveTrackId(null);
         }
       }
+    }
+    setConfirmationModal({
+      message: `Are you sure you want to delete track "${track.name}"?`,
+      onConfirm
     });
   };
 
@@ -219,7 +223,6 @@ export const SelectTrackModal = ({
                       inputType={String(inputType)}
                       globalMappings={globalMappings}
                       onTrackSelect={handleTrackSelect}
-                      onEdit={setEditingTrackIndex}
                       onDelete={handleDeleteTrack}
                     />
                   ))}
@@ -230,20 +233,13 @@ export const SelectTrackModal = ({
         </div>
 
         <ModalFooter>
-          <Button onClick={onCreateTrack} icon={<FaPlus />}>
+          <Button onClick={handleCreateTrack} icon={<FaPlus />}>
             Create Track
           </Button>
         </ModalFooter>
       </Modal>
 
-      {editingTrackIndex !== null && (
-        <EditTrackModal
-          isOpen={true}
-          onClose={() => setEditingTrackIndex(null)}
-          trackIndex={editingTrackIndex}
-          inputConfig={userData.config?.input || {}}
-        />
-      )}
+      <EditTrackModal inputConfig={userData.config?.input || {}} />
     </>
   );
 };
diff --git a/src/dashboard/modals/SettingsModal.tsx b/src/dashboard/modals/SettingsModal.tsx
index 3eff911..e341738 100644
--- a/src/dashboard/modals/SettingsModal.tsx
+++ b/src/dashboard/modals/SettingsModal.tsx
@@ -11,6 +11,8 @@ import {
 } from "../components/FormInputs";
 import { HelpIcon } from "../components/HelpIcon";
 import { HELP_TEXT } from "../../shared/helpText";
+import { useAtom } from "jotai";
+import { inputMappingsModalAtom, settingsModalAtom } from "../core/modalAtoms";
 
 const isValidHexColor = (value: string): boolean => /^#([0-9A-F]{3}){1,2}$/i.test(value);
 
@@ -301,8 +303,6 @@ type Config = {
 };
 
 type SettingsModalProps = {
-  isOpen: boolean;
-  onClose: () => void;
   aspectRatio: string;
   setAspectRatio: (ratio: string) => void;
   bgColor: string;
@@ -314,7 +314,6 @@ type SettingsModalProps = {
   inputConfig: InputConfig;
   setInputConfig: (config: InputConfig) => void;
   availableMidiDevices: MidiDevice[];
-  onOpenMappings: () => void;
   config: Config;
   updateConfig: (updates: Partial<Config>) => void;
   workspacePath: string | null;
@@ -322,8 +321,6 @@ type SettingsModalProps = {
 };
 
 export const SettingsModal = ({
-  isOpen,
-  onClose,
   aspectRatio,
   setAspectRatio,
   bgColor,
@@ -332,12 +329,16 @@ export const SettingsModal = ({
   inputConfig,
   setInputConfig,
   availableMidiDevices,
-  onOpenMappings,
   config,
   updateConfig,
   workspacePath,
   onSelectWorkspace,
 }: SettingsModalProps) => {
+  const [isOpen, setIsOpen] = useAtom(settingsModalAtom)
+  const onClose = () => setIsOpen(false)
+
+  const [_, setIsInputMappingsModalOpen] = useAtom(inputMappingsModalAtom)
+
   const normalizedInputType = inputConfig?.type === "osc" ? "osc" : "midi";
   const signalSourceValue = config.sequencerMode
     ? "sequencer"
@@ -345,6 +346,11 @@ export const SettingsModal = ({
       ? "external-osc"
       : "external-midi";
 
+  const handleOpenMappings = () => {
+    onClose()
+    setIsInputMappingsModalOpen(true);
+  }
+
   return (
     <Modal isOpen={isOpen} onClose={onClose}>
       <ModalHeader title="SETTINGS" onClose={onClose} />
@@ -568,7 +574,7 @@ export const SettingsModal = ({
 
               <div className="pl-12">
                 <div className="opacity-50 mb-1 text-[11px]">Global Input Mappings:</div>
-                <Button onClick={onOpenMappings} className="w-full">
+                <Button onClick={handleOpenMappings} className="w-full">
                   CONFIGURE MAPPINGS
                 </Button>
               </div>
diff --git a/src/dashboard/modals/TrackDataModal.tsx b/src/dashboard/modals/TrackDataModal.tsx
index 3d96694..22d3d90 100644
--- a/src/dashboard/modals/TrackDataModal.tsx
+++ b/src/dashboard/modals/TrackDataModal.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import { Modal } from "../shared/Modal";
 import { ModalHeader } from "../components/ModalHeader";
 
diff --git a/src/main/InputManager.ts b/src/main/InputManager.ts
index 599d4c3..d4f96eb 100644
--- a/src/main/InputManager.ts
+++ b/src/main/InputManager.ts
@@ -499,7 +499,7 @@ class InputManager {
         }));
         resolve(devices);
       };
-      webMidi.enable({ callback });
+      webMidi.enable({ callback, requestMIDIAccessFunction: () => true });
     });
   }
 }