diff --git a/build.gradle.kts b/build.gradle.kts
index 8a1e70d..63bc842 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,9 +23,9 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.github.wimdeblauwe:htmx-spring-boot-thymeleaf:2.0.0")
-    implementation("org.springframework.boot:spring-boot-devtools")
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
     implementation("org.webjars:webjars-locator:0.41")
-    implementation("org.webjars.npm:htmx.org:1.7.0")
+    implementation("org.webjars.npm:htmx.org:1.8.2")
     implementation("org.webjars.npm:sortablejs:1.8.3")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html
index d74d0d1..7772b88 100644
--- a/src/main/resources/templates/fragments.html
+++ b/src/main/resources/templates/fragments.html
@@ -2,12 +2,8 @@
     <div class="position" th:classappend="${'rank' + teamStat.index}">
         <div class="team">
             <div th:text="${teamStat.index + 1}"></div>
-            <th:block th:if="${team.editMode == true}">
-                <div th:insert="fragments :: editTeam" th:remove="tag"/>
-            </th:block>
-            <th:block th:if="${team.editMode == false}">
-                <div th:insert="fragments :: showTeam" th:remove="tag"/>
-            </th:block>
+            <div th:if="${team.editMode}" th:insert="~{fragments :: editTeam}" th:remove="tag"/>
+            <div th:if="${not team.editMode}" th:insert="~{fragments :: showTeam}" th:remove="tag"/>
             <div class="editButton" hx:post="|/edit/${team.id}|" hx-swap="innerHTML" hx-target="#soccer-table">
                 <svg
                         xmlns="http://www.w3.org/2000/svg"
@@ -34,14 +30,16 @@
 
 <div th:fragment="soccer-table" th:remove="tag">
 
-    <div th:insert="fragments :: position(${team})" th:each="team : ${soccerTable.positions}" th:remove="tag">
+    <div th:insert="~{fragments :: position(${team})}" th:each="team : ${soccerTable.positions}" th:remove="tag">
     </div>
 
 </div>
 
 <div th:fragment="editTeam" th:remove="tag">
-    <input name='teamName' th:value="${team.name}" form="edit-soccer-table"/>
-    <input type='hidden' name='teamId' th:value="${team.id}" form="edit-soccer-table"/>
+    <form id="edit-soccer-table" hx-post="/saveSingleTeam" hx-swap="innerHTML" hx-target="#soccer-table">
+        <input name='teamName' th:value="${team.name}"/>
+        <input type='hidden' name='teamId' th:value="${team.id}"/>
+    </form>
 </div>
 
 <div th:fragment="showTeam" th:text="${team.name}">FC Wolfsburg</div>
diff --git a/src/main/resources/templates/soccerTable.html b/src/main/resources/templates/soccerTable.html
index 1080d65..3f25f41 100644
--- a/src/main/resources/templates/soccerTable.html
+++ b/src/main/resources/templates/soccerTable.html
@@ -8,12 +8,17 @@
 <body>
 <div class="app">
     <h1>Kickertabelle zum Selberstecken</h1>
-    <form id="edit-soccer-table" hx-post="/saveSingleTeam" hx-swap="innerHTML" hx-target="#soccer-table"></form>
 
-    <form id="soccer-table" class="soccer-table sortable" hx-post="/soccerTable" hx-trigger="end" hx-swap="innerHTML"
+    <form id="soccer-table"
+          class="soccer-table sortable"
+          hx-post="/soccerTable"
+          hx-trigger="end"
+          hx-swap="innerHTML"
           th:remove="all-but-first">
 
-        <div th:insert="fragments :: position(${team})" th:each="team : ${soccerTable.positions}" th:remove="tag">
+        <div th:insert="~{fragments :: position(${team})}"
+             th:each="team : ${soccerTable.positions}"
+             th:remove="tag">
         </div>
     </form>
 </div>
@@ -34,4 +39,4 @@ <h1>Kickertabelle zum Selberstecken</h1>
 </script>
 
 
-</html>
\ No newline at end of file
+</html>
