diff --git a/web/templates/race_public.templ b/web/templates/race_public.templ
index fad30f6..60917a0 100644
--- a/web/templates/race_public.templ
+++ b/web/templates/race_public.templ
@@ -9,15 +9,15 @@ import (
 // RacePublic renders the public race view
 templ RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHeat *models.HeatData) {
     @LayoutPublic("Race - " + heatData.Group.Name) {
-        <div class="container-fluid mt-3">
+        <div class="container-fluid mt-2">
             <div class="row">
                 <div class="col-12">
-                    <div class="card mb-4">
+                    <div class="card mb-2">
                         <div class="card-header bg-primary text-white">
                             <span class="mb-0 text-center display-3">{ heatData.Group.Name } - Heat { strconv.Itoa(heatData.HeatNumber) } of { strconv.Itoa(heatData.TotalHeats) }</span>
                         </div>
                         <div class="card-body">
-                            <div id="current-heat" class="mb-4">
+                            <div id="current-heat" class="mb-2">
                                 <div class="row">
                                     <div class="col-12">
                                         <div class="timer-display d-inline-flex align-items-center text-center mb-4" style="height: 50px;" hx-ext="sse" sse-connect="/api/events" sse-swap="race-status">
@@ -128,7 +128,7 @@ templ raceLaneCard(laneData models.LaneData) {
 
 // Helper template for displaying next heat preview
 templ raceNextHeatPreview(heatData *models.HeatData) {
-    <h4 class="mb-3">Heat { strconv.Itoa(heatData.HeatNumber) }</h4>
+    <h4 class="mb-1">Heat { strconv.Itoa(heatData.HeatNumber) }</h4>
     <div class="table-responsive">
         <table class="table table-striped">
             <thead>
diff --git a/web/templates/race_public_templ.go b/web/templates/race_public_templ.go
index 859e0a6..1b45621 100644
--- a/web/templates/race_public_templ.go
+++ b/web/templates/race_public_templ.go
@@ -48,7 +48,7 @@ func RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHeat
 				}()
 			}
 			ctx = templ.InitializeContext(ctx)
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"container-fluid mt-3\"><div class=\"row\"><div class=\"col-12\"><div class=\"card mb-4\"><div class=\"card-header bg-primary text-white\"><span class=\"mb-0 text-center display-3\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"container-fluid mt-2\"><div class=\"row\"><div class=\"col-12\"><div class=\"card mb-2\"><div class=\"card-header bg-primary text-white\"><span class=\"mb-0 text-center display-3\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -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, "</span></div><div class=\"card-body\"><div id=\"current-heat\" class=\"mb-4\"><div class=\"row\"><div class=\"col-12\"><div class=\"timer-display d-inline-flex align-items-center text-center mb-4\" style=\"height: 50px;\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-75 display-4 d-inline-flex align-items-center badge bg-primary\">Idle</div></div><div class=\"lanes-container\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</span></div><div class=\"card-body\"><div id=\"current-heat\" class=\"mb-2\"><div class=\"row\"><div class=\"col-12\"><div class=\"timer-display d-inline-flex align-items-center text-center mb-4\" style=\"height: 50px;\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-75 display-4 d-inline-flex align-items-center badge bg-primary\">Idle</div></div><div class=\"lanes-container\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -353,7 +353,7 @@ func raceNextHeatPreview(heatData *models.HeatData) templ.Component {
 			templ_7745c5c3_Var16 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<h4 class=\"mb-3\">Heat ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<h4 class=\"mb-1\">Heat ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}