diff --git a/web/templates/race_manage.templ b/web/templates/race_manage.templ
index 821ad98..6fd0a5b 100644
--- a/web/templates/race_manage.templ
+++ b/web/templates/race_manage.templ
@@ -147,7 +147,7 @@ templ RaceManage(groups []models.Group, currentGroup models.Group, heats []model
             // WebSocket connections
             const timerSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/timer`);
             const adminSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/admin`);
-            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/events`);
+            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/events`);
             
             const timerDisplay = document.getElementById('timer');
             const statusIndicator = document.getElementById('status-indicator');
diff --git a/web/templates/race_manage_templ.go b/web/templates/race_manage_templ.go
index 82c2566..a7c8786 100644
--- a/web/templates/race_manage_templ.go
+++ b/web/templates/race_manage_templ.go
@@ -238,7 +238,7 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</tbody></table></div></div></div></div></div></div><script>\r\n            // WebSocket connections\r\n            const timerSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/timer`);\r\n            const adminSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/admin`);\r\n            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/events`);\r\n            \r\n            const timerDisplay = document.getElementById('timer');\r\n            const statusIndicator = document.getElementById('status-indicator');\r\n            const gateStatus = document.getElementById('gate-status');\r\n            const gateStatusText = document.getElementById('gate-status-text');\r\n            \r\n            // Timer socket handling\r\n            timerSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.type === 'time') {\r\n                    timerDisplay.textContent = data.time.toFixed(3);\r\n                } else if (data.type === 'status') {\r\n                    statusIndicator.textContent = data.status;\r\n                    \r\n                    // Update status indicator color\r\n                    statusIndicator.className = 'badge mb-3 ';\r\n                    if (data.status === 'Ready') {\r\n                        statusIndicator.className += 'bg-secondary';\r\n                    } else if (data.status === 'Running') {\r\n                        statusIndicator.className += 'bg-success';\r\n                    } else if (data.status === 'Finished') {\r\n                        statusIndicator.className += 'bg-primary';\r\n                        \r\n                        // Auto-save results when race finishes\r\n                        saveHeatResults();\r\n                    }\r\n                } else if (data.type === 'gate') {\r\n                    gateStatusText.textContent = data.status;\r\n                    \r\n                    // Update gate status color\r\n                    gateStatus.className = 'alert ';\r\n                    if (data.status === 'Open') {\r\n                        gateStatus.className += 'alert-danger';\r\n                    } else if (data.status === 'Closed') {\r\n                        gateStatus.className += 'alert-success';\r\n                    } else {\r\n                        gateStatus.className += 'alert-secondary';\r\n                    }\r\n                } else if (data.type === 'lane-time') {\r\n                    // Update lane time display\r\n                    const laneTimeElement = document.getElementById(`lane-${data.lane}-time`);\r\n                    if (laneTimeElement) {\r\n                        laneTimeElement.textContent = data.time.toFixed(3);\r\n                    }\r\n                } else if (data.type === 'lane-position') {\r\n                    // Update lane position display\r\n                    const lanePositionElement = document.getElementById(`lane-${data.lane}-position`);\r\n                    if (lanePositionElement) {\r\n                        lanePositionElement.textContent = data.position;\r\n                    }\r\n                }\r\n            };\r\n            \r\n            // Admin socket handling\r\n            adminSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data === 'heat-changed' || data === 'group-changed' || data === 'heat-rerun') {\r\n                    // Reload the page when heat or group changes\r\n                    window.location.reload();\r\n                }\r\n            };\r\n            \r\n            // Events socket handling\r\n            eventsSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.event === 'race_start') {\r\n                    // Race has started\r\n                    console.log('Race started!');\r\n                    // Update UI or play sound if needed\r\n                } else if (data.event === 'lane_finish') {\r\n                    // A lane has finished\r\n                    console.log(`Lane ${data.lane} finished with time ${data.time}`);\r\n                    \r\n                    // Update the lane time and position in the UI\r\n                    const laneTimeElement = document.getElementById(`lane-${data.lane}-time`);\r\n                    if (laneTimeElement) {\r\n                        laneTimeElement.textContent = data.time.toFixed(3);\r\n                    }\r\n                    \r\n                    const lanePositionElement = document.getElementById(`lane-${data.lane}-position`);\r\n                    if (lanePositionElement) {\r\n                        lanePositionElement.textContent = data.position;\r\n                    }\r\n                } else if (data.event === 'race_end') {\r\n                    // Race has ended\r\n                    console.log('Race ended!');\r\n                    \r\n                    // Save the heat results\r\n                    saveHeatResults();\r\n                }\r\n            };\r\n            \r\n            // Function to reset the timer\r\n            function resetTimer() {\r\n                fetch('/api/timer/reset', { method: 'POST' })\r\n                    .then(response => {\r\n                        if (!response.ok) {\r\n                            console.error('Failed to reset timer');\r\n                        }\r\n                    })\r\n                    .catch(error => {\r\n                        console.error('Error:', error);\r\n                    });\r\n            }\r\n            \r\n            // Function to force end the current heat\r\n            function forceEndHeat() {\r\n                fetch('/api/timer/force-end', { method: 'POST' })\r\n                    .then(response => {\r\n                        if (!response.ok) {\r\n                            console.error('Failed to force end heat');\r\n                        }\r\n                    })\r\n                    .catch(error => {\r\n                        console.error('Error:', error);\r\n                    });\r\n            }\r\n            \r\n            // Function to save heat results\r\n            function saveHeatResults() {\r\n                // Get lane times and positions from the UI\r\n                const lanes = [1, 2, 3, 4];\r\n                const results = {\r\n                    group_id: parseInt(document.getElementById('group-select').value),\r\n                    heat_number: parseInt('{ strconv.Itoa(currentHeatNum) }'),\r\n                };\r\n                \r\n                lanes.forEach(lane => {\r\n                    const timeElement = document.getElementById(`lane-${lane}-time`);\r\n                    const positionElement = document.getElementById(`lane-${lane}-position`);\r\n                    \r\n                    if (timeElement && positionElement) {\r\n                        const timeText = timeElement.textContent.trim();\r\n                        const positionText = positionElement.textContent.trim();\r\n                        \r\n                        results[`lane${lane}_time`] = timeText !== '--.-' ? parseFloat(timeText) : 0;\r\n                        results[`lane${lane}_position`] = positionText !== '-' ? parseInt(positionText) : 0;\r\n                    }\r\n                });\r\n                \r\n                // Save results to the server\r\n                fetch('/api/race/save-result', {\r\n                    method: 'POST',\r\n                    headers: {\r\n                        'Content-Type': 'application/json',\r\n                    },\r\n                    body: JSON.stringify(results),\r\n                })\r\n                .then(response => {\r\n                    if (!response.ok) {\r\n                        console.error('Failed to save heat results');\r\n                    }\r\n                })\r\n                .catch(error => {\r\n                    console.error('Error:', error);\r\n                });\r\n            }\r\n        </script>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</tbody></table></div></div></div></div></div></div><script>\r\n            // WebSocket connections\r\n            const timerSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/timer`);\r\n            const adminSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/admin`);\r\n            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/events`);\r\n            \r\n            const timerDisplay = document.getElementById('timer');\r\n            const statusIndicator = document.getElementById('status-indicator');\r\n            const gateStatus = document.getElementById('gate-status');\r\n            const gateStatusText = document.getElementById('gate-status-text');\r\n            \r\n            // Timer socket handling\r\n            timerSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.type === 'time') {\r\n                    timerDisplay.textContent = data.time.toFixed(3);\r\n                } else if (data.type === 'status') {\r\n                    statusIndicator.textContent = data.status;\r\n                    \r\n                    // Update status indicator color\r\n                    statusIndicator.className = 'badge mb-3 ';\r\n                    if (data.status === 'Ready') {\r\n                        statusIndicator.className += 'bg-secondary';\r\n                    } else if (data.status === 'Running') {\r\n                        statusIndicator.className += 'bg-success';\r\n                    } else if (data.status === 'Finished') {\r\n                        statusIndicator.className += 'bg-primary';\r\n                        \r\n                        // Auto-save results when race finishes\r\n                        saveHeatResults();\r\n                    }\r\n                } else if (data.type === 'gate') {\r\n                    gateStatusText.textContent = data.status;\r\n                    \r\n                    // Update gate status color\r\n                    gateStatus.className = 'alert ';\r\n                    if (data.status === 'Open') {\r\n                        gateStatus.className += 'alert-danger';\r\n                    } else if (data.status === 'Closed') {\r\n                        gateStatus.className += 'alert-success';\r\n                    } else {\r\n                        gateStatus.className += 'alert-secondary';\r\n                    }\r\n                } else if (data.type === 'lane-time') {\r\n                    // Update lane time display\r\n                    const laneTimeElement = document.getElementById(`lane-${data.lane}-time`);\r\n                    if (laneTimeElement) {\r\n                        laneTimeElement.textContent = data.time.toFixed(3);\r\n                    }\r\n                } else if (data.type === 'lane-position') {\r\n                    // Update lane position display\r\n                    const lanePositionElement = document.getElementById(`lane-${data.lane}-position`);\r\n                    if (lanePositionElement) {\r\n                        lanePositionElement.textContent = data.position;\r\n                    }\r\n                }\r\n            };\r\n            \r\n            // Admin socket handling\r\n            adminSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data === 'heat-changed' || data === 'group-changed' || data === 'heat-rerun') {\r\n                    // Reload the page when heat or group changes\r\n                    window.location.reload();\r\n                }\r\n            };\r\n            \r\n            // Events socket handling\r\n            eventsSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.event === 'race_start') {\r\n                    // Race has started\r\n                    console.log('Race started!');\r\n                    // Update UI or play sound if needed\r\n                } else if (data.event === 'lane_finish') {\r\n                    // A lane has finished\r\n                    console.log(`Lane ${data.lane} finished with time ${data.time}`);\r\n                    \r\n                    // Update the lane time and position in the UI\r\n                    const laneTimeElement = document.getElementById(`lane-${data.lane}-time`);\r\n                    if (laneTimeElement) {\r\n                        laneTimeElement.textContent = data.time.toFixed(3);\r\n                    }\r\n                    \r\n                    const lanePositionElement = document.getElementById(`lane-${data.lane}-position`);\r\n                    if (lanePositionElement) {\r\n                        lanePositionElement.textContent = data.position;\r\n                    }\r\n                } else if (data.event === 'race_end') {\r\n                    // Race has ended\r\n                    console.log('Race ended!');\r\n                    \r\n                    // Save the heat results\r\n                    saveHeatResults();\r\n                }\r\n            };\r\n            \r\n            // Function to reset the timer\r\n            function resetTimer() {\r\n                fetch('/api/timer/reset', { method: 'POST' })\r\n                    .then(response => {\r\n                        if (!response.ok) {\r\n                            console.error('Failed to reset timer');\r\n                        }\r\n                    })\r\n                    .catch(error => {\r\n                        console.error('Error:', error);\r\n                    });\r\n            }\r\n            \r\n            // Function to force end the current heat\r\n            function forceEndHeat() {\r\n                fetch('/api/timer/force-end', { method: 'POST' })\r\n                    .then(response => {\r\n                        if (!response.ok) {\r\n                            console.error('Failed to force end heat');\r\n                        }\r\n                    })\r\n                    .catch(error => {\r\n                        console.error('Error:', error);\r\n                    });\r\n            }\r\n            \r\n            // Function to save heat results\r\n            function saveHeatResults() {\r\n                // Get lane times and positions from the UI\r\n                const lanes = [1, 2, 3, 4];\r\n                const results = {\r\n                    group_id: parseInt(document.getElementById('group-select').value),\r\n                    heat_number: parseInt('{ strconv.Itoa(currentHeatNum) }'),\r\n                };\r\n                \r\n                lanes.forEach(lane => {\r\n                    const timeElement = document.getElementById(`lane-${lane}-time`);\r\n                    const positionElement = document.getElementById(`lane-${lane}-position`);\r\n                    \r\n                    if (timeElement && positionElement) {\r\n                        const timeText = timeElement.textContent.trim();\r\n                        const positionText = positionElement.textContent.trim();\r\n                        \r\n                        results[`lane${lane}_time`] = timeText !== '--.-' ? parseFloat(timeText) : 0;\r\n                        results[`lane${lane}_position`] = positionText !== '-' ? parseInt(positionText) : 0;\r\n                    }\r\n                });\r\n                \r\n                // Save results to the server\r\n                fetch('/api/race/save-result', {\r\n                    method: 'POST',\r\n                    headers: {\r\n                        'Content-Type': 'application/json',\r\n                    },\r\n                    body: JSON.stringify(results),\r\n                })\r\n                .then(response => {\r\n                    if (!response.ok) {\r\n                        console.error('Failed to save heat results');\r\n                    }\r\n                })\r\n                .catch(error => {\r\n                    console.error('Error:', error);\r\n                });\r\n            }\r\n        </script>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
diff --git a/web/templates/race_public.templ b/web/templates/race_public.templ
index 2e5fd49..f9d6e14 100644
--- a/web/templates/race_public.templ
+++ b/web/templates/race_public.templ
@@ -110,7 +110,7 @@ templ RacePublic(currentGroup models.Group, heats []models.Heat, racers []models
             };
             
             // Events WebSocket for race events
