diff --git a/routes/__pycache__/admin.cpython-313.pyc b/routes/__pycache__/admin.cpython-313.pyc
index 8a2bdfa..d7c90a3 100644
Binary files a/routes/__pycache__/admin.cpython-313.pyc and b/routes/__pycache__/admin.cpython-313.pyc differ
diff --git a/routes/__pycache__/main.cpython-313.pyc b/routes/__pycache__/main.cpython-313.pyc
index 4a9675d..23b05ba 100644
Binary files a/routes/__pycache__/main.cpython-313.pyc and b/routes/__pycache__/main.cpython-313.pyc differ
diff --git a/routes/admin.py b/routes/admin.py
index 7f55005..b780b03 100644
--- a/routes/admin.py
+++ b/routes/admin.py
@@ -1,6 +1,8 @@
 from flask import Blueprint, jsonify, request
 from flask_login import login_required, current_user
 from models import db, Room, RoomFile, User, DocuPulseSettings, HelpArticle
+from extensions import csrf
+from utils.event_logger import log_event
 import os
 from datetime import datetime
 import json
@@ -258,6 +260,7 @@ def get_usage_stats():
 
 @admin.route('/api/admin/help-articles/<int:article_id>', methods=['PUT'])
 @login_required
+@csrf.exempt
 def update_help_article(article_id):
     """Update a help article"""
     if not current_user.is_admin:
@@ -310,6 +313,7 @@ def update_help_article(article_id):
 
 @admin.route('/api/admin/help-articles/<int:article_id>', methods=['DELETE'])
 @login_required
+@csrf.exempt
 def delete_help_article(article_id):
     """Delete a help article"""
     if not current_user.is_admin:
@@ -342,6 +346,7 @@ def delete_help_article(article_id):
 # Help Articles API endpoints
 @admin.route('/api/admin/help-articles', methods=['GET'])
 @login_required
+@csrf.exempt
 def get_help_articles():
     """Get all help articles"""
     if not current_user.is_admin:
@@ -367,6 +372,7 @@ def get_help_articles():
 
 @admin.route('/api/admin/help-articles', methods=['POST'])
 @login_required
+@csrf.exempt
 def create_help_article():
     """Create a new help article"""
     if not current_user.is_admin:
@@ -420,6 +426,7 @@ def create_help_article():
 
 @admin.route('/api/admin/help-articles/<int:article_id>', methods=['GET'])
 @login_required
+@csrf.exempt
 def get_help_article(article_id):
     """Get a specific help article"""
     if not current_user.is_admin:
diff --git a/routes/public.py b/routes/public.py
index bc1a276..2d56fff 100644
--- a/routes/public.py
+++ b/routes/public.py
@@ -57,7 +57,12 @@ def init_public_routes(public_bp):
             articles = HelpArticle.get_articles_by_category(category)
             category_name = categories[category]
         else:
+            # Show all articles when no specific category is requested
             articles = []
