diff --git a/CLAUDE.md b/CLAUDE.md
index 3964600..bb1f45a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -681,4 +681,4 @@ curl http://localhost:8000/health/
 Always run `python manage.py check_db` before making database-related changes to ensure proper configuration.
 
 ---
-Last updated: Last updated: Last updated: Last updated: Last updated: Last updated: 2025-07-29 19:33:01
+Last updated: Last updated: Last updated: Last updated: Last updated: Last updated: Last updated: 2025-07-29 19:57:24
diff --git a/docs_update_summary.txt b/docs_update_summary.txt
index 24874bf..73ab73a 100644
--- a/docs_update_summary.txt
+++ b/docs_update_summary.txt
@@ -1,24 +1,45 @@
 === Documentation Auto-Update Summary ===
-Update Date: 2025-07-29 19:33:01
+Update Date: 2025-07-29 19:57:24
 
 Recent Commits:
+  - ec42b51 🗑️ Complete agent_base app removal and legacy cleanup
   - 73d5141 ✅ All agents working: Direct N8N integration, fixed routing, and pricing sync
   - adab6e4 🧹 Complete template component architecture and remove notification noise
-  - bf1e882 🔄 Finalize auto-documentation cycle
 
 Agents Changes:
-  - workflows/config/agents.py
-  - workflows/templates/workflows/components/quick_agents_panel.html
+  - agent_base/__init__.py
+  - agent_base/admin.py
+  - agent_base/apps.py
+  - agent_base/generators/__init__.py
+  - agent_base/generators/admin.py
 
 Core Changes:
-  - netcop_hub/urls.py
+  - core/views.py
+  - data_analyzer/urls.py
+  - data_analyzer/views.py
+  - email_writer/urls.py
+  - email_writer/views.py
+
+Documentation Changes:
+  - CLAUDE.md
+  - data_analyzer/n8n_workflows/README.md
+  - five_whys_analyzer/n8n_workflows/README.md
+  - job_posting_generator/n8n_workflows/README.md
+  - social_ads_generator/n8n_workflows/README.md
 
 Frontend Changes:
-  - static/js/data-analyzer.js
-  - static/js/job-posting-generator.js
-  - static/js/social-ads.js
-  - workflows/templates/workflows/data-analyzer.html
-  - workflows/templates/workflows/job-posting-generator.html
+  - data_analyzer/n8n_workflows/pdf_data_analyzer.json
+  - data_analyzer/templates/data_analyzer/detail.html
+  - email_writer/templates/email_writer/detail.html
+  - five_whys_analyzer/n8n_workflows/5_whys.json
+  - five_whys_analyzer/templates/five_whys_analyzer/detail.html
+
+Backend Changes:
+  - data_analyzer/__init__.py
+  - data_analyzer/admin.py
+  - data_analyzer/apps.py
+  - data_analyzer/management/__init__.py
+  - data_analyzer/management/commands/__init__.py
 
 Updated Documentation Files:
   - /home/amit/projects/quantum_ai_v2/CLAUDE.md