-            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/events`);
+            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/events`);
             
             eventsSocket.onmessage = function(event) {
                 const data = JSON.parse(event.data);
diff --git a/web/templates/race_public_templ.go b/web/templates/race_public_templ.go
index d3957b6..7101424 100644
--- a/web/templates/race_public_templ.go
+++ b/web/templates/race_public_templ.go
@@ -125,7 +125,7 @@ func RacePublic(currentGroup models.Group, heats []models.Heat, racers []models.
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</div></div></div></div></div><script>\r\n            // WebSocket connection for timer updates\r\n            const timerSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/timer`);\r\n            const timerDisplay = document.getElementById('timer');\r\n            const statusIndicator = document.getElementById('status-indicator');\r\n            \r\n            timerSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.type === 'time') {\r\n                    timerDisplay.textContent = data.time.toFixed(3);\r\n                } else if (data.type === 'status') {\r\n                    statusIndicator.textContent = data.status;\r\n                    \r\n                    // Update status indicator color\r\n                    statusIndicator.className = 'badge ';\r\n                    if (data.status === 'Ready') {\r\n                        statusIndicator.className += 'bg-secondary';\r\n                    } else if (data.status === 'Running') {\r\n                        statusIndicator.className += 'bg-success';\r\n                    } else if (data.status === 'Finished') {\r\n                        statusIndicator.className += 'bg-primary';\r\n                    }\r\n                } else if (data.type === 'lane-time') {\r\n                    // Update lane time display\r\n                    const laneTimeElement = document.getElementById(`lane-${data.lane}-time`);\r\n                    if (laneTimeElement) {\r\n                        laneTimeElement.textContent = data.time.toFixed(3);\r\n                    }\r\n                } else if (data.type === 'lane-position') {\r\n                    // Update lane position display\r\n                    const lanePositionElement = document.getElementById(`lane-${data.lane}-position`);\r\n                    if (lanePositionElement) {\r\n                        lanePositionElement.textContent = data.position;\r\n                    }\r\n                } else if (data.type === 'reload') {\r\n                    // Reload the page when heat changes\r\n                    window.location.reload();\r\n                }\r\n            };\r\n            \r\n            // Events WebSocket for race events\r\n            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/events`);\r\n            \r\n            eventsSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.event === 'race_start') {\r\n                    // Race has started\r\n                    console.log('Race started!');\r\n                    // You could add visual effects or sounds here\r\n                } else if (data.event === 'lane_finish') {\r\n                    // A lane has finished\r\n                    console.log(`Lane ${data.lane} finished with time ${data.time}`);\r\n                    // You could add visual effects or sounds here\r\n                } else if (data.event === 'race_end') {\r\n                    // Race has ended\r\n                    console.log('Race ended!');\r\n                    // You could add visual effects or sounds here\r\n                    \r\n                    // Reload the page after a short delay to show final results\r\n                    setTimeout(() => {\r\n                        window.location.reload();\r\n                    }, 3000);\r\n                }\r\n            };\r\n            \r\n            // Auto-refresh the page every 30 seconds to keep data current\r\n            setTimeout(() => {\r\n                window.location.reload();\r\n            }, 30000);\r\n        </script>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</div></div></div></div></div><script>\r\n            // WebSocket connection for timer updates\r\n            const timerSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/timer`);\r\n            const timerDisplay = document.getElementById('timer');\r\n            const statusIndicator = document.getElementById('status-indicator');\r\n            \r\n            timerSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.type === 'time') {\r\n                    timerDisplay.textContent = data.time.toFixed(3);\r\n                } else if (data.type === 'status') {\r\n                    statusIndicator.textContent = data.status;\r\n                    \r\n                    // Update status indicator color\r\n                    statusIndicator.className = 'badge ';\r\n                    if (data.status === 'Ready') {\r\n                        statusIndicator.className += 'bg-secondary';\r\n                    } else if (data.status === 'Running') {\r\n                        statusIndicator.className += 'bg-success';\r\n                    } else if (data.status === 'Finished') {\r\n                        statusIndicator.className += 'bg-primary';\r\n                    }\r\n                } else if (data.type === 'lane-time') {\r\n                    // Update lane time display\r\n                    const laneTimeElement = document.getElementById(`lane-${data.lane}-time`);\r\n                    if (laneTimeElement) {\r\n                        laneTimeElement.textContent = data.time.toFixed(3);\r\n                    }\r\n                } else if (data.type === 'lane-position') {\r\n                    // Update lane position display\r\n                    const lanePositionElement = document.getElementById(`lane-${data.lane}-position`);\r\n                    if (lanePositionElement) {\r\n                        lanePositionElement.textContent = data.position;\r\n                    }\r\n                } else if (data.type === 'reload') {\r\n                    // Reload the page when heat changes\r\n                    window.location.reload();\r\n                }\r\n            };\r\n            \r\n            // Events WebSocket for race events\r\n            const eventsSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/events`);\r\n            \r\n            eventsSocket.onmessage = function(event) {\r\n                const data = JSON.parse(event.data);\r\n                \r\n                if (data.event === 'race_start') {\r\n                    // Race has started\r\n                    console.log('Race started!');\r\n                    // You could add visual effects or sounds here\r\n                } else if (data.event === 'lane_finish') {\r\n                    // A lane has finished\r\n                    console.log(`Lane ${data.lane} finished with time ${data.time}`);\r\n                    // You could add visual effects or sounds here\r\n                } else if (data.event === 'race_end') {\r\n                    // Race has ended\r\n                    console.log('Race ended!');\r\n                    // You could add visual effects or sounds here\r\n                    \r\n                    // Reload the page after a short delay to show final results\r\n                    setTimeout(() => {\r\n                        window.location.reload();\r\n                    }, 3000);\r\n                }\r\n            };\r\n            \r\n            // Auto-refresh the page every 30 seconds to keep data current\r\n            setTimeout(() => {\r\n                window.location.reload();\r\n            }, 30000);\r\n        </script>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}