diff --git a/package.json b/package.json
index 160d9e7..eac9973 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elevenlabs/cli",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "CLI tool to manage ElevenLabs agents",
   "type": "module",
   "keywords": [
diff --git a/src/agents/commands/add.ts b/src/agents/commands/add.ts
index e9091f6..617db98 100644
--- a/src/agents/commands/add.ts
+++ b/src/agents/commands/add.ts
@@ -35,10 +35,11 @@ export function createAddCommand(): Command {
     .option('--output-path <path>', 'Custom output path for the config file (optional)')
     .option('--template <template>', 'Template type to use (default, minimal, voice-only, text-only, customer-service, assistant)')
     .option('--from-file <path>', 'Create agent from an existing config file')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (name: string | undefined, options: AddOptions & { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (name: string | undefined, options: AddOptions & { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false && !options.outputPath && !options.fromFile) {
+        if (options.humanFriendly && !options.outputPath && !options.fromFile) {
           // Use Ink UI for agent creation
           const { waitUntilExit } = render(
             React.createElement(AddAgentView, {
@@ -58,7 +59,7 @@ export function createAddCommand(): Command {
 
         // Non-UI path requires name to be provided (or --from-file with name in the file)
         if (!name && !options.fromFile) {
-          console.error('Error: Agent name is required when using --no-ui or --output-path');
+          console.error('Error: Agent name is required in non-interactive mode');
           process.exit(1);
         }
 
diff --git a/src/agents/commands/branches.ts b/src/agents/commands/branches.ts
index bb5b55d..6d22926 100644
--- a/src/agents/commands/branches.ts
+++ b/src/agents/commands/branches.ts
@@ -18,10 +18,11 @@ export function createBranchesCommand(): Command {
     .description('List branches for an agent')
     .requiredOption('--agent <agent_id>', 'Agent ID to list branches for')
     .option('--include-archived', 'Include archived branches', false)
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: BranchesListOptions & { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: BranchesListOptions & { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           const { waitUntilExit } = render(
             React.createElement(BranchesListView, {
               agent: options.agent,
diff --git a/src/agents/commands/delete.ts b/src/agents/commands/delete.ts
index f05948e..af5f811 100644
--- a/src/agents/commands/delete.ts
+++ b/src/agents/commands/delete.ts
@@ -8,8 +8,9 @@ export function createDeleteCommand(): Command {
     .description('Delete an agent locally and from ElevenLabs')
     .argument('[agent_id]', 'ID of the agent to delete (omit with --all to delete all agents)')
     .option('--all', 'Delete all agents', false)
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (agentId: string | undefined, options: { all: boolean; ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (agentId: string | undefined, options: { all: boolean; ui: boolean; humanFriendly?: boolean }) => {
       try {
         if (options.all && agentId) {
           console.error('Error: Cannot specify both agent_id and --all flag');
@@ -22,7 +23,7 @@ export function createDeleteCommand(): Command {
         }
 
         if (options.all) {
-          await deleteAllAgents(options.ui);
+          await deleteAllAgents(options.humanFriendly === true);
         } else {
           await deleteAgent(agentId!);
         }
diff --git a/src/agents/commands/index.ts b/src/agents/commands/index.ts
index 066d4eb..fa98d26 100644
--- a/src/agents/commands/index.ts
+++ b/src/agents/commands/index.ts
@@ -14,6 +14,36 @@ import { createTestCommand } from './test.js';
 import { createBranchesCommand } from './branches.js';
 import AgentsHelpView from '../ui/AgentsHelpView.js';
 
+function printAgentsHelp() {
+  console.log('elevenlabs agents - Agent management commands\n');
+  console.log('Usage:');
+  console.log('  elevenlabs agents <command> [options]\n');
+  console.log('Commands:');
+  const commands = [
+    { name: 'init [path]', description: 'Initialize project', options: ['--override  Recreate existing project'] },
+    { name: 'add [name]', description: 'Create a new agent and push to remote', options: ['--output-path <path>  Custom output path for config file', '--from-file <path>  Create agent from existing config file', '--template <template>  Template type to use (default, minimal, voice-only, text-only, customer-service, assistant)'] },
+    { name: 'list', description: 'List all local agents' },
+    { name: 'delete [agent_id]', description: 'Delete agent', options: ['--all  Delete all agents'] },
+    { name: 'status', description: 'Show the status of agents' },
+    { name: 'push', description: 'Push agents to ElevenLabs', options: ['--branch <branch>  Push to a specific branch'] },
+    { name: 'pull', description: 'Pull agents from ElevenLabs', options: ['--branch <branch>  Pull from a specific branch', '--all-branches  Pull all branches for each agent', '--update  Update existing agents', '--all  Pull all agents'] },
+    { name: 'branches list', description: 'List branches for an agent', options: ['--agent <agent_id>  Agent ID (required)', '--include-archived  Include archived branches'] },
+    { name: 'test <agent>', description: 'Run tests for an agent' },
+    { name: 'templates [action]', description: 'Manage agent templates', options: ['list  List available templates', 'show <name>  Show template details'] },
+    { name: 'widget <name>', description: 'Generate HTML widget snippet' },
+  ];
+  for (const cmd of commands) {
+    console.log(`  ${cmd.name.padEnd(28)}${cmd.description}`);
+    if (cmd.options) {
+      for (const opt of cmd.options) {
+        const [flag, ...descParts] = opt.split('  ');
+        console.log(`      ${flag.padEnd(26)}${descParts.join('  ')}`);
+      }
+    }
+  }
+  console.log('\nEnable interactive UI with --human-friendly flag for any command');
+}
+
 export function createAgentsCommand(): Command {
   const agents = new Command('agents');
   agents.description('Manage ElevenLabs agents');
@@ -24,13 +54,18 @@ export function createAgentsCommand(): Command {
 
   // Add custom help option
   agents.option('-h, --help', 'Display help information');
+  agents.option('--human-friendly', 'Enable interactive terminal UI');
 
   // Custom action when agents command is run without subcommands
   agents.action(async () => {
-    const { waitUntilExit } = render(
-      React.createElement(AgentsHelpView)
-    );
-    await waitUntilExit();
+    if (process.argv.includes('--human-friendly')) {
+      const { waitUntilExit } = render(
+        React.createElement(AgentsHelpView)
+      );
+      await waitUntilExit();
+    } else {
+      printAgentsHelp();
+    }
     process.exit(0);
   });
 
diff --git a/src/agents/commands/init.ts b/src/agents/commands/init.ts
index 19a3424..3995654 100644
--- a/src/agents/commands/init.ts
+++ b/src/agents/commands/init.ts
@@ -29,11 +29,12 @@ export function createInitCommand(): Command {
   return new Command('init')
     .description('Initialize a new agent management project')
     .argument('[path]', 'Path to initialize the project in', '.')
-    .option('--no-ui', 'Disable interactive UI')
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
     .option('--override', 'Override existing files and recreate from scratch', false)
-    .action(async (projectPath: string, options: { ui: boolean; override: boolean }) => {
+    .action(async (projectPath: string, options: { ui: boolean; override: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for initialization
           const { waitUntilExit } = render(
             React.createElement(InitView, { projectPath, override: options.override })
diff --git a/src/agents/commands/list.ts b/src/agents/commands/list.ts
index ff1eda2..6b6be43 100644
--- a/src/agents/commands/list.ts
+++ b/src/agents/commands/list.ts
@@ -6,10 +6,11 @@ import ListAgentsView from '../ui/ListAgentsView.js';
 export function createListCommand(): Command {
   return new Command('list')
     .description('List all configured agents')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for list-agents
           const { waitUntilExit } = render(
             React.createElement(ListAgentsView)
diff --git a/src/agents/commands/pull.ts b/src/agents/commands/pull.ts
index 60765c4..15195ad 100644
--- a/src/agents/commands/pull.ts
+++ b/src/agents/commands/pull.ts
@@ -24,8 +24,9 @@ export function createPullCommand(): Command {
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--update', 'Update existing items only, skip new')
     .option('--all', 'Pull all (new + existing)')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: PullOptions & { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: PullOptions & { ui: boolean; humanFriendly?: boolean }) => {
       try {
         if (options.branch && !options.agent) {
           throw new Error('--branch requires --agent to be specified, since branch names are per-agent.');
@@ -35,7 +36,7 @@ export function createPullCommand(): Command {
           await pullAgents(options);
           return;
         }
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for pull
           const { waitUntilExit } = render(
             React.createElement(PullView, {
diff --git a/src/agents/commands/push.ts b/src/agents/commands/push.ts
index c7061e8..9849b13 100644
--- a/src/agents/commands/push.ts
+++ b/src/agents/commands/push.ts
@@ -31,13 +31,14 @@ export function createPushCommand(): Command {
     .option('--branch <branch>', 'Specific branch name or ID to push to')
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--version-description <text>', 'Description for the new version (only applies to updates)')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: PushOptions & { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: PushOptions & { ui: boolean; humanFriendly?: boolean }) => {
       try {
         if (options.branch && !options.agent) {
           throw new Error('--branch requires --agent to be specified, since branch names are per-agent.');
         }
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use new Ink UI for push
           const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
           if (!(await fs.pathExists(agentsConfigPath))) {
diff --git a/src/agents/commands/status.ts b/src/agents/commands/status.ts
index 762ecf1..f72939a 100644
--- a/src/agents/commands/status.ts
+++ b/src/agents/commands/status.ts
@@ -11,10 +11,11 @@ interface StatusOptions {
 export function createStatusCommand(): Command {
   return new Command('status')
     .description('Show the status of agents')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: StatusOptions & { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: StatusOptions & { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for status display
           const { waitUntilExit } = render(
             React.createElement(StatusView, {})
diff --git a/src/agents/commands/test.ts b/src/agents/commands/test.ts
index aae6da6..81bf055 100644
--- a/src/agents/commands/test.ts
+++ b/src/agents/commands/test.ts
@@ -5,8 +5,9 @@ export function createTestCommand(): Command {
   return new Command('test')
     .description('Run tests for an agent')
     .argument('<agent>', 'Name or ID of the agent to test')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (agentId: string, options: { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (agentId: string, options: { ui: boolean; humanFriendly?: boolean }) => {
       try {
         if (options.ui !== false) {
           // Use Ink UI for testing
diff --git a/src/agents/ui/AgentsHelpView.tsx b/src/agents/ui/AgentsHelpView.tsx
index 995eb9e..a5c042a 100644
--- a/src/agents/ui/AgentsHelpView.tsx
+++ b/src/agents/ui/AgentsHelpView.tsx
@@ -155,7 +155,7 @@ export const AgentsHelpView: React.FC = () => {
 
       <Box marginTop={1}>
         <Text color={theme.colors.text.muted}>
-          Disable UI mode with --no-ui flag for any command
+          Enable interactive UI with --human-friendly flag for any command
         </Text>
       </Box>
     </App>
diff --git a/src/auth/commands/index.ts b/src/auth/commands/index.ts
index 988af80..d51a341 100644
--- a/src/auth/commands/index.ts
+++ b/src/auth/commands/index.ts
@@ -7,6 +7,23 @@ import { createWhoamiCommand } from './whoami.js';
 import { createResidencyCommand } from './residency.js';
 import AuthHelpView from '../ui/AuthHelpView.js';
 
+function printAuthHelp() {
+  console.log('elevenlabs auth - Authentication commands\n');
+  console.log('Usage:');
+  console.log('  elevenlabs auth <command> [options]\n');
+  console.log('Commands:');
+  const commands = [
+    { name: 'login', description: 'Login with your ElevenLabs API key' },
+    { name: 'logout', description: 'Logout and remove stored API key' },
+    { name: 'whoami', description: 'Show current login status' },
+    { name: 'residency [location]', description: 'Set the API residency location' },
+  ];
+  for (const cmd of commands) {
+    console.log(`  ${cmd.name.padEnd(28)}${cmd.description}`);
+  }
+  console.log('\nEnable interactive UI with --human-friendly flag for any command');
+}
+
 export function createAuthCommand(): Command {
   const auth = new Command('auth');
   auth.description('Authentication and configuration commands');
@@ -17,13 +34,18 @@ export function createAuthCommand(): Command {
 
   // Add custom help option
   auth.option('-h, --help', 'Display help information');
+  auth.option('--human-friendly', 'Enable interactive terminal UI');
 
   // Custom action when auth command is run without subcommands
   auth.action(async () => {
-    const { waitUntilExit } = render(
-      React.createElement(AuthHelpView)
-    );
-    await waitUntilExit();
+    if (process.argv.includes('--human-friendly')) {
+      const { waitUntilExit } = render(
+        React.createElement(AuthHelpView)
+      );
+      await waitUntilExit();
+    } else {
+      printAuthHelp();
+    }
     process.exit(0);
   });
 
diff --git a/src/auth/commands/login.ts b/src/auth/commands/login.ts
index 6cf5c4b..62e747c 100644
--- a/src/auth/commands/login.ts
+++ b/src/auth/commands/login.ts
@@ -10,10 +10,11 @@ import { ElevenLabsClient } from '@elevenlabs/elevenlabs-js';
 export function createLoginCommand(): Command {
   return new Command('login')
     .description('Login with your ElevenLabs API key')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for login
           const { waitUntilExit } = render(
             React.createElement(LoginView, {})
diff --git a/src/auth/commands/logout.ts b/src/auth/commands/logout.ts
index 13b3615..b5a8b10 100644
--- a/src/auth/commands/logout.ts
+++ b/src/auth/commands/logout.ts
@@ -7,10 +7,11 @@ import { removeApiKey, isLoggedIn } from '../../shared/config.js';
 export function createLogoutCommand(): Command {
   return new Command('logout')
     .description('Logout and remove stored API key')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for logout
           const { waitUntilExit } = render(
             React.createElement(LogoutView, {})
diff --git a/src/auth/commands/residency.ts b/src/auth/commands/residency.ts
index 8bae2f1..080baa4 100644
--- a/src/auth/commands/residency.ts
+++ b/src/auth/commands/residency.ts
@@ -8,10 +8,11 @@ export function createResidencyCommand(): Command {
   return new Command('residency')
     .description('Set the API residency location')
     .argument('[residency]', `Residency location (${LOCATIONS.join(', ')})`)
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (residency: string | undefined, options: { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (residency: string | undefined, options: { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false && !residency) {
+        if (options.humanFriendly && !residency) {
           // Use Ink UI for interactive residency selection
           const { waitUntilExit } = render(
             React.createElement(ResidencyView)
@@ -29,7 +30,7 @@ export function createResidencyCommand(): Command {
             process.exit(1);
           }
 
-          if (options.ui !== false) {
+          if (options.humanFriendly) {
             // Use UI even with direct argument
             const { waitUntilExit } = render(
               React.createElement(ResidencyView, { initialResidency: residency })
diff --git a/src/auth/commands/whoami.ts b/src/auth/commands/whoami.ts
index 2ab1634..86d1596 100644
--- a/src/auth/commands/whoami.ts
+++ b/src/auth/commands/whoami.ts
@@ -7,10 +7,11 @@ import { getApiKey, getResidency } from '../../shared/config.js';
 export function createWhoamiCommand(): Command {
   return new Command('whoami')
     .description('Show current login status')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for whoami
           const { waitUntilExit } = render(
             React.createElement(WhoamiView)
diff --git a/src/auth/ui/AuthHelpView.tsx b/src/auth/ui/AuthHelpView.tsx
index cc73594..5a222db 100644
--- a/src/auth/ui/AuthHelpView.tsx
+++ b/src/auth/ui/AuthHelpView.tsx
@@ -99,7 +99,7 @@ export const AuthHelpView: React.FC = () => {
 
       <Box marginTop={1}>
         <Text color={theme.colors.text.muted}>
-          Disable UI mode with --no-ui flag for any command
+          Enable interactive UI with --human-friendly flag for any command
         </Text>
       </Box>
     </App>
diff --git a/src/cli.ts b/src/cli.ts
index 9656c78..0946ef4 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -21,25 +21,52 @@ const __dirname = dirname(__filename);
 const packageJson = JSON.parse(readFileSync(join(__dirname, '../package.json'), 'utf-8'));
 const { version } = packageJson;
 
+function printPlainHelp() {
+  console.log(`ElevenLabs CLI v${version}\n`);
+  console.log('Usage:');
+  console.log('  elevenlabs [command] [options]\n');
+  console.log('Modules:');
+  const modules = [
+    { name: 'auth', description: 'Authentication commands' },
+    { name: 'agents', description: 'Agent management commands' },
+    { name: 'tools', description: 'Tool management commands' },
+    { name: 'tests', description: 'Test management commands' },
+    { name: 'components', description: 'UI component management' },
+  ];
+  for (const mod of modules) {
+    console.log(`  ${mod.name.padEnd(16)}${mod.description}`);
+  }
+  console.log('\nQuick Start:');
+  console.log('  1. Initialize a project: elevenlabs agents init');
+  console.log('  2. Login with API key: elevenlabs auth login');
+  console.log('  3. Create an agent: elevenlabs agents add "My Agent"');
+  console.log('  4. Push to ElevenLabs: elevenlabs agents push');
+  console.log('\nFor more information on a module, use: elevenlabs <module> --help');
+  console.log('Enable interactive UI with --human-friendly flag for any command');
+}
+
 const program = new Command();
 
 program
   .name('elevenlabs')
   .description('ElevenLabs CLI')
   .version(version)
+  .option('--human-friendly', 'Enable interactive terminal UI')
   .configureHelp({
     // Override the default help to use our Ink UI
     formatHelp: () => ''
   })
   .helpOption('-h, --help', 'Display help information')
   .on('option:help', async () => {
-    // Show Ink-based help view
-    const { waitUntilExit } = render(
-      React.createElement(HelpView)
-    );
-    await waitUntilExit();
+    if (process.argv.includes('--human-friendly')) {
+      const { waitUntilExit } = render(
+        React.createElement(HelpView)
+      );
+      await waitUntilExit();
+    } else {
+      printPlainHelp();
+    }
     process.exit(0);
-
   });
 
 // Add new command groups
@@ -52,15 +79,20 @@ program.addCommand(createCompletionCommand());
 
 // Show help if no arguments provided or if only help flag is provided
 const args = process.argv.slice(2);
-const isMainHelp = args.length === 0 ||
-  (args.length === 1 && (args[0] === '--help' || args[0] === '-h'));
+const nonFlagArgs = args.filter(a => a !== '--human-friendly' && a !== '--no-ui');
+const isMainHelp = nonFlagArgs.length === 0 ||
+  (nonFlagArgs.length === 1 && (nonFlagArgs[0] === '--help' || nonFlagArgs[0] === '-h'));
 
 if (isMainHelp) {
   (async () => {
-    const { waitUntilExit } = render(
-      React.createElement(HelpView)
-    );
-    await waitUntilExit();
+    if (args.includes('--human-friendly')) {
+      const { waitUntilExit } = render(
+        React.createElement(HelpView)
+      );
+      await waitUntilExit();
+    } else {
+      printPlainHelp();
+    }
     process.exit(0);
   })();
 } else {
diff --git a/src/completion/scripts.ts b/src/completion/scripts.ts
index 2b0f973..d423d19 100644
--- a/src/completion/scripts.ts
+++ b/src/completion/scripts.ts
@@ -34,7 +34,7 @@ _elevenlabs_completion() {
       local agents_cmds="init add list delete status push pull templates widget test -h --help"
       local agents_add_flags="--template --skip-upload"
       local agents_push_flags="--agent --dry-run"
-      local agents_pull_flags="--agent --output-dir --dry-run --update --all --no-ui"
+      local agents_pull_flags="--agent --output-dir --dry-run --update --all --no-ui --human-friendly"
       local agents_templates_cmds="list show"
       local template_types="default minimal voice-only text-only customer-service assistant"
       
@@ -190,7 +190,8 @@ _elevenlabs_completion() {
     "--dry-run:Preview changes without downloading"
     "--update:Update existing items only, skip new"
     "--all:Pull all (both new and existing)"
-    "--no-ui:Disable interactive UI"
+    "--no-ui:Disable interactive UI (default, kept for backwards compatibility)"
+    "--human-friendly:Enable interactive terminal UI"
   )
   
   tools_cmds=(
diff --git a/src/components/commands/index.ts b/src/components/commands/index.ts
index c477ef8..5e696ae 100644
--- a/src/components/commands/index.ts
+++ b/src/components/commands/index.ts
@@ -4,6 +4,20 @@ import React from 'react';
 import { createAddCommand } from './add.js';
 import ComponentsHelpView from '../ui/ComponentsHelpView.js';
 
+function printComponentsHelp() {
+  console.log('elevenlabs components - UI component management\n');
+  console.log('Usage:');
+  console.log('  elevenlabs components <command> [options]\n');
+  console.log('Commands:');
+  const commands = [
+    { name: 'add [name]', description: 'Add a component from the ElevenLabs UI registry' },
+  ];
+  for (const cmd of commands) {
+    console.log(`  ${cmd.name.padEnd(28)}${cmd.description}`);
+  }
+  console.log('\nComponents are sourced from https://ui.elevenlabs.io');
+}
+
 export function createComponentsCommand(): Command {
   const components = new Command('components');
   components.description('Import components from the ElevenLabs UI registry (https://ui.elevenlabs.io)');
@@ -14,13 +28,18 @@ export function createComponentsCommand(): Command {
 
   // Add custom help option
   components.option('-h, --help', 'Display help information');
+  components.option('--human-friendly', 'Enable interactive terminal UI');
 
   // Custom action when components command is run without subcommands
   components.action(async () => {
-    const { waitUntilExit } = render(
-      React.createElement(ComponentsHelpView)
-    );
-    await waitUntilExit();
+    if (process.argv.includes('--human-friendly')) {
+      const { waitUntilExit } = render(
+        React.createElement(ComponentsHelpView)
+      );
+      await waitUntilExit();
+    } else {
+      printComponentsHelp();
+    }
     process.exit(0);
   });
 
diff --git a/src/tests/commands/add.ts b/src/tests/commands/add.ts
index e5a0f96..49edca5 100644
--- a/src/tests/commands/add.ts
+++ b/src/tests/commands/add.ts
@@ -9,10 +9,11 @@ export function createAddCommand(): Command {
     .description('Add a new test')
     .argument('<name>', 'Name of the test to create')
     .option('--template <template>', 'Test template type', 'basic-llm')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (name: string, options: { template: string; ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (name: string, options: { template: string; ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for test creation
           const { waitUntilExit } = render(
             React.createElement(AddTestView, {
diff --git a/src/tests/commands/delete.ts b/src/tests/commands/delete.ts
index f8fc638..88a5ae7 100644
--- a/src/tests/commands/delete.ts
+++ b/src/tests/commands/delete.ts
@@ -6,8 +6,9 @@ export function createDeleteCommand(): Command {
     .description('Delete a test locally and from ElevenLabs')
     .argument('[test_id]', 'ID of the test to delete (omit with --all to delete all tests)')
     .option('--all', 'Delete all tests', false)
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (testId: string | undefined, options: { all: boolean; ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (testId: string | undefined, options: { all: boolean; ui: boolean; humanFriendly?: boolean }) => {
       try {
         if (options.all && testId) {
           console.error('Error: Cannot specify both test_id and --all flag');
@@ -20,7 +21,7 @@ export function createDeleteCommand(): Command {
         }
 
         if (options.all) {
-          await deleteAllTests(options.ui);
+          await deleteAllTests(options.humanFriendly === true);
         } else {
           await deleteTest(testId!);
         }
diff --git a/src/tests/commands/index.ts b/src/tests/commands/index.ts
index c6712f7..49a4e76 100644
--- a/src/tests/commands/index.ts
+++ b/src/tests/commands/index.ts
@@ -7,6 +7,29 @@ import { createPushCommand } from './push.js';
 import { createPullCommand } from './pull.js';
 import TestsHelpView from '../ui/TestsHelpView.js';
 
+function printTestsHelp() {
+  console.log('elevenlabs tests - Test management commands\n');
+  console.log('Usage:');
+  console.log('  elevenlabs tests <command> [options]\n');
+  console.log('Commands:');
+  const commands = [
+    { name: 'add <name>', description: 'Add a new test', options: ['--template <template>  Test template type (default: \'basic-llm\')'] },
+    { name: 'delete [test_id]', description: 'Delete a test locally and from ElevenLabs', options: ['--all  Delete all tests'] },
+    { name: 'push', description: 'Push tests to ElevenLabs API', options: ['--dry-run  Show what would be done without making changes'] },
+    { name: 'pull', description: 'Pull tests from ElevenLabs', options: ['--test <test_id>  Specific test ID to pull', '--output-dir <directory>  Output directory for configs (default: \'test_configs\')', '--dry-run  Show what would be done without making changes', '--update  Update existing items only, skip new', '--all  Pull all (new + existing)'] },
+  ];
+  for (const cmd of commands) {
+    console.log(`  ${cmd.name.padEnd(28)}${cmd.description}`);
+    if (cmd.options) {
+      for (const opt of cmd.options) {
+        const [flag, ...descParts] = opt.split('  ');
+        console.log(`      ${flag.padEnd(26)}${descParts.join('  ')}`);
+      }
+    }
+  }
+  console.log('\nEnable interactive UI with --human-friendly flag for any command');
+}
+
 export function createTestsCommand(): Command {
   const tests = new Command('tests');
   tests.description('Manage ElevenLabs tests');
@@ -17,13 +40,18 @@ export function createTestsCommand(): Command {
 
   // Add custom help option
   tests.option('-h, --help', 'Display help information');
+  tests.option('--human-friendly', 'Enable interactive terminal UI');
 
   // Custom action when tests command is run without subcommands
   tests.action(async () => {
-    const { waitUntilExit } = render(
-      React.createElement(TestsHelpView)
-    );
-    await waitUntilExit();
+    if (process.argv.includes('--human-friendly')) {
+      const { waitUntilExit } = render(
+        React.createElement(TestsHelpView)
+      );
+      await waitUntilExit();
+    } else {
+      printTestsHelp();
+    }
     process.exit(0);
   });
 
diff --git a/src/tests/commands/pull.ts b/src/tests/commands/pull.ts
index 7c7b8a4..cdf00e5 100644
--- a/src/tests/commands/pull.ts
+++ b/src/tests/commands/pull.ts
@@ -17,8 +17,9 @@ export function createPullCommand(): Command {
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--update', 'Update existing items only, skip new')
     .option('--all', 'Pull all (new + existing)')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: PullTestsOptions & { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: PullTestsOptions & { ui: boolean; humanFriendly?: boolean }) => {
       try {
         await pullTests(options);
       } catch (error) {
diff --git a/src/tests/commands/push.ts b/src/tests/commands/push.ts
index 51d3286..fc69837 100644
--- a/src/tests/commands/push.ts
+++ b/src/tests/commands/push.ts
@@ -5,8 +5,9 @@ export function createPushCommand(): Command {
   return new Command('push')
     .description('Push tests to ElevenLabs API')
     .option('--dry-run', 'Show what would be done without making changes', false)
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { dryRun: boolean; ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: { dryRun: boolean; ui: boolean; humanFriendly?: boolean }) => {
       try {
         await pushTests(undefined, options.dryRun);
       } catch (error) {
diff --git a/src/tests/ui/TestsHelpView.tsx b/src/tests/ui/TestsHelpView.tsx
index dfef752..14f77bf 100644
--- a/src/tests/ui/TestsHelpView.tsx
+++ b/src/tests/ui/TestsHelpView.tsx
@@ -115,7 +115,7 @@ export const TestsHelpView: React.FC = () => {
 
       <Box marginTop={1}>
         <Text color={theme.colors.text.muted}>
-          Disable UI mode with --no-ui flag for any command
+          Enable interactive UI with --human-friendly flag for any command
         </Text>
       </Box>
     </App>
diff --git a/src/tools/commands/delete.ts b/src/tools/commands/delete.ts
index c105a08..97746e3 100644
--- a/src/tools/commands/delete.ts
+++ b/src/tools/commands/delete.ts
@@ -6,8 +6,9 @@ export function createDeleteCommand(): Command {
     .description('Delete a tool locally and from ElevenLabs')
     .argument('[tool_id]', 'ID of the tool to delete (omit with --all to delete all tools)')
     .option('--all', 'Delete all tools', false)
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (toolId: string | undefined, options: { all: boolean; ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (toolId: string | undefined, options: { all: boolean; ui: boolean; humanFriendly?: boolean }) => {
       try {
         if (options.all && toolId) {
           console.error('Error: Cannot specify both tool_id and --all flag');
@@ -20,7 +21,7 @@ export function createDeleteCommand(): Command {
         }
 
         if (options.all) {
-          await deleteAllTools(options.ui);
+          await deleteAllTools(options.humanFriendly === true);
         } else {
           await deleteTool(toolId!);
         }
diff --git a/src/tools/commands/index.ts b/src/tools/commands/index.ts
index 45b15cc..2571958 100644
--- a/src/tools/commands/index.ts
+++ b/src/tools/commands/index.ts
@@ -7,6 +7,29 @@ import { createPushCommand } from './push.js';
 import { createPullCommand } from './pull.js';
 import ToolsHelpView from '../ui/ToolsHelpView.js';
 
+function printToolsHelp() {
+  console.log('elevenlabs tools - Tool management commands\n');
+  console.log('Usage:');
+  console.log('  elevenlabs tools <command> [options]\n');
+  console.log('Commands:');
+  const commands = [
+    { name: 'add <name>', description: 'Add a new tool', options: ['--type <type>  Tool type: webhook or client (default: \'webhook\')', '--config-path <path>  Custom config path'] },
+    { name: 'delete [tool_id]', description: 'Delete a tool locally and from ElevenLabs', options: ['--all  Delete all tools'] },
+    { name: 'push', description: 'Push tools to ElevenLabs API', options: ['--dry-run  Show what would be done without making changes'] },
+    { name: 'pull', description: 'Pull tools from ElevenLabs', options: ['--tool <tool_id>  Specific tool ID to pull', '--output-dir <directory>  Output directory for configs (default: \'tool_configs\')', '--dry-run  Show what would be done without making changes', '--update  Update existing items only, skip new', '--all  Pull all (new + existing)'] },
+  ];
+  for (const cmd of commands) {
+    console.log(`  ${cmd.name.padEnd(28)}${cmd.description}`);
+    if (cmd.options) {
+      for (const opt of cmd.options) {
+        const [flag, ...descParts] = opt.split('  ');
+        console.log(`      ${flag.padEnd(26)}${descParts.join('  ')}`);
+      }
+    }
+  }
+  console.log('\nEnable interactive UI with --human-friendly flag for any command');
+}
+
 export function createToolsCommand(): Command {
   const tools = new Command('tools');
   tools.description('Manage ElevenLabs tools');
@@ -17,13 +40,18 @@ export function createToolsCommand(): Command {
 
   // Add custom help option
   tools.option('-h, --help', 'Display help information');
+  tools.option('--human-friendly', 'Enable interactive terminal UI');
 
   // Custom action when tools command is run without subcommands
   tools.action(async () => {
-    const { waitUntilExit } = render(
-      React.createElement(ToolsHelpView)
-    );
-    await waitUntilExit();
+    if (process.argv.includes('--human-friendly')) {
+      const { waitUntilExit } = render(
+        React.createElement(ToolsHelpView)
+      );
+      await waitUntilExit();
+    } else {
+      printToolsHelp();
+    }
     process.exit(0);
   });
 
diff --git a/src/tools/commands/pull.ts b/src/tools/commands/pull.ts
index 18788e3..2fc2481 100644
--- a/src/tools/commands/pull.ts
+++ b/src/tools/commands/pull.ts
@@ -20,10 +20,11 @@ export function createPullCommand(): Command {
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--update', 'Update existing items only, skip new')
     .option('--all', 'Pull all (new + existing)')
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: PullToolsOptions & { ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: PullToolsOptions & { ui: boolean; humanFriendly?: boolean }) => {
       try {
-        if (options.ui !== false) {
+        if (options.humanFriendly) {
           // Use Ink UI for pull
           const { waitUntilExit } = render(
             React.createElement(PullToolsView, {
diff --git a/src/tools/commands/push.ts b/src/tools/commands/push.ts
index a4c1853..2acbe3f 100644
--- a/src/tools/commands/push.ts
+++ b/src/tools/commands/push.ts
@@ -5,8 +5,9 @@ export function createPushCommand(): Command {
   return new Command('push')
     .description('Push tools to ElevenLabs API')
     .option('--dry-run', 'Show what would be done without making changes', false)
-    .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { dryRun: boolean; ui: boolean }) => {
+    .option('--no-ui', 'Disable interactive UI (default, kept for backwards compatibility)')
+    .option('--human-friendly', 'Enable interactive terminal UI')
+    .action(async (options: { dryRun: boolean; ui: boolean; humanFriendly?: boolean }) => {
       try {
         if (options.ui !== false) {
           // PushToolsView requires tools array to be prepared
diff --git a/src/tools/ui/ToolsHelpView.tsx b/src/tools/ui/ToolsHelpView.tsx
index 2059cfc..5c642d2 100644
--- a/src/tools/ui/ToolsHelpView.tsx
+++ b/src/tools/ui/ToolsHelpView.tsx
@@ -116,7 +116,7 @@ export const ToolsHelpView: React.FC = () => {
 
       <Box marginTop={1}>
         <Text color={theme.colors.text.muted}>
-          Disable UI mode with --no-ui flag for any command
+          Enable interactive UI with --human-friendly flag for any command
         </Text>
       </Box>
     </App>
diff --git a/src/ui/views/HelpView.tsx b/src/ui/views/HelpView.tsx
index 4d98517..d532967 100644
--- a/src/ui/views/HelpView.tsx
+++ b/src/ui/views/HelpView.tsx
@@ -133,7 +133,7 @@ export const HelpView: React.FC = () => {
 
       <Box marginTop={1}>
         <Text color={theme.colors.text.muted}>
-          Disable UI mode with --no-ui flag for any command
+          Enable interactive UI with --human-friendly flag for any command
         </Text>
       </Box>
     </App>