diff --git a/templates/components/edit_game_form.templ b/templates/components/edit_game_form.templ
index d538bea..0ac474a 100644
--- a/templates/components/edit_game_form.templ
+++ b/templates/components/edit_game_form.templ
@@ -49,7 +49,7 @@ templ EditGameForm(g skat.Game) {
 			</div>
 		</div>
 		<div class="modal-action">
-			<button hx-put={ fmt.Sprintf("/games/%v/edit", g.ID) } hx-target="closest body" hx-swap="outerHTML" class="btn">Submit</button>
+			<button hx-put={ fmt.Sprintf("/games/%v/edit", g.ID) } hx-target="#content" class="btn">Submit</button>
 			<button class="btn">Cancel</button>
 		</div>
 	</form>
diff --git a/templates/components/edit_game_form_templ.go b/templates/components/edit_game_form_templ.go
index 1bb8274..c775119 100644
--- a/templates/components/edit_game_form_templ.go
+++ b/templates/components/edit_game_form_templ.go
@@ -169,7 +169,7 @@ func EditGameForm(g skat.Game) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"closest body\" hx-swap=\"outerHTML\" class=\"btn\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#content\" class=\"btn\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
diff --git a/templates/components/rounds_list.templ b/templates/components/rounds_list.templ
index e26f364..7755896 100644
--- a/templates/components/rounds_list.templ
+++ b/templates/components/rounds_list.templ
@@ -80,7 +80,7 @@ templ AddRoundForm(game skat.Game) {
 	<div class="card  bg-base-200 shadow-xl">
 		<div class="card-body">
 			<h2 class="card-title">Round { fmt.Sprintf("%v", len(game.Rounds) + 1 ) }</h2>
-			<form>
+			<form hx-post={ fmt.Sprintf("/games/%v/rounds", game.ID) } hx-target="closest body">
 				<div class="flex flex-row flex-wrap gap-2 pb-4">
 					for _, player := range game.Players {
 						<label class="form-control">
@@ -111,7 +111,7 @@ templ AddRoundForm(game skat.Game) {
 					</div>
 				</div>
 				<div class="card-actions justify-end">
-					<button hx-post={ fmt.Sprintf("/games/%v/rounds", game.ID) } hx-target="closest body" class="btn btn-primary">Submit</button>
+					<button class="btn btn-primary">Submit</button>
 				</div>
 			</form>
 		</div>
diff --git a/templates/components/rounds_list_templ.go b/templates/components/rounds_list_templ.go
index 4384771..8dc84e4 100644
--- a/templates/components/rounds_list_templ.go
+++ b/templates/components/rounds_list_templ.go
@@ -229,7 +229,15 @@ func AddRoundForm(game skat.Game) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</h2><form><div class=\"flex flex-row flex-wrap gap-2 pb-4\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</h2><form hx-post=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(fmt.Sprintf("/games/%v/rounds", game.ID)))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"closest body\"><div class=\"flex flex-row flex-wrap gap-2 pb-4\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -310,15 +318,7 @@ func AddRoundForm(game skat.Game) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</span> <input checked value=\"true\" id=\"won\" name=\"won\" type=\"checkbox\" value=\"true\" class=\"checkbox checkbox-primary\"></label></div></div><div class=\"card-actions justify-end\"><button hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(fmt.Sprintf("/games/%v/rounds", game.ID)))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"closest body\" class=\"btn btn-primary\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</span> <input checked value=\"true\" id=\"won\" name=\"won\" type=\"checkbox\" value=\"true\" class=\"checkbox checkbox-primary\"></label></div></div><div class=\"card-actions justify-end\"><button class=\"btn btn-primary\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}