diff --git a/workflows/config/agents.py b/workflows/config/agents.py
index b306c7b..083f498 100644
--- a/workflows/config/agents.py
+++ b/workflows/config/agents.py
@@ -7,7 +7,6 @@ AGENT_CONFIGS = {
     'social-ads-generator': {
         'name': 'Social Ads Generator',
         'description': 'Create engaging social media advertisements with AI-powered content generation',
-        'category': 'marketing',
         'price': 6.0,
         'icon': '📱',
         'webhook_url': 'http://localhost:5678/webhook/2dc234d8-7217-454a-83e9-81afe5b4fe2d',
@@ -16,46 +15,18 @@ AGENT_CONFIGS = {
     'job-posting-generator': {
         'name': 'Job Posting Generator',
         'description': 'Create professional job postings that attract top talent',
-        'category': 'content',
         'price': 10.0,
         'icon': '💼',
         'webhook_url': 'http://localhost:5678/webhook/43f84411-eaaa-488c-9b1f-856e90d0aaf6',
     },
     
-    'five-whys-analyzer': {
-        'name': 'Five Whys Analyzer',
-        'description': 'Perform root cause analysis using the Five Whys methodology',
-        'category': 'analytics',
-        'price': 2.5,
-        'icon': '🔍',
-        'webhook_url': 'http://localhost:5678/webhook/five-whys-webhook-id',
-    },
-    
-    'weather-reporter': {
-        'name': 'Weather Reporter',
-        'description': 'Get detailed weather reports and forecasts for any location',
-        'category': 'utilities',
-        'price': 1.0,
-        'icon': '🌤️',
-        'webhook_url': 'http://localhost:5678/webhook/weather-webhook-id',
-    },
-    'template-demo': {
-        'name': 'Template Demo',
-        'description': 'Demo of the fixed agent template starter with all enhancements',
-        'category': 'demo',
-        'price': 0.5,
-        'icon': '🎯',
-        'webhook_url': 'http://localhost:5678/webhook/template-demo',
-    },
-    
     'data-analyzer': {
         'name': 'Data Analyzer',
         'description': 'AI-powered analysis of your data files with comprehensive insights',
-        'category': 'analytics',
         'price': 8.0,
         'icon': '📊',
         'webhook_url': 'http://localhost:5678/webhook/simple-pdf-processor',
-    }
+    },
 }
 
 
diff --git a/workflows/templates/workflows/components/quick_agents_panel.html b/workflows/templates/workflows/components/quick_agents_panel.html
index 3c7b4da..6d62fce 100644
--- a/workflows/templates/workflows/components/quick_agents_panel.html
+++ b/workflows/templates/workflows/components/quick_agents_panel.html
@@ -18,25 +18,9 @@
                 </a>
             {% endfor %}
         {% else %}
-            <!-- Fallback to hardcoded agents if available_agents not provided -->
-            <a href="/agents/data-analyzer/" class="quick-agent-card">
-                <div class="agent-icon">📊</div>
-                <div class="agent-info">
-                    <h4>Data Analyzer</h4>
-                    <p>AI-powered data analysis</p>
-                </div>
-            </a>
-
-            <a href="/agents/weather-reporter/" class="quick-agent-card">
-                <div class="agent-icon">🌤️</div>
-                <div class="agent-info">
-                    <h4>Weather Reporter</h4>
-                    <p>Worldwide weather forecasts</p>
-                </div>
-            </a>
-
+            <!-- Fallback to hardcoded working agents if available_agents not provided -->
             <a href="/agents/social-ads-generator/" class="quick-agent-card">
-                <div class="agent-icon">📢</div>
+                <div class="agent-icon">📱</div>
                 <div class="agent-info">
                     <h4>Social Ads Generator</h4>
                     <p>Create social media ads</p>
@@ -51,11 +35,11 @@
                 </div>
             </a>
 
-            <a href="/agents/five-whys-analyzer/" class="quick-agent-card">
-                <div class="agent-icon">🤔</div>
+            <a href="/agents/data-analyzer/" class="quick-agent-card">
+                <div class="agent-icon">📊</div>
                 <div class="agent-info">
-                    <h4>Five Whys Analyzer</h4>
-                    <p>Problem analysis method</p>
+                    <h4>Data Analyzer</h4>
+                    <p>AI-powered data analysis</p>
                 </div>
             </a>
         {% endif %}
diff --git a/workflows/templates/workflows/marketplace.html b/workflows/templates/workflows/marketplace.html
index 80c0541..04444bd 100644
--- a/workflows/templates/workflows/marketplace.html
+++ b/workflows/templates/workflows/marketplace.html
@@ -317,10 +317,10 @@
 
     <!-- Agents Grid -->
     {% if agents_by_category %}
-        {% for category, agents in agents_by_category.items %}
-            <div class="category-section">
-                <h2 class="category-title">{{ category }}</h2>
-                <div class="agents-grid">
+        {% if not selected_category %}
+            <!-- Show all agents without category headings when "All" is selected -->
+            <div class="agents-grid">
+                {% for category, agents in agents_by_category.items %}
                     {% for agent in agents %}
                         <a href="{% url 'workflows:agent' agent.slug %}" class="agent-card">
                             <div class="agent-header">
@@ -337,9 +337,34 @@
                             </div>
                         </a>
                     {% endfor %}
-                </div>
+                {% endfor %}
             </div>
-        {% endfor %}
+        {% else %}
+            <!-- Show agents with category headings when specific category is selected -->
+            {% for category, agents in agents_by_category.items %}
+                <div class="category-section">
+                    <h2 class="category-title">{{ category }}</h2>
+                    <div class="agents-grid">
+                        {% for agent in agents %}
+                            <a href="{% url 'workflows:agent' agent.slug %}" class="agent-card">
+                                <div class="agent-header">
+                                    <div class="agent-icon">{{ agent.icon }}</div>
+                                    <div class="agent-info">
+                                        <h3>{{ agent.name }}</h3>
+                                        <p class="agent-price">{{ agent.price }} AED</p>
+                                    </div>
+                                </div>
+                                <p class="agent-description">{{ agent.description }}</p>
+                                <div class="agent-footer">
+                                    <span class="agent-category">{{ agent.category }}</span>
+                                    <button class="try-btn">Try Now →</button>
+                                </div>
+                            </a>
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endfor %}
+        {% endif %}
     {% else %}
         <div class="no-results">
             <div class="no-results-icon">🔍</div>