diff --git a/includes/class-hvac-manage-event.php b/includes/class-hvac-manage-event.php
index fe424247..305df12d 100644
--- a/includes/class-hvac-manage-event.php
+++ b/includes/class-hvac-manage-event.php
@@ -18,8 +18,8 @@ class HVAC_Manage_Event {
      * Constructor
      */
     public function __construct() {
-        // Hook into content filter with low priority (99) to run after other filters
-        add_filter('the_content', array($this, 'ensure_shortcode_processing'), 99);
+        // DISABLED: Content filtering is now handled directly in the template
+        // add_filter('the_content', array($this, 'ensure_shortcode_processing'), 99);
         
         // Add authentication check for manage-event page
         add_action('template_redirect', array($this, 'check_manage_event_auth'));
@@ -67,9 +67,15 @@ class HVAC_Manage_Event {
             HVAC_Logger::info('Original content: ' . substr($content, 0, 200), 'ManageEvent');
         }
         
-        // Strip WordPress block editor comments
-        $content = preg_replace('/<!-- wp:shortcode -->/', '', $content);
-        $content = preg_replace('/<!-- \/wp:shortcode -->/', '', $content);
+        // Strip WordPress block editor comments - handle all variations
+        $content = preg_replace('/<!--\s*wp:shortcode\s*-->/', '', $content);
+        $content = preg_replace('/<!--\s*\/wp:shortcode\s*-->/', '', $content);
+        
+        // Also strip any remaining HTML comments that might contain shortcode references
+        $content = preg_replace('/<!--[^>]*wp:shortcode[^>]*-->/', '', $content);
+        
+        // Clean up any extra whitespace
+        $content = trim($content);
         
         // Process all shortcodes in the content
         $processed_content = do_shortcode($content);
@@ -245,7 +251,41 @@ class HVAC_Manage_Event {
         .hvac-notice.hvac-error ul {
             margin: 15px 0 15px 30px;
         }
-        </style>';
+        </style>
+        <script>
+        // Remove any HTML comments containing wp:shortcode from the DOM
+        document.addEventListener("DOMContentLoaded", function() {
+            // Get all text nodes in the event manage wrapper
+            var wrapper = document.querySelector(".hvac-event-manage-wrapper");
+            if (!wrapper) return;
+            
+            var walker = document.createTreeWalker(
+                wrapper,
+                NodeFilter.SHOW_ALL,
+                null,
+                false
+            );
+            
+            var nodesToRemove = [];
+            var node;
+            
+            while (node = walker.nextNode()) {
+                // Check for comment nodes
+                if (node.nodeType === 8 && node.nodeValue && node.nodeValue.includes("wp:shortcode")) {
+                    nodesToRemove.push(node);
+                }
+                // Also check text nodes that might contain the comment as text
+                else if (node.nodeType === 3 && node.nodeValue && node.nodeValue.includes("<!-- wp:shortcode -->")) {
+                    node.nodeValue = node.nodeValue.replace(/<!--\s*wp:shortcode\s*-->/g, "").replace(/<!--\s*\/wp:shortcode\s*-->/g, "");
+                }
+            }
+            
+            // Remove comment nodes
+            nodesToRemove.forEach(function(node) {
+                node.remove();
+            });
+        });
+        </script>';
     }
     
     /**
diff --git a/scripts/clear-manage-event-cache.sh b/scripts/clear-manage-event-cache.sh
new file mode 100755
index 00000000..05aa9933
--- /dev/null
+++ b/scripts/clear-manage-event-cache.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+echo "=== Clearing cache for manage event page ==="
+
+# Try to clear Breeze cache if available
+if command -v wp &> /dev/null; then
+    echo "Clearing WordPress cache..."
+    wp cache flush 2>/dev/null || echo "  - WordPress cache flush not available"
+    
+    echo "Clearing Breeze cache..."
+    wp breeze purge --cache=all 2>/dev/null || echo "  - Breeze cache purge not available"
+    
+    echo "Clearing transients..."
+    wp transient delete --all 2>/dev/null || echo "  - Transient deletion not available"
+else
+    echo "WP-CLI not found. Manual cache clearing may be needed."
+fi
+
+# Clear object cache files if they exist
+if [ -d "/tmp/breeze" ]; then
+    echo "Clearing Breeze file cache..."
+    rm -rf /tmp/breeze/*
+fi
+
+# Clear any server-side caches
+if command -v redis-cli &> /dev/null; then
+    echo "Flushing Redis cache..."
+    redis-cli FLUSHALL 2>/dev/null || echo "  - Redis flush failed or not configured"
+fi
+
+if command -v service &> /dev/null; then
+    echo "Restarting PHP-FPM (if available)..."
+    sudo service php*-fpm restart 2>/dev/null || echo "  - PHP-FPM restart not available"
+fi
+
+echo "Cache clearing complete!"
+echo ""
+echo "Next steps:"
+echo "1. Visit the manage event page in an incognito/private browser window"
+echo "2. Check if the HTML comment is still appearing"
+echo "3. If it still appears, the issue is likely in The Events Calendar plugin itself"
\ No newline at end of file
diff --git a/templates/page-manage-event.php b/templates/page-manage-event.php
index c72d8a9e..7bd33741 100644
--- a/templates/page-manage-event.php
+++ b/templates/page-manage-event.php
@@ -10,12 +10,50 @@ get_header();
 // This template ensures proper WordPress theme integration
 ?>
 <div class="hvac-event-manage-wrapper">
+    <!-- Navigation Header -->
+    <div class="hvac-dashboard-header">
+        <h1 class="entry-title">Create Event</h1>
+        <div class="hvac-dashboard-nav">
+            <a href="/trainer/dashboard/" class="ast-button ast-button-secondary">Dashboard</a>
+            <a href="/trainer/certificate-reports/" class="ast-button ast-button-secondary">Certificate Reports</a>
+            <a href="/trainer/generate-certificates/" class="ast-button ast-button-secondary">Generate Certificates</a>
+            <button class="ast-button hvac-help-trigger">Help</button>
+        </div>
+    </div>
+    
     <?php
     // Let The Events Calendar handle the content
     if (have_posts()) :
         while (have_posts()) : the_post();
-            the_content();
+            // Get the raw content WITHOUT any filters
+            global $post;
+            $raw_content = $post->post_content;
+            
+            // Strip ALL HTML comments that might contain shortcode references
+            // Use multiple patterns to catch all variations
+            $patterns = [
+                '/<!--\s*wp:shortcode\s*-->/s',
+                '/<!--\s*\/wp:shortcode\s*-->/s',
+                '/<!--[^>]*wp:shortcode[^>]*-->/s',
+                '/<!--.*?-->/s'  // Catch all remaining HTML comments
+            ];
+            
+            foreach ($patterns as $pattern) {
+                $raw_content = preg_replace($pattern, '', $raw_content);
+            }
+            
+            // Clean up any extra whitespace
+            $raw_content = trim($raw_content);
+            
+            // Process shortcodes directly without the_content filter
+            $processed = do_shortcode($raw_content);
+            
+            // Output the processed content
+            echo $processed;
         endwhile;
+    else:
+        // No posts found - show the shortcode directly
+        echo do_shortcode('[tribe_community_events]');
     endif;
     ?>
 </div>