diff --git a/FIX_ATTEMPTS.md b/FIX_ATTEMPTS.md
index 371d8c7..d042dcb 100644
--- a/FIX_ATTEMPTS.md
+++ b/FIX_ATTEMPTS.md
@@ -45,22 +45,36 @@ JavaScript execution errors due to null reference exceptions when trying to add
 **Result**: ❌ FAILED
 **Why Failed**: Didn't address the core ordering issue
 
-## Attempt 6: Inline Null Checks (SUCCESSFUL SOLUTION)
+## Attempt 6: Inline Null Checks (PARTIAL SUCCESS then FAILED)
 **Date**: 2026-01-01
 **Files**: `/tmp/inline_null_checks.py`, `/tmp/fix_remaining.py`
 **Approach**: Added inline null checks directly where event listeners are attached, without moving any code
+**Result**: ❌ BROKE JAVASCRIPT SYNTAX
+**Why Failed**: Python script incorrectly placed closing braces, breaking arrow functions
+**Specific Issue**: Lines 4958, 4969, 6140, 6162, 6180, 6490, 6503 had misplaced `}` that closed arrow functions too early
+
+## Attempt 7: Manual Syntax Fix (FINAL SOLUTION)
+**Date**: 2026-01-01
+**Approach**: Manually fixed all misplaced closing braces from the Python script
 **Result**: ✅ SUCCESS
 **How it worked**:
-- Wrapped each `getElementById().addEventListener` with:
+- Fixed pattern: Changed from:
+  ```javascript
+  addEventListener('click', () => {
+      statement1;
+  }  // WRONG - closes arrow function early
+      statement2;
+  });
+  ```
+  To:
   ```javascript
-  const element = document.getElementById('elementId');
-  if (element) {
-      element.addEventListener('event', handler);
-  }
+  addEventListener('click', () => {
+      statement1;
+      statement2;
+  });  // Correct placement
   ```
-- Kept all event listeners in their original locations
-- No function ordering issues
-- No duplicate event listeners
+- Fixed 7 event listeners: navConfirmYes, navConfirmNo, remeshBtn, remeshYes, remeshNo, resumeNavYes, resumeNavNo
+- All event listeners now properly wrapped with null checks AND correct syntax
 
 ## Current Status
 **Fixed**: Application is working correctly
diff --git a/index.html b/index.html
index 19a8b59..3745e30 100644
--- a/index.html
+++ b/index.html
@@ -4955,20 +4955,20 @@
         if (el_navConfirmYes) {
             el_navConfirmYes.addEventListener('click', () => {
                 document.getElementById('navConfirmDialog').style.display = 'none';
+                if (pendingDestination) {
+                    setDestination(pendingDestination.track, pendingDestination.index);
+                    pendingDestination = null;
+                }
+            });
         }
-            if (pendingDestination) {
-                setDestination(pendingDestination.track, pendingDestination.index);
-                pendingDestination = null;
-            }
-        });
 
         const el_navConfirmNo = document.getElementById('navConfirmNo');
         if (el_navConfirmNo) {
             el_navConfirmNo.addEventListener('click', () => {
                 document.getElementById('navConfirmDialog').style.display = 'none';
+                pendingDestination = null;
+            });
         }
