diff --git a/web/server.go b/web/server.go
index a6c8584..cde9b1b 100644
--- a/web/server.go
+++ b/web/server.go
@@ -1054,32 +1054,27 @@ func (s *Server) handleRaceManage() http.HandlerFunc {
 			return
 		}
 
-		// Get heats for the group
-		heats, err := s.db.GetHeats(currentGroup.ID)
+		// Get heat results
+		results, err := s.db.GetHeatResults(currentGroup.ID)
 		if err != nil {
-			s.logger.Error("Failed to get heats", "error", err)
-			http.Error(w, "Failed to get heats", http.StatusInternalServerError)
+			s.logger.Error("Failed to get heat results", "error", err)
+			http.Error(w, "Failed to get heat results", http.StatusInternalServerError)
 			return
 		}
 
-		// Get racers for the group
-		racers, err := s.db.GetRacersByGroup(currentGroup.ID)
+		// Get heats for the group
+		heatData, err := s.db.GetHeatData(currentGroup.ID, currentHeatNum)
 		if err != nil {
-			s.logger.Error("Failed to get racers", "error", err)
-			http.Error(w, "Failed to get racers", http.StatusInternalServerError)
+			s.logger.Error("Failed to get heats", "error", err)
+			http.Error(w, "Failed to get heats", http.StatusInternalServerError)
 			return
 		}
 
-		// Get heat results
-		results, err := s.db.GetHeatResults(currentGroup.ID)
-		if err != nil {
-			s.logger.Error("Failed to get heat results", "error", err)
-			http.Error(w, "Failed to get heat results", http.StatusInternalServerError)
-			return
-		}
+		// Get next heat data
+		nextHeatData, _ := s.db.GetHeatData(currentGroup.ID, currentHeatNum+1)
 
 		// Render template
