diff --git a/web/server.go b/web/server.go
index 617ac01..590b1a6 100644
--- a/web/server.go
+++ b/web/server.go
@@ -425,7 +425,7 @@ func (s *Server) broadcastRaceEvent(event derby.Event) {
 	switch event.Type {
 	case derby.EventRaceStart:
 		s.logger.Info("Broadcasting race start event")
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-success'>Race Running</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 text-center align-middle badge bg-success'>Race Running</div>\n\n")
 		heatGroup, _ := s.db.GetCurrentRacingGroup()
 		heatResult.GroupID = heatGroup.ID
 		heatResult.HeatNumber, _ = s.db.GetCurrentHeatNumber(heatGroup.ID)
@@ -455,7 +455,7 @@ func (s *Server) broadcastRaceEvent(event derby.Event) {
 
 	case derby.EventRaceComplete:
 		s.logger.Info("Broadcasting race complete event")
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-warning'>Race Complete</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 text-center align-middle badge bg-warning'>Race Complete</div>\n\n")
 		s.db.SaveHeatResult(heatResult)
 	}
 }
@@ -719,7 +719,7 @@ func (s *Server) handleReset() http.HandlerFunc {
 			return
 		}
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-warning'>Ready</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 text-center align-middle badge bg-warning'>Ready</div>\n\n")
 
 		w.Header().Set("Content-Type", "application/json")
 		w.Write([]byte(`{"status": "reset"}`))
@@ -1691,7 +1691,7 @@ func (s *Server) handleNextHeat() http.HandlerFunc {
 			Event: *heatData,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 text-center align-middle badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
@@ -1738,7 +1738,7 @@ func (s *Server) handlePreviousHeat() http.HandlerFunc {
 			Event: *heatData,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 text-center align-middle badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
@@ -1779,7 +1779,7 @@ func (s *Server) handleRerunHeat() http.HandlerFunc {
 			Event: *heatData,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 text-center align-middle badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
@@ -1821,7 +1821,7 @@ func (s *Server) handleSetRacingGroup() http.HandlerFunc {
 			Event: heatResults,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 text-center align-middle badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
diff --git a/web/templates/race_public.templ b/web/templates/race_public.templ
index a1458e3..a50a005 100644
--- a/web/templates/race_public.templ
+++ b/web/templates/race_public.templ
@@ -21,7 +21,7 @@ templ RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHea
                                 <div class="row">
                                     <div class="col-12">
                                         <div class="timer-display text-center mb-4" hx-ext="sse" sse-connect="/api/events" sse-swap="race-status">
-                                            <div id="status-indicator" class="w-25 h-50 badge bg-primary">Idle</div>
+                                            <div id="status-indicator" class="w-25 h-50 primary badge bg-primary">Idle</div>
                                         </div>
                                         
                                         <div class="lanes-container">
diff --git a/web/templates/race_public_templ.go b/web/templates/race_public_templ.go
index 55b3c02..e0dc2c8 100644
--- a/web/templates/race_public_templ.go
+++ b/web/templates/race_public_templ.go
@@ -87,7 +87,7 @@ func RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHeat
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</h2></div><div class=\"card-body\"><div id=\"current-heat\" class=\"mb-4\"><div class=\"row\"><div class=\"col-12\"><div class=\"timer-display text-center mb-4\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-50 badge bg-primary\">Idle</div></div><div class=\"lanes-container\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</h2></div><div class=\"card-body\"><div id=\"current-heat\" class=\"mb-4\"><div class=\"row\"><div class=\"col-12\"><div class=\"timer-display text-center mb-4\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-50 primary badge bg-primary\">Idle</div></div><div class=\"lanes-container\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}