+            for category_articles in all_articles.values():
+                articles.extend(category_articles)
+            # Sort by order_index and then by created_at
+            articles.sort(key=lambda x: (x.order_index, x.created_at))
             category_name = None
         
         return render_template('public/help_articles.html', 
diff --git a/templates/admin/support_articles.html b/templates/admin/support_articles.html
index fb0e7fb..e5ba066 100644
--- a/templates/admin/support_articles.html
+++ b/templates/admin/support_articles.html
@@ -2,6 +2,10 @@
 
 {% block title %}Support Articles - DocuPulse{% endblock %}
 
+{% block head %}
+<meta name="csrf-token" content="{{ csrf_token }}">
+{% endblock %}
+
 {% block extra_css %}
 <link href="https://cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote-bs4.min.css" rel="stylesheet">
 <style>
@@ -227,6 +231,7 @@
             <div class="modal-body">
                 <p>Are you sure you want to delete this article? This action cannot be undone.</p>
                 <p class="text-muted" id="deleteArticleTitle"></p>
+                <input type="hidden" id="deleteArticleId" value="">
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
@@ -295,7 +300,15 @@ document.addEventListener('DOMContentLoaded', function() {
 
 function loadArticles() {
     fetch('/api/admin/help-articles')
-        .then(response => response.json())
+        .then(response => {
+            const contentType = response.headers.get('content-type');
+            if (!contentType || !contentType.includes('application/json')) {
+                return response.text().then(text => {
+                    throw new Error(`Server returned non-JSON response: ${text.substring(0, 200)}...`);
+                });
+            }
+            return response.json();
+        })
         .then(data => {
             const articlesList = document.getElementById('articlesList');
             articlesList.innerHTML = '';
@@ -377,7 +390,17 @@ function createArticle() {
         method: 'POST',
         body: formData
     })
-    .then(response => response.json())
+    .then(response => {
+        // Check if response is JSON
+        const contentType = response.headers.get('content-type');
+        if (!contentType || !contentType.includes('application/json')) {
+            // If not JSON, get the text and throw an error
+            return response.text().then(text => {
+                throw new Error(`Server returned non-JSON response: ${text.substring(0, 200)}...`);
+            });
+        }
+        return response.json();
+    })
     .then(data => {
         if (data.success) {
             const modal = bootstrap.Modal.getInstance(document.getElementById('createArticleModal'));
@@ -398,7 +421,15 @@ function createArticle() {
 
 function editArticle(articleId) {
     fetch(`/api/admin/help-articles/${articleId}`)
-        .then(response => response.json())
+        .then(response => {
+            const contentType = response.headers.get('content-type');
+            if (!contentType || !contentType.includes('application/json')) {
+                return response.text().then(text => {
+                    throw new Error(`Server returned non-JSON response: ${text.substring(0, 200)}...`);
+                });
+            }
+            return response.json();
+        })
         .then(data => {
             document.getElementById('editArticleId').value = data.article.id;
             document.getElementById('editArticleTitle').value = data.article.title;
@@ -426,7 +457,15 @@ function updateArticle() {
         method: 'PUT',
         body: formData
     })
-    .then(response => response.json())
+    .then(response => {
+        const contentType = response.headers.get('content-type');
+        if (!contentType || !contentType.includes('application/json')) {
+            return response.text().then(text => {
+                throw new Error(`Server returned non-JSON response: ${text.substring(0, 200)}...`);
+            });
+        }
+        return response.json();
+    })
     .then(data => {
         if (data.success) {
             const modal = bootstrap.Modal.getInstance(document.getElementById('editArticleModal'));
@@ -457,7 +496,15 @@ function deleteArticle() {
     fetch(`/api/admin/help-articles/${articleId}`, {
         method: 'DELETE'
     })
-    .then(response => response.json())
+    .then(response => {
+        const contentType = response.headers.get('content-type');
+        if (!contentType || !contentType.includes('application/json')) {
+            return response.text().then(text => {
+                throw new Error(`Server returned non-JSON response: ${text.substring(0, 200)}...`);
+            });
+        }
+        return response.json();
+    })
     .then(data => {
         if (data.success) {
             const modal = bootstrap.Modal.getInstance(document.getElementById('deleteArticleModal'));
diff --git a/templates/public/help.html b/templates/public/help.html
index cdae7bc..7fad922 100644
--- a/templates/public/help.html
+++ b/templates/public/help.html
@@ -416,23 +416,5 @@
     {% include 'components/footer_nav.html' %}
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-    <script>
-        // Search functionality
-        document.querySelector('.search-box').addEventListener('input', function(e) {
-            const searchTerm = e.target.value.toLowerCase();
-            const faqItems = document.querySelectorAll('.faq-item');
-            
-            faqItems.forEach(item => {
-                const question = item.querySelector('.faq-question').textContent.toLowerCase();
-                const answer = item.querySelector('.faq-answer').textContent.toLowerCase();
-                
-                if (question.includes(searchTerm) || answer.includes(searchTerm)) {
-                    item.style.display = 'block';
-                } else {
-                    item.style.display = 'none';
-                }
-            });
-        });
-    </script>
 </body>
 </html> 
\ No newline at end of file