-            pendingDestination = null;
-        });
 
         // Press and hold handlers for navigation mode
         function startPressHold(e) {
@@ -6137,48 +6137,48 @@
             el_remeshBtn.addEventListener('click', () => {
                 if (selectedTracks.length === 0) {
                     updateStatus('Please select tracks to remesh first', 'error');
-        }
-                return;
-            }
-
-            // Reset slider to default
-            remeshSlider.value = 5;
-            remeshValueDisplay.textContent = '5';
+                    return;
+                }
 
-            // Show confirmation dialog
-            const trackNames = selectedTracks.map(t => t.name).join(', ');
-            const totalPoints = selectedTracks.reduce((sum, t) => sum + t.coords.length, 0);
-            document.getElementById('remeshDetails').innerHTML =
-                `<strong>Selected tracks:</strong> ${trackNames}<br>` +
-                `<strong>Current total points:</strong> ${totalPoints}`;
-            ensurePopupInBody('remeshDialog');
-            document.getElementById('remeshDialog').style.display = 'flex';
-        });
+                // Reset slider to default
+                remeshSlider.value = 5;
+                remeshValueDisplay.textContent = '5';
+
+                // Show confirmation dialog
+                const trackNames = selectedTracks.map(t => t.name).join(', ');
+                const totalPoints = selectedTracks.reduce((sum, t) => sum + t.coords.length, 0);
+                document.getElementById('remeshDetails').innerHTML =
+                    `<strong>Selected tracks:</strong> ${trackNames}<br>` +
+                    `<strong>Current total points:</strong> ${totalPoints}`;
+                ensurePopupInBody('remeshDialog');
+                document.getElementById('remeshDialog').style.display = 'flex';
+            });
+        }
 
         const el_remeshYes = document.getElementById('remeshYes');
         if (el_remeshYes) {
             el_remeshYes.addEventListener('click', () => {
                 document.getElementById('remeshDialog').style.display = 'none';
-        }
 
-            // Get the spacing value from slider
-            const spacing = parseInt(remeshSlider.value);
+                // Get the spacing value from slider
+                const spacing = parseInt(remeshSlider.value);
 
-            // Remesh all selected tracks with the chosen spacing
-            selectedTracks.forEach(track => {
-                remeshTrack(track, spacing);
-            });
+                // Remesh all selected tracks with the chosen spacing
+                selectedTracks.forEach(track => {
+                    remeshTrack(track, spacing);
+                });
 
-            // Clear selection after remeshing
-            clearSelection();
-        });
+                // Clear selection after remeshing
+                clearSelection();
+            });
+        }
 
         const el_remeshNo = document.getElementById('remeshNo');
         if (el_remeshNo) {
             el_remeshNo.addEventListener('click', () => {
                 document.getElementById('remeshDialog').style.display = 'none';
+            });
         }
-        });
 
         // Preview system
         const el_previewBtn = document.getElementById('previewBtn');
@@ -6192,17 +6192,18 @@
         const el_cancelPreviewBtn = document.getElementById('cancelPreviewBtn');
         if (el_cancelPreviewBtn) {
             el_cancelPreviewBtn.addEventListener('click', cancelPreview);
-    
-            // Live slider update during preview
-            const mergeThreshold = document.getElementById('mergeThreshold');
-            if (mergeThreshold) {
-                mergeThreshold.addEventListener('input', (e) => {
+        }
+
+        // Live slider update during preview
+        const mergeThreshold = document.getElementById('mergeThreshold');
+        if (mergeThreshold) {
+            mergeThreshold.addEventListener('input', (e) => {
                 document.getElementById('thresholdValue').textContent = e.target.value;
+                if (previewMode) {
+                    updatePreview(parseInt(e.target.value));
+                }
+            });
         }
-            if (previewMode) {
-                updatePreview(parseInt(e.target.value));
-            }
-        });
 
         // Anchor distance slider update
         const el_anchorDistance = document.getElementById('anchorDistance');
@@ -6486,23 +6487,23 @@
         if (el_resumeNavYes) {
             el_resumeNavYes.addEventListener('click', () => {
                 document.getElementById('resumeNavDialog').style.display = 'none';
+                // Restore saved navigation
+                const savedNav = localStorage.getItem('navMode');
+                if (savedNav === 'true') {
+                    switchTab('navigate');
+                    restoreDestination();
+                }
+            });
         }
-            // Restore saved navigation
-            const savedNav = localStorage.getItem('navMode');
-            if (savedNav === 'true') {
-                switchTab('navigate');
-                restoreDestination();
-            }
-        });
 
         const el_resumeNavNo = document.getElementById('resumeNavNo');
         if (el_resumeNavNo) {
             el_resumeNavNo.addEventListener('click', () => {
                 document.getElementById('resumeNavDialog').style.display = 'none';
+                localStorage.removeItem('navDestination');
+                localStorage.removeItem('navMode');
+            });
         }
-            localStorage.removeItem('navDestination');
-            localStorage.removeItem('navMode');
-        });
 
         // Auto-load default.kml with cache busting
         fetch('default.kml?t=' + Date.now())