diff --git a/web/templates/heats.templ b/web/templates/heats.templ
index 02ca67b..11c45f9 100644
--- a/web/templates/heats.templ
+++ b/web/templates/heats.templ
@@ -78,16 +78,23 @@ templ HeatsContent(heats []models.Heat, racers []models.Racer) {
 				</tbody>
 			</table>
 			
-			<div class="mt-3">
-				<button 
-					class="btn btn-primary"
-					hx-post="/api/heats"
-					hx-include="[name='group_id']"
-					hx-target="#heats-content"
-				>
-					Save Heats
-				</button>
-			</div>
+			<div>
+                <button 
+                    class="btn btn-primary me-2"
+                    hx-post={ "/api/heats/generate?group_id=" + strconv.FormatInt(groupID, 10) }
+                    hx-target="#heats-list"
+                    hx-swap="innerHTML"
+                >
+                    Regenerate Heats
+                </button>
+                <button 
+                    class="btn btn-success"
+                    hx-post={ "/api/heats/save?group_id=" + strconv.FormatInt(groupID, 10) }
+                    hx-target="#save-status"
+                >
+                    Save Heats
+                </button>
+            </div>
 		</div>
 	}
 }
diff --git a/web/templates/heats_templ.go b/web/templates/heats_templ.go
index b56a09e..f5bbd46 100644
--- a/web/templates/heats_templ.go
+++ b/web/templates/heats_templ.go
@@ -219,7 +219,33 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</tbody></table><div class=\"mt-3\"><button class=\"btn btn-primary\" hx-post=\"/api/heats\" hx-include=\"[name=&#39;group_id&#39;]\" hx-target=\"#heats-content\">Save Heats</button></div></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</tbody></table><div><button class=\"btn btn-primary me-2\" hx-post=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var11 string
+			templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs("/api/heats/generate?group_id=" + strconv.FormatInt(groupID, 10))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 84, Col: 94}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\" hx-target=\"#heats-list\" hx-swap=\"innerHTML\">Regenerate Heats</button> <button class=\"btn btn-success\" hx-post=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var12 string
+			templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs("/api/heats/save?group_id=" + strconv.FormatInt(groupID, 10))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 92, Col: 90}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\" hx-target=\"#save-status\">Save Heats</button></div></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}