diff --git a/src/components/screens/Launch/ConfigFileManager.tsx b/src/components/screens/Launch/ConfigFileManager.tsx
index 058e021..da7a197 100644
--- a/src/components/screens/Launch/ConfigFileManager.tsx
+++ b/src/components/screens/Launch/ConfigFileManager.tsx
@@ -1,13 +1,4 @@
-import {
-  Stack,
-  Text,
-  Group,
-  Button,
-  Select,
-  Modal,
-  TextInput,
-  Badge,
-} from '@mantine/core';
+import { Stack, Text, Group, Button, Select, Badge } from '@mantine/core';
 import {
   useState,
   useCallback,
@@ -17,6 +8,7 @@ import {
 import { Save, File, Plus, Check } from 'lucide-react';
 import type { ConfigFile } from '@/types';
 import styles from '@/styles/layout.module.css';
+import { CreateConfigModal } from './CreateConfigModal';
 
 interface ConfigFileManagerProps {
   configFiles: ConfigFile[];
@@ -68,7 +60,6 @@ export const ConfigFileManager = ({
   onSaveConfig,
 }: ConfigFileManagerProps) => {
   const [configModalOpened, setConfigModalOpened] = useState(false);
-  const [newConfigName, setNewConfigName] = useState('');
   const [saveSuccess, setSaveSuccess] = useState(false);
 
   const existingConfigNames = configFiles.map((file) => {
@@ -76,25 +67,14 @@ export const ConfigFileManager = ({
     return file.name.replace(`.${extension}`, '').toLowerCase();
   });
 
-  const trimmedConfigName = newConfigName.trim();
-  const configNameExists =
-    trimmedConfigName &&
-    existingConfigNames.includes(trimmedConfigName.toLowerCase());
-
   const handleOpenConfigModal = () => {
     setConfigModalOpened(true);
   };
 
   const handleCloseConfigModal = useCallback(() => {
     setConfigModalOpened(false);
-    setNewConfigName('');
   }, []);
 
-  const handleConfigSubmit = async () => {
-    await onCreateNewConfig(trimmedConfigName);
-    handleCloseConfigModal();
-  };
-
   const handleSaveClick = async () => {
     if (selectedFile) {
       const success = await onSaveConfig();
@@ -174,38 +154,12 @@ export const ConfigFileManager = ({
         </Group>
       </Stack>
 
-      <Modal
+      <CreateConfigModal
         opened={configModalOpened}
         onClose={handleCloseConfigModal}
-        title="Create New Configuration"
-        size="sm"
-      >
-        <Stack gap="md">
-          <TextInput
-            label="Name"
-            placeholder="Enter a name for the new configuration"
-            value={newConfigName}
-            onChange={(event) => setNewConfigName(event.currentTarget.value)}
-            data-autofocus
-            error={
-              configNameExists
-                ? 'A configuration with this name already exists'
-                : undefined
-            }
-          />
-          <Group justify="flex-end" gap="sm">
-            <Button variant="outline" onClick={handleCloseConfigModal}>
-              Cancel
-            </Button>
-            <Button
-              disabled={!trimmedConfigName || !!configNameExists}
-              onClick={handleConfigSubmit}
-            >
-              Create
-            </Button>
-          </Group>
-        </Stack>
-      </Modal>
+        onCreateConfig={onCreateNewConfig}
+        existingConfigNames={existingConfigNames}
+      />
     </>
   );
 };
diff --git a/src/components/screens/Launch/CreateConfigModal.tsx b/src/components/screens/Launch/CreateConfigModal.tsx
new file mode 100644
index 0000000..34699aa
--- /dev/null
+++ b/src/components/screens/Launch/CreateConfigModal.tsx
@@ -0,0 +1,76 @@
+import { Modal, TextInput, Group, Button, Stack } from '@mantine/core';
+import { useState, useEffect } from 'react';
+
+interface CreateConfigModalProps {
+  opened: boolean;
+  onClose: () => void;
+  onCreateConfig: (configName: string) => Promise<void>;
+  existingConfigNames: string[];
+}
+
+export const CreateConfigModal = ({
+  opened,
+  onClose,
+  onCreateConfig,
+  existingConfigNames,
+}: CreateConfigModalProps) => {
+  const [newConfigName, setNewConfigName] = useState('');
+
+  const trimmedConfigName = newConfigName.trim();
+  const configNameExists =
+    trimmedConfigName &&
+    existingConfigNames.includes(trimmedConfigName.toLowerCase());
+
+  const handleClose = () => {
+    setNewConfigName('');
+    onClose();
+  };
+
+  const handleSubmit = async () => {
+    const configName = trimmedConfigName;
+    setNewConfigName('');
+    await onCreateConfig(configName);
+    onClose();
+  };
+
+  useEffect(() => {
+    if (opened) {
+      setNewConfigName('');
+    }
+  }, [opened]);
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title="Create New Configuration"
+      size="sm"
+    >
+      <Stack gap="md">
+        <TextInput
+          label="Name"
+          placeholder="Enter a name for the new configuration"
+          value={newConfigName}
+          onChange={(event) => setNewConfigName(event.currentTarget.value)}
+          data-autofocus
+          error={
+            configNameExists
+              ? 'A configuration with this name already exists'
+              : undefined
+          }
+        />
+        <Group justify="flex-end" gap="sm">
+          <Button variant="outline" onClick={handleClose}>
+            Cancel
+          </Button>
+          <Button
+            disabled={!trimmedConfigName || !!configNameExists}
+            onClick={handleSubmit}
+          >
+            Create
+          </Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+};
diff --git a/src/components/screens/Launch/GeneralTab.tsx b/src/components/screens/Launch/GeneralTab.tsx
deleted file mode 100644
index e69de29..0000000