diff --git a/apps/rowboat/app/projects/[projectId]/config/components/project.tsx b/apps/rowboat/app/projects/[projectId]/config/components/project.tsx
index 18dabf8f..3fc4f39a 100644
--- a/apps/rowboat/app/projects/[projectId]/config/components/project.tsx
+++ b/apps/rowboat/app/projects/[projectId]/config/components/project.tsx
@@ -818,7 +818,9 @@ export function SimpleProjectSection({
     return (
         <div className="p-6 space-y-6">
             <ProjectNameSection projectId={projectId} onProjectConfigUpdated={onProjectConfigUpdated} />
+            <ProjectIdSection projectId={projectId} />
             <SecretSection projectId={projectId} />
+            <ApiKeysSection projectId={projectId} />
             <DisconnectToolkitsSection projectId={projectId} onProjectConfigUpdated={onProjectConfigUpdated} />
             <DeleteProjectSection projectId={projectId} />
         </div>
diff --git a/apps/rowboat/app/projects/[projectId]/workflow/components/TopBar.tsx b/apps/rowboat/app/projects/[projectId]/workflow/components/TopBar.tsx
index cc4d79e9..a0053fcb 100644
--- a/apps/rowboat/app/projects/[projectId]/workflow/components/TopBar.tsx
+++ b/apps/rowboat/app/projects/[projectId]/workflow/components/TopBar.tsx
@@ -22,7 +22,6 @@ interface TopBarProps {
     onChangeMode: (mode: 'draft' | 'live') => void;
     onRevertToLive: () => void;
     onToggleCopilot: () => void;
-    onSettingsModalOpen: () => void;
 }
 
 export function TopBar({
@@ -43,7 +42,6 @@ export function TopBar({
     onChangeMode,
     onRevertToLive,
     onToggleCopilot,
-    onSettingsModalOpen,
 }: TopBarProps) {
     const router = useRouter();
     const params = useParams();
@@ -159,7 +157,7 @@ export function TopBar({
                                 <DropdownItem
                                     key="settings"
                                     startContent={<SettingsIcon size={16} />}
-                                    onPress={onSettingsModalOpen}
+                                    onPress={() => { if (projectId) { router.push(`/projects/${projectId}/config`); } }}
                                 >
                                     API & SDK settings
                                 </DropdownItem>
diff --git a/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx b/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
index 0acf666d..9788e7a4 100644
--- a/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
+++ b/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
@@ -34,7 +34,7 @@ import { ModelsResponse } from "@/app/lib/types/billing_types";
 import { AgentGraphVisualizer } from "../entities/AgentGraphVisualizer";
 import { Panel } from "@/components/common/panel-common";
 import { Button as CustomButton } from "@/components/ui/button";
-import { ConfigApp } from "../config/app";
+
 import { InputField } from "@/app/lib/components/input-field";
 import { VoiceSection } from "../config/components/voice";
 import { TopBar } from "./components/TopBar";
@@ -872,9 +872,6 @@ export function WorkflowEditor({
     // Modal state for revert confirmation
     const { isOpen: isRevertModalOpen, onOpen: onRevertModalOpen, onClose: onRevertModalClose } = useDisclosure();
     
-    // Modal state for settings
-    const { isOpen: isSettingsModalOpen, onOpen: onSettingsModalOpen, onClose: onSettingsModalClose } = useDisclosure();
-    
     // Modal state for phone/Twilio configuration
     const { isOpen: isPhoneModalOpen, onOpen: onPhoneModalOpen, onClose: onPhoneModalClose } = useDisclosure();
     
@@ -1280,7 +1277,6 @@ export function WorkflowEditor({
                     onChangeMode={onChangeMode}
                     onRevertToLive={handleRevertToLive}
                     onToggleCopilot={() => setShowCopilot(!showCopilot)}
-                    onSettingsModalOpen={onSettingsModalOpen}
                 />
                 
                 {/* Content Area */}
@@ -1498,26 +1494,7 @@ export function WorkflowEditor({
                     </ModalContent>
                 </Modal>
                 
-                {/* Settings Modal */}
-                <Modal 
-                    isOpen={isSettingsModalOpen} 
-                    onClose={onSettingsModalClose}
-                    size="5xl"
-                    scrollBehavior="inside"
-                >
-                    <ModalContent className="h-[80vh]">
-                        <ModalHeader className="flex flex-col gap-1">
-                            API & SDK
-                        </ModalHeader>
-                        <ModalBody className="p-0">
-                            <ConfigApp
-                                projectId={projectId}
-                                useChatWidget={USE_CHAT_WIDGET}
-                                chatWidgetHost={chatWidgetHost}
-                            />
-                        </ModalBody>
-                    </ModalContent>
-                </Modal>
+
                 
                 {/* Phone/Twilio Modal */}
                 <Modal