diff --git a/app/Http/Controllers/TemplateController.php b/app/Http/Controllers/TemplateController.php
index 7ecaf4b..611bb24 100644
--- a/app/Http/Controllers/TemplateController.php
+++ b/app/Http/Controllers/TemplateController.php
@@ -101,9 +101,12 @@ public function update(Request $request, Template $template)
 
     public function destroy(Template $template)
     {
-        // Only allow deleting non-system templates
-        if ($template->is_system) {
-            return response()->json(['error' => 'Cannot delete system templates'], 403);
+        // Prevent deletion if this is the last template
+        $remainingTemplatesCount = Template::where('id', '!=', $template->id)->count();
+        if ($remainingTemplatesCount === 0) {
+            return response()->json([
+                'error' => 'Cannot delete the last remaining template. At least one template must exist.'
+            ], 422);
         }
 
         $template->delete();
diff --git a/resources/js/pages/RealtimeAgent/Main.vue b/resources/js/pages/RealtimeAgent/Main.vue
index d7f3c0f..0eb7261 100644
--- a/resources/js/pages/RealtimeAgent/Main.vue
+++ b/resources/js/pages/RealtimeAgent/Main.vue
@@ -69,11 +69,11 @@
                         <div
                             class="scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-transparent hover:scrollbar-thumb-gray-400 flex-1 overflow-y-auto"
                         >
-                            <div v-if="filteredSalesCoachTemplates.length === 0" class="p-3 text-center text-xs text-gray-600 dark:text-gray-400">
+                            <div v-if="filteredTemplates.length === 0" class="p-3 text-center text-xs text-gray-600 dark:text-gray-400">
                                 No templates found
                             </div>
                             <div
-                                v-for="template in filteredSalesCoachTemplates"
+                                v-for="template in filteredTemplates"
                                 :key="template.id"
                                 @click="
                                     selectTemplateFromDropdown(template);
@@ -251,11 +251,11 @@
                             @click.stop
                         />
                         <div class="max-h-36 overflow-y-auto">
-                            <div v-if="filteredSalesCoachTemplates.length === 0" class="p-2 text-center text-xs text-gray-600 dark:text-gray-400">
+                            <div v-if="filteredTemplates.length === 0" class="p-2 text-center text-xs text-gray-600 dark:text-gray-400">
                                 No templates found
                             </div>
                             <button
-                                v-for="template in filteredSalesCoachTemplates"
+                                v-for="template in filteredTemplates"
                                 :key="template.id"
                                 @click.stop="
                                     selectTemplateFromDropdown(template);
@@ -902,15 +902,17 @@ const { isOverlayMode, isSupported: isOverlaySupported, toggleOverlayMode } = us
 const hasApiKey = ref(false); // Will be checked on mount
 // const isDev = computed(() => import.meta.env.DEV)
 
-// Sales coach templates filtered
-const salesCoachTemplates = computed(() => templates.value.filter((t) => t.category === 'sales_coach'));
+// All available templates (no category filtering)
+const allTemplates = computed(() => {
+    return templates.value;
+});
 
 // Filtered templates based on search
-const filteredSalesCoachTemplates = computed(() => {
-    if (!templateSearchQuery.value) return salesCoachTemplates.value;
+const filteredTemplates = computed(() => {
+    if (!templateSearchQuery.value) return allTemplates.value;
 
     const query = templateSearchQuery.value.toLowerCase();
-    return salesCoachTemplates.value.filter((t) => t.name.toLowerCase().includes(query) || t.description?.toLowerCase().includes(query));
+    return allTemplates.value.filter((t) => t.name.toLowerCase().includes(query) || t.description?.toLowerCase().includes(query));
 });
 
 // New computed properties for intelligence dashboard
@@ -2508,8 +2510,8 @@ const fetchTemplates = async () => {
 
         console.log(`✅ Loaded ${templates.value.length} templates`);
         console.log(
-            'Sales coach templates:',
-            templates.value.filter((t) => t.category === 'sales_coach').map((t) => t.name),
+            'Available templates:',
+            templates.value.map((t) => t.name),
         );
 
         // Load persisted template or select default
@@ -2523,11 +2525,18 @@ const fetchTemplates = async () => {
         }
 
         // Select default template if none selected
-        if (!selectedTemplate.value && templates.value.length > 0) {
-            const defaultTemplate = templates.value.find((t) => t.name === 'Friendly Helper' && t.category === 'sales_coach');
-            if (defaultTemplate) {
-                selectedTemplate.value = defaultTemplate;
-                console.log('📌 Selected default template:', defaultTemplate.name);
+        if (!selectedTemplate.value) {
+            if (templates.value.length > 0) {
+                // Try to find the Sales Discovery Call template as default, otherwise use first available template
+                const defaultTemplate = templates.value.find((t) => t.name === 'Sales Discovery Call') || templates.value[0];
+                if (defaultTemplate) {
+                    selectedTemplate.value = defaultTemplate;
+                    console.log('📌 Selected default template:', defaultTemplate.name);
+                }
+            } else {
+                // Handle case when no templates exist
+                console.warn('⚠️ No templates available - cannot select default template');
+                // You may want to show a user-friendly message or redirect to template creation
             }
         }
     } catch (error) {
diff --git a/resources/js/pages/RealtimeAgent/Settings.vue b/resources/js/pages/RealtimeAgent/Settings.vue
deleted file mode 100644
index 0fad73c..0000000
--- a/resources/js/pages/RealtimeAgent/Settings.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<template>
-    <Head title="Settings" />
-
-    <AppLayout :breadcrumbs="breadcrumbs">
-        <PageContainer>
-            <div class="flex h-full flex-col">
-                <!-- Header -->
-                <div class="mb-6">
-                    <h1 class="text-2xl font-semibold text-gray-900 dark:text-gray-100">Settings</h1>
-                </div>
-
-                <!-- Settings Content -->
-                <div class="flex min-h-0 flex-1 gap-4">
-                    <!-- Sidebar Navigation -->
-                    <div class="w-64 flex-shrink-0">
-                        <BaseCard noPadding>
-                            <nav class="p-2">
-                                <button
-                                    v-for="item in navItems"
-                                    :key="item.id"
-                                    @click="handleNavClick(item)"
-                                    :class="[
-                                        'flex w-full items-center gap-3 rounded-lg px-4 py-3 text-left transition-all',
-                                        activeSection === item.id
-                                            ? 'bg-blue-50 font-medium text-blue-700 dark:bg-blue-900/20 dark:text-blue-400'
-                                            : 'text-gray-600 hover:bg-gray-50 dark:text-gray-400 dark:hover:bg-gray-800',
-                                    ]"
-                                >
-                                    <component :is="item.icon" class="h-5 w-5" />
-                                    <span>{{ item.label }}</span>
-                                </button>
-                            </nav>
-                        </BaseCard>
-                    </div>
-
-                    <!-- Main Content Area -->
-                    <div class="min-w-0 flex-1">
-                        <BaseCard class="h-full overflow-y-auto">
-                            <!-- API Configuration Section -->
-                            <div v-if="activeSection === 'api'" class="space-y-6">
-                                <div>
-                                    <h2 class="mb-4 text-xl font-semibold">API Configuration</h2>
-                                    <p class="mb-6 text-gray-600">Configure your OpenAI API key for the AI coach functionality.</p>
-                                </div>
-
-                                <div class="space-y-4">
-                                    <div>
-                                        <Label for="apiKey">OpenAI API Key</Label>
-                                        <div class="mt-2 flex gap-2">
-                                            <Input
-                                                id="apiKey"
-                                                v-model="apiKey"
-                                                :type="showApiKey ? 'text' : 'password'"
-                                                placeholder="sk-..."
-                                                class="flex-1"
-                                            />
-                                            <Button @click="showApiKey = !showApiKey" variant="outline">
-                                                <svg v-if="!showApiKey" class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                                    <path
-                                                        stroke-linecap="round"
-                                                        stroke-linejoin="round"
-                                                        stroke-width="2"
-                                                        d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
-                                                    />
-                                                    <path
-                                                        stroke-linecap="round"
-                                                        stroke-linejoin="round"
-                                                        stroke-width="2"
-                                                        d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"
-                                                    />
-                                                </svg>
-                                                <svg v-else class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                                    <path
-                                                        stroke-linecap="round"
-                                                        stroke-linejoin="round"
-                                                        stroke-width="2"
-                                                        d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21"
-                                                    />
-                                                </svg>
-                                            </Button>
-                                        </div>
-                                        <p class="mt-2 text-xs text-gray-500">Your API key is stored locally and never sent to our servers.</p>
-                                    </div>
-
-                                    <div class="pt-4">
-                                        <Button @click="saveApiKey"> Save API Key </Button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- Templates Section -->
-                            <div v-if="activeSection === 'templates'" class="space-y-6">
-                                <div class="mb-6 flex items-center justify-between">
-                                    <div>
-                                        <h2 class="text-xl font-semibold">Sales Coach Templates</h2>
-                                        <p class="mt-1 text-gray-600">Manage your coaching templates and create custom ones.</p>
-                                    </div>
-                                    <Button @click="$inertia.visit('/realtime-agent/templates/create')">
-                                        <svg class="mr-2 h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
-                                        </svg>
-                                        New Template
-                                    </Button>
-                                </div>
-
-                                <!-- Template List -->
-                                <div class="space-y-3">
-                                    <BaseCard v-for="template in templates.filter((t) => t.category === 'sales_coach')" :key="template.id" hover>
-                                        <div class="flex items-start justify-between">
-                                            <div class="flex-1">
-                                                <div class="flex items-center gap-2">
-                                                    <span class="text-lg">{{ getIconEmoji(template.icon) }}</span>
-                                                    <h3 class="font-semibold text-gray-800">{{ template.name }}</h3>
-                                                    <span
-                                                        v-if="template.is_system"
-                                                        class="rounded-full bg-blue-100 px-2 py-0.5 text-xs text-blue-600"
-                                                    >
-                                                        Built-in
-                                                    </span>
-                                                </div>
-                                                <p class="mt-1 text-sm text-gray-600">{{ template.description }}</p>
-                                                <div class="mt-3 flex items-center gap-4 text-xs text-gray-500">
-                                                    <span>Used {{ template.usage_count }} times</span>
-                                                    <span>•</span>
-                                                    <span>{{ template.variables ? Object.keys(template.variables).length : 0 }} variables</span>
-                                                </div>
-                                            </div>
-                                            <div class="ml-4 flex items-center gap-2">
-                                                <Button
-                                                    @click="$inertia.visit(`/realtime-agent/templates/${template.id}/edit`)"
-                                                    variant="ghost"
-                                                    size="sm"
-                                                    class="p-2"
-                                                    title="Edit template"
-                                                >
-                                                    <svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                                        <path
-                                                            stroke-linecap="round"
-                                                            stroke-linejoin="round"
-                                                            stroke-width="2"
-                                                            d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"
-                                                        />
-                                                    </svg>
-                                                </Button>
-                                                <Button
-                                                    @click="deleteTemplate(template)"
-                                                    variant="ghost"
-                                                    size="sm"
-                                                    :disabled="template.is_system"
-                                                    class="p-2 hover:text-red-600"
-                                                    :title="template.is_system ? 'Built-in templates cannot be deleted' : 'Delete template'"
-                                                >
-                                                    <svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                                        <path
-                                                            stroke-linecap="round"
-                                                            stroke-linejoin="round"
-                                                            stroke-width="2"
-                                                            d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
-                                                        />
-                                                    </svg>
-                                                </Button>
-                                            </div>
-                                        </div>
-                                    </BaseCard>
-                                </div>
-                            </div>
-
-                            <!-- Variables Section -->
-                            <div v-if="activeSection === 'variables'" class="space-y-6">
-                                <VariablesPanel />
-                            </div>
-
-                            <!-- Knowledge Base Section (Placeholder) -->
-                            <div v-if="activeSection === 'knowledge'" class="space-y-6">
-                                <div>
-                                    <h2 class="mb-4 text-xl font-semibold">Knowledge Base</h2>
-                                    <p class="mb-6 text-gray-600">Upload documents and resources to enhance the AI coach's knowledge.</p>
-                                </div>
-
-                                <BaseCard class="p-8 text-center">
-                                    <svg class="mx-auto mb-4 h-16 w-16 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                        <path
-                                            stroke-linecap="round"
-                                            stroke-linejoin="round"
-                                            stroke-width="2"
-                                            d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
-                                        />
-                                    </svg>
-                                    <p class="text-gray-500">Knowledge base feature coming soon...</p>
-                                </BaseCard>
-                            </div>
-                        </BaseCard>
-                    </div>
-                </div>
-            </div>
-        </PageContainer>
-    </AppLayout>
-</template>
-
-<script setup lang="ts">
-import BaseCard from '@/components/design/BaseCard.vue';
-import PageContainer from '@/components/design/PageContainer.vue';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import VariablesPanel from '@/components/VariablesPanel.vue';
-import AppLayout from '@/layouts/AppLayout.vue';
-import type { BreadcrumbItem } from '@/types';
-import { Head, router } from '@inertiajs/vue3';
-import axios from 'axios';
-import { BookOpen, Home, Key, MessageCircle, MessageSquare, Variable } from 'lucide-vue-next';
-import { onMounted, ref } from 'vue';
-
-interface Template {
-    id: string;
-    name: string;
-    description: string;
-    prompt: string;
-    icon: string;
-    category: string;
-    is_system: boolean;
-    usage_count: number;
-    variables?: Record<string, string>;
-    talking_points?: string[];
-    additional_info?: Record<string, any>;
-}
-
-// Breadcrumbs
-const breadcrumbs: BreadcrumbItem[] = [
-    {
-        title: 'Realtime Agent',
-        href: '/realtime-agent',
-    },
-    {
-        title: 'Settings',
-        href: '/realtime-agent/settings',
-    },
-];
-
-// Navigation
-const navItems = [
-    { id: 'dashboard', label: 'Dashboard', icon: Home, link: '/realtime-agent' },
-    { id: 'conversations', label: 'Conversations', icon: MessageCircle, link: '/conversations' },
-    { id: 'templates', label: 'Templates', icon: MessageSquare },
-    { id: 'variables', label: 'Variables', icon: Variable },
-    { id: 'api', label: 'API Configuration', icon: Key },
-    { id: 'knowledge', label: 'Knowledge Base', icon: BookOpen },
-];
-
-// Get section from URL query parameter
-const urlParams = new URLSearchParams(window.location.search);
-const activeSection = ref(urlParams.get('section') || 'templates');
-
-// API Key Management
-const apiKey = ref('');
-const showApiKey = ref(false);
-
-// Template Management
-const templates = ref<Template[]>([]);
-
-// Methods
-const fetchTemplates = async () => {
-    try {
-        const response = await axios.get('/templates');
-        templates.value = response.data.templates || [];
-    } catch (error) {
-        console.error('Failed to fetch templates:', error);
-    }
-};
-
-const saveApiKey = () => {
-    localStorage.setItem('OPENAI_API_KEY', apiKey.value);
-    alert('API Key saved successfully!');
-};
-
-const handleNavClick = (item: any) => {
-    if (item.link) {
-        router.visit(item.link);
-    } else {
-        // Update URL with section query parameter
-        const url = new URL(window.location.href);
-        url.searchParams.set('section', item.id);
-        window.history.pushState({}, '', url.toString());
-        activeSection.value = item.id;
-    }
-};
-
-const deleteTemplate = async (template: Template) => {
-    if (template.is_system) return;
-
-    if (!confirm(`Are you sure you want to delete "${template.name}"?`)) return;
-
-    try {
-        await axios.delete(`/templates/${template.id}`);
-        await fetchTemplates();
-    } catch (error) {
-        console.error('Failed to delete template:', error);
-        alert('Failed to delete template');
-    }
-};
-
-const getIconEmoji = (icon: string): string => {
-    const iconMap: Record<string, string> = {
-        MessageSquare: '💬',
-        Zap: '⚡',
-        Heart: '❤️',
-        Shield: '🛡️',
-        TrendingUp: '📈',
-        Search: '🔍',
-        Code2: '🔧',
-        Smile: '😊',
-        Target: '🎯',
-        Lightbulb: '💡',
-        DollarSign: '💵',
-        Calculator: '🧮',
-        Layers: '🗂️',
-        Star: '⭐',
-        Award: '🏆',
-        Users: '👥',
-        Flame: '🔥',
-        Rocket: '🚀',
-        Phone: '📞',
-        Building: '🏢',
-    };
-    return iconMap[icon] || '💬';
-};
-
-onMounted(() => {
-    fetchTemplates();
-
-    // Load API key from localStorage
-    const savedKey = localStorage.getItem('OPENAI_API_KEY');
-    if (savedKey) {
-        apiKey.value = savedKey;
-    }
-});
-</script>
diff --git a/resources/js/pages/RealtimeAgent/TemplateForm.vue b/resources/js/pages/RealtimeAgent/TemplateForm.vue
index 64b2649..9112ec4 100644
--- a/resources/js/pages/RealtimeAgent/TemplateForm.vue
+++ b/resources/js/pages/RealtimeAgent/TemplateForm.vue
@@ -142,7 +142,7 @@ const saveTemplate = async () => {
 };
 
 const cancel = () => {
-    router.visit('/realtime-agent/settings');
+    router.visit('/templates');
 };
 </script>
 
diff --git a/resources/js/pages/Templates/Index.vue b/resources/js/pages/Templates/Index.vue
index 38cd215..ba0c3f9 100644
--- a/resources/js/pages/Templates/Index.vue
+++ b/resources/js/pages/Templates/Index.vue
@@ -19,6 +19,9 @@ interface Template {
     category: string;
     is_system: boolean;
     usage_count: number;
+    variables?: Record<string, string>;
+    talking_points?: string[];
+    additional_info?: Record<string, any>;
     created_at: string;
     updated_at: string;
 }
@@ -52,21 +55,33 @@ const fetchTemplates = async () => {
 };
 
 const createTemplate = () => {
-    router.visit('/realtime-agent/templates/create');
+    router.visit('/templates/create');
 };
 
 const editTemplate = (templateId: string) => {
-    router.visit(`/realtime-agent/templates/${templateId}/edit`);
+    router.visit(`/templates/${templateId}/edit`);
 };
 
 const deleteTemplate = async (template: Template) => {
-    if (confirm(`Are you sure you want to delete "${template.name}"?`)) {
+    // Enhanced confirmation for system templates
+    let confirmMessage = `Are you sure you want to delete "${template.name}"?`;
+    if (template.is_system) {
+        confirmMessage = `⚠️ WARNING: You are about to delete a built-in system template!\n\n"${template.name}" is a pre-configured template that may be useful for many users.\n\nAre you absolutely sure you want to permanently delete this system template?`;
+    }
+
+    if (confirm(confirmMessage)) {
         try {
             await axios.delete(route('templates.destroy', template.id));
             await fetchTemplates();
         } catch (error) {
             console.error('Failed to delete template:', error);
-            alert('Failed to delete template. Please try again.');
+
+            // Handle specific error messages from backend
+            if (error.response?.status === 422 && error.response?.data?.error) {
+                alert(error.response.data.error);
+            } else {
+                alert('Failed to delete template. Please try again.');
+            }
         }
     }
 };
@@ -159,12 +174,14 @@ onMounted(() => {
                     </p>
 
                     <div class="flex items-center gap-2">
-                        <Button size="sm" variant="outline" @click="editTemplate(template.id)" :disabled="template.is_system"> Edit </Button>
+                        <!-- Edit button -->
+                        <Button size="sm" variant="outline" @click="editTemplate(template.id)"> Edit </Button>
+
+                        <!-- Delete button -->
                         <Button
                             size="sm"
                             variant="outline"
                             @click="deleteTemplate(template)"
-                            :disabled="template.is_system"
                             class="text-red-600 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"
                         >
                             Delete
diff --git a/routes/web.php b/routes/web.php
index 9b7c3ae..83fecc4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,9 +29,6 @@
     return Inertia::render('RealtimeAgent/Main');
 })->name('realtime-agent');
 
-Route::get('/realtime-agent/settings', function () {
-    return Inertia::render('RealtimeAgent/Settings');
-})->name('realtime-agent.settings');
 
 // Realtime API Routes
 Route::post('/api/realtime/ephemeral-key', [\App\Http\Controllers\RealtimeController::class, 'generateEphemeralKey'])
@@ -73,9 +70,9 @@
     ->name('templates.use');
 
 // Template Form Routes
-Route::get('/realtime-agent/templates/create', [\App\Http\Controllers\TemplateController::class, 'create'])
+Route::get('/templates/create', [\App\Http\Controllers\TemplateController::class, 'create'])
     ->name('templates.create');
-Route::get('/realtime-agent/templates/{template}/edit', [\App\Http\Controllers\TemplateController::class, 'edit'])
+Route::get('/templates/{template}/edit', [\App\Http\Controllers\TemplateController::class, 'edit'])
     ->name('templates.edit');
 
 // Conversation Routes (No auth required for desktop app)