-		component := templates.RaceManage(groups, currentGroup, heats, racers, currentHeatNum, results)
+		component := templates.RaceManage(heatData, nextHeatData, groups, results)
 		if err := component.Render(r.Context(), w); err != nil {
 			s.logger.Error("Failed to render race manage template", "error", err)
 			http.Error(w, "Failed to render page", http.StatusInternalServerError)
diff --git a/web/templates/race_manage.templ b/web/templates/race_manage.templ
index 85ac290..0078dbf 100644
--- a/web/templates/race_manage.templ
+++ b/web/templates/race_manage.templ
@@ -7,7 +7,7 @@ import (
 )
 
 // RaceManage renders the race management view
-templ RaceManage(groups []models.Group, currentGroup models.Group, heats []models.Heat, racers []models.Racer, currentHeatNum int, results []models.HeatResult) {
+templ RaceManage(heatData *models.HeatData, nextHeat *models.HeatData, groups []models.Group, results []models.HeatResult) {
     @Layout("Race Management") {
         <div class="container-fluid mt-3">
             <div class="row mb-4">
@@ -21,7 +21,7 @@ templ RaceManage(groups []models.Group, currentGroup models.Group, heats []model
                                 <label for="group-select" class="form-label">Racing Group</label>
                                 <select id="group-select" class="form-select" hx-post="/api/race/set-group" hx-trigger="change" hx-swap="none">
                                     for _, group := range groups {
-                                        <option value={ strconv.FormatInt(group.ID, 10) } selected?={ group.ID == currentGroup.ID }>
+                                        <option value={ strconv.FormatInt(group.ID, 10) } selected?={ group.ID == heatData.Group.ID }>
                                             { group.Name }
                                         </option>
                                     }
@@ -29,12 +29,12 @@ templ RaceManage(groups []models.Group, currentGroup models.Group, heats []model
                             </div>
                             
                             <div class="mb-3">
-                                <h5>Current Heat: { strconv.Itoa(currentHeatNum) } of { strconv.Itoa(len(heats)) }</h5>
+                                <h5>Current Heat: { strconv.Itoa(heatData.HeatNumber) } of { strconv.Itoa(heatData.TotalHeats) }</h5>
                                 <div class="btn-group" role="group">
-                                    <button id="prev-heat-btn" class="btn btn-secondary" hx-post="/api/race/previous-heat" hx-swap="none" disabled?={ currentHeatNum <= 1 }>
+                                    <button id="prev-heat-btn" class="btn btn-secondary" hx-post="/api/race/previous-heat" hx-swap="none" disabled?={ heatData.HeatNumber <= 1 }>
                                         <i class="bi bi-arrow-left"></i> Previous Heat
                                     </button>
-                                    <button id="next-heat-btn" class="btn btn-secondary" hx-post="/api/race/next-heat" hx-swap="none" disabled?={ currentHeatNum >= len(heats) }>
+                                    <button id="next-heat-btn" class="btn btn-secondary" hx-post="/api/race/next-heat" hx-swap="none" disabled?={ heatData.HeatNumber >= heatData.TotalHeats }>
                                         Next Heat <i class="bi bi-arrow-right"></i>
                                     </button>
                                 </div>
@@ -102,273 +102,64 @@ templ RaceManage(groups []models.Group, currentGroup models.Group, heats []model
             </div>
             
             <!-- Current Heat Display -->
-            @currentHeatDisplay(heats, racers, currentHeatNum, results)
+            @currentHeatDisplay(heatData)
             
             <!-- Next Heat Preview -->
-            if currentHeatNum < len(heats) {
+            if nextHeat != nil {
                 <div class="card mb-4">
                     <div class="card-header bg-secondary text-white">
-                        <h4 class="mb-0">Next Heat: { strconv.Itoa(currentHeatNum + 1) }</h4>
+                        <h4 class="mb-0">Next Heat: { strconv.Itoa(nextHeat.HeatNumber) }</h4>
                     </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table">
-                                <thead>
-                                    <tr>
-                                        <th>Lane</th>
-                                        <th>Racer</th>
-                                        <th>Car #</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    for _, heat := range heats {
-                                        if heat.HeatNum == currentHeatNum + 1 {
-                                            if heat.Lane1ID != nil {
-                                                @nextHeatRacer(1, *heat.Lane1ID, racers)
-                                            }
-                                            if heat.Lane2ID != nil {
-                                                @nextHeatRacer(2, *heat.Lane2ID, racers)
-                                            }
-                                            if heat.Lane3ID != nil {
-                                                @nextHeatRacer(3, *heat.Lane3ID, racers)
-                                            }
-                                            if heat.Lane4ID != nil {
-                                                @nextHeatRacer(4, *heat.Lane4ID, racers)
-                                            }
-                                        }
-                                    }
-                                </tbody>
-                            </table>
-                        </div>
+                    <div class="table-responsive">
+                        <table class="table table-striped">
+                            <thead>
+                                <tr>
+                                    <th>Lane</th>
+                                    <th>Racer</th>
+                                    <th>Car #</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                if nextHeat.Lane1 != nil {
+                                    @raceNextHeatRow(*nextHeat.Lane1)
+                                }
+                                if nextHeat.Lane2 != nil {
+                                    @raceNextHeatRow(*nextHeat.Lane2)
+                                }
+                                if nextHeat.Lane3 != nil {
+                                    @raceNextHeatRow(*nextHeat.Lane3)
+                                }
+                                if nextHeat.Lane4 != nil {
+                                    @raceNextHeatRow(*nextHeat.Lane4)
+                                }
+                            </tbody>
+                        </table>
                     </div>
                 </div>
             }
         </div>
-        
-        <script>
-            // Set up SSE connection
-            console.log("Setting up SSE connection...");
-            
-            const eventSource = new EventSource('/api/events');
-            
-            eventSource.onopen = function() {
-                console.log("SSE connection opened");
-            };
-            
-            eventSource.onerror = function(error) {
-                console.error("SSE connection error:", error);
-            };
-            
-            eventSource.addEventListener('debug', function(event) {
-                console.log("Debug event received:", event.data);
-            });
-            
-            eventSource.addEventListener('lane-finish', function(event) {
-                console.log("Lane finish event received:", event.data);
-                try {
-                    const laneFinishData = JSON.parse(event.data);
-                    const laneTimeElement = document.getElementById(`lane-${laneFinishData.lane}-time`);
-                    if (laneTimeElement) {
-                        laneTimeElement.textContent = laneFinishData.time.toFixed(4);
-                    }
-                    
-                    const lanePositionElement = document.getElementById(`lane-${laneFinishData.lane}-position`);
-                    if (lanePositionElement) {
-                        lanePositionElement.textContent = laneFinishData.place;
-                    }
-                } catch (error) {
-                    console.error("Error processing lane finish event:", error);
-                }
-            });
-            
-            eventSource.addEventListener('status', function(event) {
-                console.log("Status event received:", event.data);
-                try {
-                    const statusData = JSON.parse(event.data);
-                    let statusText = 'Unknown';
-                    let statusClass = 'bg-secondary';
-                    
-                    if (statusData.status === 'idle') {
-                        statusText = 'Ready';
-                        statusClass = 'bg-primary';
-                        
-                        // Reset all times and positions
-                        document.querySelectorAll('[id^="lane-"][id$="-time"]').forEach(el => {
-                            el.textContent = '--.-';
-                        });
-                        
-                        document.querySelectorAll('[id^="lane-"][id$="-position"]').forEach(el => {
-                            el.textContent = '-';
-                        });
-                        
-                    } else if (statusData.status === 'running') {
-                        statusText = 'Race Running';
-                        statusClass = 'bg-success';
-                    } else if (statusData.status === 'finished') {
-                        statusText = 'Race Complete';
-                        statusClass = 'bg-info';
-                        
-                        // Save heat results
-                        saveHeatResults();
-                    }
-                    
-                    const statusIndicator = document.getElementById('status-indicator');
-                    if (statusIndicator) {
-                        statusIndicator.textContent = statusText;
-                        statusIndicator.className = `badge mb-3 ${statusClass}`;
-                    }
-                    
-                    const timerDisplay = document.getElementById('timer');
-                    if (timerDisplay && statusData.status === 'idle') {
-                        timerDisplay.textContent = '0.000';
-                    }
-                } catch (error) {
-                    console.error("Error processing status event:", error);
-                }
-            });
-            
-            // Admin socket for admin-specific events
-            const adminSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/admin`);
-            
-            adminSocket.onmessage = function(event) {
-                const data = JSON.parse(event.data);
-                
-                if (data === 'heat-changed' || data === 'group-changed' || data === 'heat-rerun') {
-                    // Reload the page when heat or group changes
-                    window.location.reload();
-                }
-            };
-            
-            // Add event listener for admin events
-            eventSource.addEventListener('admin', function(event) {
-                console.log("Admin event received:", event.data);
-                try {
-                    const adminData = JSON.parse(event.data);
-                    
-                    if (adminData.event === 'heat-changed' || 
-                        adminData.event === 'group-changed' || 
-                        adminData.event === 'heat-rerun') {
-                        // Reload the page when heat or group changes
-                        window.location.reload();
-                    }
-                } catch (error) {
-                    console.error("Error processing admin event:", error);
-                }
-            });
-            
-            // Function to reset the timer
-            function resetTimer() {
-                fetch('/api/reset', { method: 'POST' })
-                    .then(response => {
-                        if (!response.ok) {
-                            console.error('Failed to reset timer');
-                        }
-                    })
-                    .catch(error => {
-                        console.error('Error:', error);
-                    });
-            }
-            
-            // Function to force end the current heat
-            function forceEndHeat() {
-                fetch('/api/force-end', { method: 'POST' })
-                    .then(response => {
-                        if (!response.ok) {
-                            console.error('Failed to force end heat');
-                        }
-                    })
-                    .catch(error => {
-                        console.error('Error:', error);
-                    });
-            }
-            
-            // Function to save heat results
-            function saveHeatResults() {
-                // Get lane times and positions from the UI
-                const lanes = [1, 2, 3, 4];
-                const results = {
-                    group_id: parseInt(document.getElementById('group-select').value),
-                    heat_number: parseInt('{ strconv.Itoa(currentHeatNum) }'),
-                };
-                
-                lanes.forEach(lane => {
-                    const timeElement = document.getElementById(`lane-${lane}-time`);
-                    const positionElement = document.getElementById(`lane-${lane}-position`);
-                    
-                    if (timeElement && positionElement) {
-                        const timeText = timeElement.textContent.trim();
-                        const positionText = positionElement.textContent.trim();
-                        
-                        results[`lane${lane}_time`] = timeText !== '--.-' ? parseFloat(timeText) : 0;
-                        results[`lane${lane}_position`] = positionText !== '-' ? parseInt(positionText) : 0;
-                    }
-                });
-                
-                // Save results to the server
-                fetch('/api/race/save-result', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify(results),
-                })
-                .then(response => {
-                    if (!response.ok) {
-                        console.error('Failed to save heat results');
-                    }
-                })
-                .catch(error => {
-                    console.error('Error:', error);
-                });
-            }
-            
-            function getOrdinal(n) {
-                const s = ["th", "st", "nd", "rd"];
-                const v = n % 100;
-                return n + (s[(v-20)%10] || s[v] || s[0]);
-            }
-        </script>
     }
 }
 
 // Find the current heat
-templ currentHeatDisplay(heats []models.Heat, racers []models.Racer, currentHeatNum int, results []models.HeatResult) {
-    {{
-    // Find the current heat
-    var currentHeat models.Heat
-    for _, heat := range heats {
-        if heat.HeatNum == currentHeatNum {
-            currentHeat = heat
-            break
-        }
-    }
-    
-    // Find the current result
-    var currentResult *models.HeatResult
-    for _, result := range results {
-        if result.HeatNumber == currentHeatNum {
-            currentResult = &result
-            break
-        }
-    }
-    }}
+templ currentHeatDisplay(heatData *models.HeatData) {
     <div class="card mb-4">
         <div class="card-header bg-primary text-white">
-            <h4 class="mb-0">Current Heat: { strconv.Itoa(currentHeatNum) }</h4>
+            <h4 class="mb-0">Current Heat: { strconv.Itoa(heatData.HeatNumber) }</h4>
         </div>
         <div class="card-body">
             <div class="row">
-                if currentHeat.Lane1ID != nil {
-                    @raceLaneInfo(1, *currentHeat.Lane1ID, racers, currentResult)
+                if heatData.Lane1 != nil {
+                    @raceLaneInfo(*heatData.Lane1)
                 }
-                if currentHeat.Lane2ID != nil {
-                    @raceLaneInfo(2, *currentHeat.Lane2ID, racers, currentResult)
+                if heatData.Lane2 != nil {
+                    @raceLaneInfo(*heatData.Lane2)
                 }
-                if currentHeat.Lane3ID != nil {
-                    @raceLaneInfo(3, *currentHeat.Lane3ID, racers, currentResult)
+                if heatData.Lane3 != nil {
+                    @raceLaneInfo(*heatData.Lane3)
                 }
-                if currentHeat.Lane4ID != nil {
-                    @raceLaneInfo(4, *currentHeat.Lane4ID, racers, currentResult)
+                if heatData.Lane4 != nil {
+                    @raceLaneInfo(*heatData.Lane4)
                 }
             </div>
         </div>
@@ -376,51 +167,21 @@ templ currentHeatDisplay(heats []models.Heat, racers []models.Racer, currentHeat
 }
 
 // Helper template for displaying a lane in the race manager
-templ raceLaneInfo(lane int, racerID int64, racers []models.Racer, result *models.HeatResult) {
-    {{
-    // Find the racer
-    var racer models.Racer
-    for _, r := range racers {
-        if r.ID == racerID {
-            racer = r
-            break
-        }
-    }
-    
-    // Get time and position from result if available
-    var timeStr string = "--.-"
-    var positionStr string = "-"
-    
-    if result != nil {
-        if lane == 1 && result.Lane1Time > 0 {
-            timeStr = fmt.Sprintf("%.4f", result.Lane1Time)
-            positionStr = strconv.Itoa(result.Lane1Position)
-        } else if lane == 2 && result.Lane2Time > 0 {
-            timeStr = fmt.Sprintf("%.4f", result.Lane2Time)
-            positionStr = strconv.Itoa(result.Lane2Position)
-        } else if lane == 3 && result.Lane3Time > 0 {
-            timeStr = fmt.Sprintf("%.4f", result.Lane3Time)
-            positionStr = strconv.Itoa(result.Lane3Position)
-        } else if lane == 4 && result.Lane4Time > 0 {
-            timeStr = fmt.Sprintf("%.4f", result.Lane4Time)
-            positionStr = strconv.Itoa(result.Lane4Position)
-        }
-    }
-    }}
+templ raceLaneInfo(laneData models.LaneData) {
     <div class="col-md-3 mb-3">
         <div class="card h-100">
             <div class="card-header bg-secondary text-white">
-                <h5 class="mb-0">Lane { strconv.Itoa(lane) }</h5>
+                <h5 class="mb-0">Lane { strconv.Itoa(laneData.Lane) }</h5>
             </div>
             <div class="card-body">
-                <h5 class="card-title">{ racer.FirstName } { racer.LastName }</h5>
-                <p class="card-text">Car #: { racer.CarNumber }</p>
+                <h5 class="card-title">{ laneData.Name }</h5>
+                <p class="card-text">Car #: { laneData.CarNum }</p>
                 <div class="d-flex justify-content-between">
                     <div>
-                        <strong>Time:</strong> <span id="lane-{strconv.Itoa(lane)}-time">{ timeStr }</span>
+                        <strong>Time:</strong> <span>{ fmt.Sprintf("%.3f", laneData.Time) }</span>
                     </div>
                     <div>
-                        <strong>Position:</strong> <span id="lane-{strconv.Itoa(lane)}-position">{ positionStr }</span>
+                        <strong>Position:</strong> <span>{ strconv.Itoa(laneData.Place) }</span>
                     </div>
                 </div>
             </div>
@@ -429,20 +190,10 @@ templ raceLaneInfo(lane int, racerID int64, racers []models.Racer, result *model
 }
 
 // Helper template for displaying a racer in the next heat
-templ nextHeatRacer(lane int, racerID int64, racers []models.Racer) {
-    {{
-    // Find racer
-    var racer models.Racer
-    for _, r := range racers {
-        if r.ID == racerID {
-            racer = r
-            break
-        }
-    }
-    }}
+templ nextHeatRacer(laneData models.LaneData) {
     <tr>
-        <td>{ strconv.Itoa(lane) }</td>
-        <td>{ racer.FirstName } { racer.LastName }</td>
-        <td>{ racer.CarNumber }</td>
+        <td>{ strconv.Itoa(laneData.Lane) }</td>
+        <td>{ laneData.Name }</td>
+        <td>{ laneData.CarNum }</td>
     </tr>
 } 
\ No newline at end of file
diff --git a/web/templates/race_manage_templ.go b/web/templates/race_manage_templ.go
index 7c1b8bf..f1d78ef 100644
--- a/web/templates/race_manage_templ.go
+++ b/web/templates/race_manage_templ.go
@@ -15,7 +15,7 @@ import (
 )
 
 // RaceManage renders the race management view
-func RaceManage(groups []models.Group, currentGroup models.Group, heats []models.Heat, racers []models.Racer, currentHeatNum int, results []models.HeatResult) templ.Component {
+func RaceManage(heatData *models.HeatData, nextHeat *models.HeatData, groups []models.Group, results []models.HeatResult) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -70,7 +70,7 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				if group.ID == currentGroup.ID {
+				if group.ID == heatData.Group.ID {
 					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, " selected")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
@@ -99,9 +99,9 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var5 string
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(currentHeatNum))
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(heatData.HeatNumber))
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 32, Col: 80}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 32, Col: 85}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 			if templ_7745c5c3_Err != nil {
@@ -112,9 +112,9 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(len(heats)))
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(heatData.TotalHeats))
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 32, Col: 112}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 32, Col: 126}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 			if templ_7745c5c3_Err != nil {
@@ -124,7 +124,7 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			if currentHeatNum <= 1 {
+			if heatData.HeatNumber <= 1 {
 				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, " disabled")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
@@ -134,7 +134,7 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			if currentHeatNum >= len(heats) {
+			if heatData.HeatNumber >= heatData.TotalHeats {
 				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, " disabled")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
@@ -289,7 +289,7 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = currentHeatDisplay(heats, racers, currentHeatNum, results).Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = currentHeatDisplay(heatData).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -297,70 +297,54 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			if currentHeatNum < len(heats) {
+			if nextHeat != nil {
 				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<div class=\"card mb-4\"><div class=\"card-header bg-secondary text-white\"><h4 class=\"mb-0\">Next Heat: ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var18 string
-				templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(currentHeatNum + 1))
+				templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(nextHeat.HeatNumber))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 111, Col: 86}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 111, Col: 87}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</h4></div><div class=\"card-body\"><div class=\"table-responsive\"><table class=\"table\"><thead><tr><th>Lane</th><th>Racer</th><th>Car #</th></tr></thead> <tbody>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				for _, heat := range heats {
-					if heat.HeatNum == currentHeatNum+1 {
-						if heat.Lane1ID != nil {
-							templ_7745c5c3_Err = nextHeatRacer(1, *heat.Lane1ID, racers).Render(ctx, templ_7745c5c3_Buffer)
-							if templ_7745c5c3_Err != nil {
-								return templ_7745c5c3_Err
-							}
-						}
-						templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, " ")
-						if templ_7745c5c3_Err != nil {
-							return templ_7745c5c3_Err
-						}
-						if heat.Lane2ID != nil {
-							templ_7745c5c3_Err = nextHeatRacer(2, *heat.Lane2ID, racers).Render(ctx, templ_7745c5c3_Buffer)
-							if templ_7745c5c3_Err != nil {
-								return templ_7745c5c3_Err
-							}
-						}
-						templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, " ")
-						if templ_7745c5c3_Err != nil {
-							return templ_7745c5c3_Err
-						}
-						if heat.Lane3ID != nil {
-							templ_7745c5c3_Err = nextHeatRacer(3, *heat.Lane3ID, racers).Render(ctx, templ_7745c5c3_Buffer)
-							if templ_7745c5c3_Err != nil {
-								return templ_7745c5c3_Err
-							}
-						}
-						templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, " ")
-						if templ_7745c5c3_Err != nil {
-							return templ_7745c5c3_Err
-						}
-						if heat.Lane4ID != nil {
-							templ_7745c5c3_Err = nextHeatRacer(4, *heat.Lane4ID, racers).Render(ctx, templ_7745c5c3_Buffer)
-							if templ_7745c5c3_Err != nil {
-								return templ_7745c5c3_Err
-							}
-						}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</h4></div><div class=\"table-responsive\"><table class=\"table table-striped\"><thead><tr><th>Lane</th><th>Racer</th><th>Car #</th></tr></thead> <tbody>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				if nextHeat.Lane1 != nil {
+					templ_7745c5c3_Err = raceNextHeatRow(*nextHeat.Lane1).Render(ctx, templ_7745c5c3_Buffer)
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
 					}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</tbody></table></div></div></div>")
+				if nextHeat.Lane2 != nil {
+					templ_7745c5c3_Err = raceNextHeatRow(*nextHeat.Lane2).Render(ctx, templ_7745c5c3_Buffer)
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				if nextHeat.Lane3 != nil {
+					templ_7745c5c3_Err = raceNextHeatRow(*nextHeat.Lane3).Render(ctx, templ_7745c5c3_Buffer)
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				if nextHeat.Lane4 != nil {
+					templ_7745c5c3_Err = raceNextHeatRow(*nextHeat.Lane4).Render(ctx, templ_7745c5c3_Buffer)
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</tbody></table></div></div>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "</div><script>\r\n            // Set up SSE connection\r\n            console.log(\"Setting up SSE connection...\");\r\n            \r\n            const eventSource = new EventSource('/api/events');\r\n            \r\n            eventSource.onopen = function() {\r\n                console.log(\"SSE connection opened\");\r\n            };\r\n            \r\n            eventSource.onerror = function(error) {\r\n                console.error(\"SSE connection error:\", error);\r\n            };\r\n            \r\n            eventSource.addEventListener('debug', function(event) {\r\n                console.log(\"Debug event received:\", event.data);\r\n            });\r\n            \r\n            eventSource.addEventListener('lane-finish', function(event) {\r\n                console.log(\"Lane finish event received:\", event.data);\r\n                try {\r\n                    const laneFinishData = JSON.parse(event.data);\r\n                    const laneTimeElement = document.getElementById(`lane-${laneFinishData.lane}-time`);\r\n                    if (laneTimeElement) {\r\n                        laneTimeElement.textContent = laneFinishData.time.toFixed(4);\r\n                    }\r\n                    \r\n                    const lanePositionElement = document.getElementById(`lane-${laneFinishData.lane}-position`);\r\n                    if (lanePositionElement) {\r\n                        lanePositionElement.textContent = laneFinishData.place;\r\n                    }\r\n                } catch (error) {\r\n                    console.error(\"Error processing lane finish event:\", error);\r\n                }\r\n            });\r\n            \r\n            eventSource.addEventListener('status', function(event) {\r\n                console.log(\"Status event received:\", event.data);\r\n                try {\r\n                    const statusData = JSON.parse(event.data);\r\n                    let statusText = 'Unknown';\r\n                    let statusClass = 'bg-secondary';\r\n                    \r\n                    if (statusData.status === 'idle') {\r\n                        statusText = 'Ready';\r\n                        statusClass = 'bg-primary';\r\n                        \r\n                        // Reset all times and positions\r\n                        document.querySelectorAll('[id^=\"lane-\"][id$=\"-time\"]').forEach(el => {\r\n                            el.textContent = '--.-';\r\n                        });\r\n                        \r\n                        document.querySelectorAll('[id^=\"lane-\"][id$=\"-position\"]').forEach(el => {\r\n                            el.textContent = '-';\r\n                        });\r\n                        \r\n                    } else if (statusData.status === 'running') {\r\n                        statusText = 'Race Running';\r\n                        statusClass = 'bg-success';\r\n                    } else if (statusData.status === 'finished') {\r\n                        statusText = 'Race Complete';\r\n                        statusClass = 'bg-info';\r\n                        \r\n                        // Save heat results\r\n                        saveHeatResults();\r\n                    }\r\n                    \r\n                    const statusIndicator = document.getElementById('status-indicator');\r\n                    if (statusIndicator) {\r\n                        statusIndicator.textContent = statusText;\r\n                        statusIndicator.className = `badge mb-3 ${statusClass}`;\r\n                    }\r\n                    \r\n                    const timerDisplay = document.getElementById('timer');\r\n                    if (timerDisplay && statusData.status === 'idle') {\r\n                        timerDisplay.textContent = '0.000';\r\n                    }\r\n                } catch (error) {\r\n                    console.error(\"Error processing status event:\", error);\r\n                }\r\n            });\r\n            \r\n            // Admin socket for admin-specific events\r\n            const adminSocket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss:' : 'ws:'}//${window.location.host}/ws/admin`);\r\n            \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            // Add event listener for admin events\r\n            eventSource.addEventListener('admin', function(event) {\r\n                console.log(\"Admin event received:\", event.data);\r\n                try {\r\n                    const adminData = JSON.parse(event.data);\r\n                    \r\n                    if (adminData.event === 'heat-changed' || \r\n                        adminData.event === 'group-changed' || \r\n                        adminData.event === 'heat-rerun') {\r\n                        // Reload the page when heat or group changes\r\n                        window.location.reload();\r\n                    }\r\n                } catch (error) {\r\n                    console.error(\"Error processing admin event:\", error);\r\n                }\r\n            });\r\n            \r\n            // Function to reset the timer\r\n            function resetTimer() {\r\n                fetch('/api/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/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            \r\n            function getOrdinal(n) {\r\n                const s = [\"th\", \"st\", \"nd\", \"rd\"];\r\n                const v = n % 100;\r\n                return n + (s[(v-20)%10] || s[v] || s[0]);\r\n            }\r\n        </script>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -375,7 +359,7 @@ func RaceManage(groups []models.Group, currentGroup models.Group, heats []models
 }
 
 // Find the current heat
-func currentHeatDisplay(heats []models.Heat, racers []models.Racer, currentHeatNum int, results []models.HeatResult) templ.Component {
+func currentHeatDisplay(heatData *models.HeatData) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -396,66 +380,48 @@ func currentHeatDisplay(heats []models.Heat, racers []models.Racer, currentHeatN
 			templ_7745c5c3_Var19 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-
-		// Find the current heat
-		var currentHeat models.Heat
-		for _, heat := range heats {
-			if heat.HeatNum == currentHeatNum {
-				currentHeat = heat
-				break
-			}
-		}
-
-		// Find the current result
-		var currentResult *models.HeatResult
-		for _, result := range results {
-			if result.HeatNumber == currentHeatNum {
-				currentResult = &result
-				break
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"card mb-4\"><div class=\"card-header bg-primary text-white\"><h4 class=\"mb-0\">Current Heat: ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<div class=\"card mb-4\"><div class=\"card-header bg-primary text-white\"><h4 class=\"mb-0\">Current Heat: ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var20 string
-		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(currentHeatNum))
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(heatData.HeatNumber))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 357, Col: 73}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 148, Col: 78}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "</h4></div><div class=\"card-body\"><div class=\"row\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</h4></div><div class=\"card-body\"><div class=\"row\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if currentHeat.Lane1ID != nil {
-			templ_7745c5c3_Err = raceLaneInfo(1, *currentHeat.Lane1ID, racers, currentResult).Render(ctx, templ_7745c5c3_Buffer)
+		if heatData.Lane1 != nil {
+			templ_7745c5c3_Err = raceLaneInfo(*heatData.Lane1).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		if currentHeat.Lane2ID != nil {
-			templ_7745c5c3_Err = raceLaneInfo(2, *currentHeat.Lane2ID, racers, currentResult).Render(ctx, templ_7745c5c3_Buffer)
+		if heatData.Lane2 != nil {
+			templ_7745c5c3_Err = raceLaneInfo(*heatData.Lane2).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		if currentHeat.Lane3ID != nil {
-			templ_7745c5c3_Err = raceLaneInfo(3, *currentHeat.Lane3ID, racers, currentResult).Render(ctx, templ_7745c5c3_Buffer)
+		if heatData.Lane3 != nil {
+			templ_7745c5c3_Err = raceLaneInfo(*heatData.Lane3).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		if currentHeat.Lane4ID != nil {
-			templ_7745c5c3_Err = raceLaneInfo(4, *currentHeat.Lane4ID, racers, currentResult).Render(ctx, templ_7745c5c3_Buffer)
+		if heatData.Lane4 != nil {
+			templ_7745c5c3_Err = raceLaneInfo(*heatData.Lane4).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</div></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "</div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -464,7 +430,7 @@ func currentHeatDisplay(heats []models.Heat, racers []models.Racer, currentHeatN
 }
 
 // Helper template for displaying a lane in the race manager
-func raceLaneInfo(lane int, racerID int64, racers []models.Racer, result *models.HeatResult) templ.Component {
+func raceLaneInfo(laneData models.LaneData) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -485,114 +451,72 @@ func raceLaneInfo(lane int, racerID int64, racers []models.Racer, result *models
 			templ_7745c5c3_Var21 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-
-		// Find the racer
-		var racer models.Racer
-		for _, r := range racers {
-			if r.ID == racerID {
-				racer = r
-				break
-			}
-		}
-
-		// Get time and position from result if available
-		var timeStr string = "--.-"
-		var positionStr string = "-"
-
-		if result != nil {
-			if lane == 1 && result.Lane1Time > 0 {
-				timeStr = fmt.Sprintf("%.4f", result.Lane1Time)
-				positionStr = strconv.Itoa(result.Lane1Position)
-			} else if lane == 2 && result.Lane2Time > 0 {
-				timeStr = fmt.Sprintf("%.4f", result.Lane2Time)
-				positionStr = strconv.Itoa(result.Lane2Position)
-			} else if lane == 3 && result.Lane3Time > 0 {
-				timeStr = fmt.Sprintf("%.4f", result.Lane3Time)
-				positionStr = strconv.Itoa(result.Lane3Position)
-			} else if lane == 4 && result.Lane4Time > 0 {
-				timeStr = fmt.Sprintf("%.4f", result.Lane4Time)
-				positionStr = strconv.Itoa(result.Lane4Position)
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<div class=\"col-md-3 mb-3\"><div class=\"card h-100\"><div class=\"card-header bg-secondary text-white\"><h5 class=\"mb-0\">Lane ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"col-md-3 mb-3\"><div class=\"card h-100\"><div class=\"card-header bg-secondary text-white\"><h5 class=\"mb-0\">Lane ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(lane))
+		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(laneData.Lane))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 413, Col: 58}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 174, Col: 67}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "</h5></div><div class=\"card-body\"><h5 class=\"card-title\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "</h5></div><div class=\"card-body\"><h5 class=\"card-title\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(racer.FirstName)
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.Name)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 416, Col: 56}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 177, Col: 54}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, " ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</h5><p class=\"card-text\">Car #: ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var24 string
-		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(racer.LastName)
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.CarNum)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 416, Col: 75}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 178, Col: 61}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "</h5><p class=\"card-text\">Car #: ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "</p><div class=\"d-flex justify-content-between\"><div><strong>Time:</strong> <span>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var25 string
-		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(racer.CarNumber)
+		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.3f", laneData.Time))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 417, Col: 61}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 181, Col: 89}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</p><div class=\"d-flex justify-content-between\"><div><strong>Time:</strong> <span id=\"lane-{strconv.Itoa(lane)}-time\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "</span></div><div><strong>Position:</strong> <span>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var26 string
-		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(timeStr)
+		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(laneData.Place))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 420, Col: 98}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 184, Col: 87}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "</span></div><div><strong>Position:</strong> <span id=\"lane-{strconv.Itoa(lane)}-position\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var27 string
-		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(positionStr)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 423, Col: 110}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</span></div></div></div></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</span></div></div></div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -601,7 +525,7 @@ func raceLaneInfo(lane int, racerID int64, racers []models.Racer, result *models
 }
 
 // Helper template for displaying a racer in the next heat
-func nextHeatRacer(lane int, racerID int64, racers []models.Racer) templ.Component {
+func nextHeatRacer(laneData models.LaneData) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -617,73 +541,51 @@ func nextHeatRacer(lane int, racerID int64, racers []models.Racer) templ.Compone
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var28 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var28 == nil {
-			templ_7745c5c3_Var28 = templ.NopComponent
+		templ_7745c5c3_Var27 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var27 == nil {
+			templ_7745c5c3_Var27 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-
-		// Find racer
-		var racer models.Racer
-		for _, r := range racers {
-			if r.ID == racerID {
-				racer = r
-				break
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<tr><td>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var29 string
-		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(lane))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 444, Col: 32}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "</td><td>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "<tr><td>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var30 string
-		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(racer.FirstName)
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(laneData.Lane))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 445, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 195, Col: 41}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, " ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</td><td>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var31 string
-		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(racer.LastName)
+		var templ_7745c5c3_Var29 string
+		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.Name)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 445, Col: 48}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 196, Col: 27}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "</td><td>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "</td><td>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var32 string
-		templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(racer.CarNumber)
+		var templ_7745c5c3_Var30 string
+		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(laneData.CarNum)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 446, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 197, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "</td></tr>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</td></tr>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}