diff --git a/markitect/document_manager.py b/markitect/document_manager.py
index 1a80749c..5bb7fbe2 100644
--- a/markitect/document_manager.py
+++ b/markitect/document_manager.py
@@ -533,6 +533,27 @@ class DocumentManager:
 
         let markitectEditor;"""
 
+        # Edit mode status and error reporting section
+        edit_mode_html = ""
+        if edit_mode:
+            edit_mode_html = f"""
+    <div id="markitect-status" style="background: #e3f2fd; border-left: 4px solid #2196f3; padding: 12px; margin-bottom: 20px; font-family: monospace; font-size: 14px;">
+        <div style="font-weight: bold; color: #1976d2;">📝 Markitect Edit Mode</div>
+        <div id="status-message" style="margin-top: 8px;">Loading edit capabilities...</div>
+        <div id="error-details" style="display: none; background: #ffebee; border: 1px solid #f44336; padding: 8px; margin-top: 8px; border-radius: 4px;">
+            <div style="font-weight: bold; color: #c62828;">❌ Edit Mode Failed</div>
+            <div id="error-text" style="margin-top: 4px; color: #666;"></div>
+            <details style="margin-top: 8px;">
+                <summary style="cursor: pointer; color: #1976d2;">🐛 Help us fix this issue</summary>
+                <div style="margin-top: 8px; font-size: 12px; color: #666;">
+                    Please report this error with your browser info:
+                    <br>📋 Browser: <span id="browser-info"></span>
+                    <br>🔗 Create issue: <a href="https://github.com/anthropics/markitect/issues/new" target="_blank" style="color: #1976d2;">GitHub Issues</a>
+                </div>
+            </details>
+        </div>
+    </div>"""
+
         html_template = f"""<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -542,33 +563,82 @@ class DocumentManager:
     {css_content}
     {default_css}
     {editor_css}
-    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"
+            onload="window.markitectMarkedLoaded = true"
+            onerror="window.markitectMarkedError = true"></script>
 </head>
 <body{body_classes}>
+    {edit_mode_html}
     <div id="markdown-content"></div>
 
     <script>
         const markdownContent = {js_markdown_content};
         {editor_config}
 
-        // Define editor class and scripts first
-        {editor_scripts}
+        // Error reporting utility
+        function reportEditModeError(errorMsg, technicalDetails) {{
+            const statusDiv = document.getElementById('markitect-status');
+            const errorDiv = document.getElementById('error-details');
+            const errorText = document.getElementById('error-text');
+            const statusMsg = document.getElementById('status-message');
+            const browserInfo = document.getElementById('browser-info');
 
+            if (statusMsg) statusMsg.textContent = 'Edit mode unavailable - content displayed in read-only mode';
+            if (errorDiv) errorDiv.style.display = 'block';
+            if (errorText) errorText.textContent = errorMsg + (technicalDetails ? ' (' + technicalDetails + ')' : '');
+            if (browserInfo) browserInfo.textContent = navigator.userAgent.split(' ').slice(-2).join(' ');
+        }}
+
+        // Always render content first (graceful degradation)
         document.addEventListener('DOMContentLoaded', function() {{
             const contentDiv = document.getElementById('markdown-content');
-            if (contentDiv && typeof marked !== 'undefined') {{
-                contentDiv.innerHTML = marked.parse(markdownContent);
-            }} else {{
-                console.error('Failed to render markdown: marked library not loaded');
-                if (contentDiv) {{
-                    contentDiv.innerHTML = '<p>Error: Markdown parser not available</p>';
+
+            // Step 1: Ensure content is always displayed
+            if (contentDiv) {{
+                if (typeof marked !== 'undefined') {{
+                    try {{
+                        contentDiv.innerHTML = marked.parse(markdownContent);
+                        console.log('✓ Markdown rendered successfully');
+                    }} catch (error) {{
+                        contentDiv.innerHTML = '<p>Error rendering markdown: ' + error.message + '</p>';
+                        {'reportEditModeError("Markdown parsing failed", error.message);' if edit_mode else ''}
+                    }}
+                }} else {{
+                    // Fallback: display raw markdown with basic formatting
+                    const fallbackHtml = markdownContent
+                        .replace(/^# (.*$)/gim, '<h1>$1</h1>')
+                        .replace(/^## (.*$)/gim, '<h2>$1</h2>')
+                        .replace(/^### (.*$)/gim, '<h3>$1</h3>')
+                        .replace(/\\*\\*(.*?)\\*\\*/g, '<strong>$1</strong>')
+                        .replace(/\\*(.*?)\\*/g, '<em>$1</em>')
+                        .replace(/^- (.*$)/gim, '<li>$1</li>')
+                        .replace(/\\n\\n/g, '<br><br>')
+                        .replace(/\\n/g, '<br>');
+                    contentDiv.innerHTML = '<div style="white-space: pre-wrap;">' + fallbackHtml + '</div>';
+                    {'reportEditModeError("CDN library failed to load", "Using basic fallback rendering");' if edit_mode else ''}
                 }}
             }}
-            {'// Initialize editor if in edit mode' if edit_mode else ''}
+
+            // Step 2: Try to enhance with edit capabilities (if in edit mode)
             {'if (typeof MARKITECT_EDIT_MODE !== \'undefined\' && MARKITECT_EDIT_MODE) {' if edit_mode else ''}
-                {'markitectEditor = new MarkitectEditor();' if edit_mode else ''}
+                {'try {' if edit_mode else ''}
+                    {editor_scripts if edit_mode else ''}
+                    {'markitectEditor = new MarkitectEditor();' if edit_mode else ''}
+                    {'document.getElementById("status-message").textContent = "✓ Edit mode active - click any section to edit";' if edit_mode else ''}
+                    {'console.log("✓ Edit mode initialized successfully");' if edit_mode else ''}
+                {'} catch (error) {' if edit_mode else ''}
+                    {'reportEditModeError("Edit mode initialization failed", error.message);' if edit_mode else ''}
+                    {'console.error("Edit mode error:", error);' if edit_mode else ''}
+                {'}}' if edit_mode else ''}
             {'}}' if edit_mode else ''}
         }});
+
+        // Handle CDN loading errors
+        window.addEventListener('load', function() {{
+            if (window.markitectMarkedError) {{
+                {'reportEditModeError("CDN library failed to load", "Network or firewall blocking marked.js");' if edit_mode else ''}
+            }}
+        }});
     </script>
 </body>
 </html>"""
