diff --git a/TestMasterUI/src/components/shared/DialogManager.jsx b/TestMasterUI/src/components/shared/DialogManager.jsx
index 33a6e1e..8d9ee3d 100644
--- a/TestMasterUI/src/components/shared/DialogManager.jsx
+++ b/TestMasterUI/src/components/shared/DialogManager.jsx
@@ -10,69 +10,6 @@ import UserEditDialog from '@/components/users/UserEditDialog.jsx';
 import PasswordChangeDialog from '@/components/account/PasswordChangeDialog.jsx';
 import ServerEditDialog from '@/components/servers/ServerEditDialog.jsx';
 
-// const DialogManager = ({
-//   showAddApi,
-//   showAddCollection,
-//   showAddScenario,
-//   showVariableModal,
-//   showMockRouteEdit,
-//   showTCPServerEdit,
-//   showQueueEdit,
-//   showUserEdit,
-//   selectedItem,
-//   showPasswordChange,
-//   showServerEdit,
-//   onDialogChange
-// }) => {
-//
-//   return <>
-//     <AddCollectionDialog
-//         open={showAddCollection}
-//         onOpenChange={(isOpen) => onDialogChange('showAddCollection', isOpen)}
-//     />
-//     <AddAPIDialog
-//         open={showAddApi}
-//         onOpenChange={(isOpen) => onDialogChange('showAddApi', isOpen)}
-//     />
-//     <AddScenarioDialog
-//         open={showAddScenario}
-//         onOpenChange={(isOpen) => onDialogChange('showAddScenario', isOpen)}
-//     />
-//     <VariableModal
-//         open={showVariableModal}
-//         onOpenChange={(isOpen) => onDialogChange('showVariableModal', isOpen)}
-//     />
-//     <MockRouteEditDialog
-//         open={showMockRouteEdit}
-//         onOpenChange={(isOpen) => onDialogChange('showMockRouteEdit', isOpen)}
-//         item={selectedItem}
-//     />
-//     <TCPServerEditDialog
-//         open={showTCPServerEdit}
-//         onOpenChange={(isOpen) => onDialogChange('showTCPServerEdit', isOpen)}
-//         item={selectedItem}
-//     />
-//     <QueueEditDialog
-//         open={showQueueEdit}
-//         onOpenChange={(isOpen) => onDialogChange('showQueueEdit', isOpen)}
-//         item={selectedItem}
-//     />
-//     <UserEditDialog
-//         open={showUserEdit}
-//         onOpenChange={(isOpen) => onDialogChange('showUserEdit', isOpen)}
-//         item={selectedItem}
-//     />
-//     <PasswordChangeDialog
-//         open={showPasswordChange}
-//         onOpenChange={(isOpen) => onDialogChange('showPasswordChange', isOpen)}
-//     />
-//     <ServerEditDialog
-//         open={showServerEdit}
-//         onOpenChange={(isOpen) => onDialogChange('showServerEdit', isOpen)}
-//         item={selectedItem}
-//     />
-//   </>;
-// }
 const DialogManager = ({
   showAddApi,
   showAddCollection,
@@ -84,6 +21,7 @@ const DialogManager = ({
   showUserEdit,
   showServerEdit,
   selectedItem,
+  showPasswordChange,
   onDialogChange
 }) => {
   return (
@@ -124,6 +62,10 @@ const DialogManager = ({
             onOpenChange={(isOpen) => onDialogChange('showUserEdit', isOpen)}
             item={selectedItem}
         />
+        <PasswordChangeDialog
+            open={showPasswordChange}
+            onOpenChange={(isOpen) => onDialogChange('showPasswordChange', isOpen)}
+        />
         <ServerEditDialog
             open={showServerEdit}
             onOpenChange={(isOpen) => onDialogChange('showServerEdit', isOpen)}
diff --git a/TestMasterUI/src/components/ui/badge.jsx b/TestMasterUI/src/components/ui/badge.jsx
new file mode 100644
index 0000000..a687eba
--- /dev/null
+++ b/TestMasterUI/src/components/ui/badge.jsx
@@ -0,0 +1,34 @@
+import * as React from "react"
+import { cva } from "class-variance-authority";
+
+import { cn } from "@/lib/utils"
+
+const badgeVariants = cva(
+  "inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+  {
+    variants: {
+      variant: {
+        default:
+          "border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
+        secondary:
+          "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        destructive:
+          "border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
+        outline: "text-foreground",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  }
+)
+
+function Badge({
+  className,
+  variant,
+  ...props
+}) {
+  return (<div className={cn(badgeVariants({ variant }), className)} {...props} />);
+}
+
+export { Badge, badgeVariants }
diff --git a/TestMasterUI/src/config/menuConfig.js b/TestMasterUI/src/config/menuConfig.js
index eda1aa0..90dd4b7 100644
--- a/TestMasterUI/src/config/menuConfig.js
+++ b/TestMasterUI/src/config/menuConfig.js
@@ -9,6 +9,7 @@ export const menuConfig = [
       // {type: 'separator'},
       {id: 'socket-list', label: 'TCP 서버 목록', action: 'socket-list', screen: 'socket-list'},
       // {id: 'socket-add', label: 'TCP 서버 추가', action: 'socket-add'},
+      {id: 'queue-list', label: '큐 목록', action: 'queue-list', screen: 'queue-list'},
     ]
   },
   {
@@ -24,14 +25,13 @@ export const menuConfig = [
       {id: 'variables-show', label: '변수 보기', action: 'variables-show'}
     ]
   },
-  {
-    id: 'queue',
-    label: '큐 관리',
-    items: [
-      {id: 'queue-list', label: '큐 목록', action: 'queue-list', screen: 'queue-list'},
-      {id: 'queue-add', label: '큐 추가', action: 'queue-add'}
-    ]
-  },
+  // {
+  //   id: 'queue',
+  //   label: '큐 관리',
+  //   items: [
+  //     {id: 'queue-add', label: '큐 추가', action: 'queue-add'}
+  //   ]
+  // },
   {
     id: 'loadtest',
     label: '부하 테스트',