diff --git a/src/cli/cloudformation/outputs.ts b/src/cli/cloudformation/outputs.ts
index 4733e6f09..51561dfc3 100644
--- a/src/cli/cloudformation/outputs.ts
+++ b/src/cli/cloudformation/outputs.ts
@@ -54,7 +54,7 @@ export function parseGatewayOutputs(
   const gatewayNames = Object.keys(gatewaySpecs);
   const gatewayIdMap = new Map(gatewayNames.map(name => [toPascalId(name), name]));
 
-  // Match pattern: Gateway{Name}{Type}Output
+  // Match pattern: Gateway{Name}{Type}Output{Hash}
   const outputPattern = /^Gateway(.+?)(Id|Arn|Url)Output/;
 
   for (const [key, value] of Object.entries(outputs)) {
diff --git a/src/cli/tui/App.tsx b/src/cli/tui/App.tsx
index 0cd3885f2..210aad771 100644
--- a/src/cli/tui/App.tsx
+++ b/src/cli/tui/App.tsx
@@ -2,7 +2,6 @@ import { getWorkingDirectory } from '../../lib';
 import { createProgram } from '../cli';
 import { LayoutProvider } from './context';
 import { MissingProjectMessage, WrongDirectoryMessage, getProjectRootMismatch, projectExists } from './guards';
-import { PlaceholderScreen } from './screens/PlaceholderScreen';
 import { AddFlow } from './screens/add/AddFlow';
 import { CreateScreen } from './screens/create';
 import { DeployScreen } from './screens/deploy/DeployScreen';
@@ -17,7 +16,7 @@ import { RunEvalFlow, RunScreen } from './screens/run-eval';
 import { StatusScreen } from './screens/status/StatusScreen';
 import { UpdateScreen } from './screens/update';
 import { ValidateScreen } from './screens/validate';
-import { type CommandMeta, getCommandsForUI } from './utils/commands';
+import { getCommandsForUI } from './utils/commands';
 import { useApp } from 'ink';
 import React, { useState } from 'react';
 
@@ -27,7 +26,6 @@ const cwd = getWorkingDirectory();
 type Route =
   | { name: 'home' }
   | { name: 'help'; initialQuery?: string }
-  | { name: 'command'; command: CommandMeta }
   | { name: 'dev' }
   | { name: 'deploy' }
   | { name: 'invoke' }
@@ -102,8 +100,6 @@ function AppContent() {
       setRoute({ name: 'package' });
     } else if (id === 'update') {
       setRoute({ name: 'update' });
-    } else {
-      setRoute({ name: 'command', command: cmd });
     }
   };
 
@@ -243,7 +239,8 @@ function AppContent() {
     return <UpdateScreen isInteractive={true} onExit={() => setRoute({ name: 'help' })} />;
   }
 
-  return <PlaceholderScreen command={route.command} onBack={() => setRoute({ name: 'help' })} />;
+  // All visible commands are handled above; this is unreachable.
+  return null;
 }
 
 export function App() {
diff --git a/src/cli/tui/screens/PlaceholderScreen.tsx b/src/cli/tui/screens/PlaceholderScreen.tsx
deleted file mode 100644
index b42ed406e..000000000
--- a/src/cli/tui/screens/PlaceholderScreen.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { CommandMeta } from '../utils/commands';
-import { Box, Text, useInput } from 'ink';
-import React from 'react';
-
-export function PlaceholderScreen(props: { command: CommandMeta; onBack: () => void }) {
-  useInput((input, key) => {
-    if (key.escape || input === 'b') props.onBack();
-  });
-
-  return (
-    <Box flexDirection="column" padding={1}>
-      <Text bold>{props.command.title}</Text>
-      <Text dimColor>{props.command.description}</Text>
-
-      <Box marginTop={1} flexDirection="column">
-        <Text>TODO: implement {props.command.id}</Text>
-        <Text dimColor>Esc/B back</Text>
-      </Box>
-    </Box>
-  );
-}
diff --git a/src/cli/tui/screens/index.ts b/src/cli/tui/screens/index.ts
index 08d4846a4..f4e2b0182 100644
--- a/src/cli/tui/screens/index.ts
+++ b/src/cli/tui/screens/index.ts
@@ -1,4 +1,3 @@
-export { PlaceholderScreen } from './PlaceholderScreen';
 export { DevScreen } from './dev';
 export { InvokeScreen } from './invoke';
 export { StatusScreen } from './status';
diff --git a/src/cli/tui/screens/mcp/AddGatewayScreen.tsx b/src/cli/tui/screens/mcp/AddGatewayScreen.tsx
index 7bfbd6e2f..43b21241e 100644
--- a/src/cli/tui/screens/mcp/AddGatewayScreen.tsx
+++ b/src/cli/tui/screens/mcp/AddGatewayScreen.tsx
@@ -243,7 +243,7 @@ export function AddGatewayScreen({
   const headerContent = <StepIndicator steps={wizard.steps} currentStep={wizard.step} labels={GATEWAY_STEP_LABELS} />;
 
   return (
-    <Screen title="Add Gateway" onExit={onExit} helpText={helpText} headerContent={headerContent}>
+    <Screen title="Add Gateway" onExit={onExit} helpText={helpText} headerContent={headerContent} exitEnabled={false}>
       <Panel>
         {isNameStep && (
           <TextInput
@@ -345,7 +345,12 @@ export function AddGatewayScreen({
             fields={[
               { label: 'Name', value: wizard.config.name },
               { label: 'Description', value: wizard.config.description },
-              { label: 'Authorizer', value: wizard.config.authorizerType },
+              {
+                label: 'Authorizer',
+                value:
+                  AUTHORIZER_TYPE_OPTIONS.find(o => o.id === wizard.config.authorizerType)?.title ??
+                  wizard.config.authorizerType,
+              },
               ...(wizard.config.authorizerType === 'CUSTOM_JWT' && wizard.config.jwtConfig
                 ? [
                     { label: 'Discovery URL', value: wizard.config.jwtConfig.discoveryUrl },