diff --git a/templates/home.html b/templates/home.html
index 4e696a9..6ebb010 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -11,7 +11,7 @@
         <div>
             <h2 class="text-2xl font-semibold leading-tight">{{.Region}}</h2>
         </div>
-        {{range $gamemode := $gamemodes}}
+        {{range $gamemode := $gamemodes -}}
         <div class="-mx-4 sm:-mx-8 px-4 sm:px-8 py-4 overflow-x-auto">
             <div class="inline-block min-w-full shadow rounded-lg overflow-hidden">
                 <table class="min-w-full leading-normal">
@@ -33,15 +33,15 @@
                         </tr>
                     </thead>
                     <tbody>
-                      {{range $server := $servers}}
-                        {{if eq $gamemode.ID $server.GamemodeID}}
+                      {{range $server := $servers -}}
+                        {{if eq $gamemode.ID $server.GamemodeID -}}
                         <tr id="content">
                             <td class="px-5 border-b border-gray-200 bg-white" id="flag">
-                                  {{range $flag := $flags}}
-                                    {{if eq $server.ServerIP $flag.ServerIP}}
+                                  {{range $flag := $flags -}}
+                                    {{if eq $server.ServerIP $flag.ServerIP -}}
                                     <img src="https://flagcdn.com/16x12/{{$flag.Flag}}.png" srcset="https://flagcdn.com/32x24/{{$flag.Flag}}.png 2x, https://flagcdn.com/48x36/{{$flag.Flag}}.png 3x" width="16" height="12">
-                                    {{end}}
-                                  {{end}}
+                                    {{- end}}
+                                  {{- end}}
                             </td>
                             <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm" id="name">
                                 <div class="flex items-center">
@@ -57,13 +57,13 @@
                                 <p class="text-gray-900 whitespace-no-wrap">{{$server.Players}}/{{$server.MaxPlayers}}</p>
                             </td>
                         </tr>
-                        {{end}}
-                      {{end}}
+                        {{- end}}
+                      {{- end}}
                     </tbody>
                 </table>
             </div>
         </div>
-        {{end}}
+        {{- end}}
     </div>
 </div>
 </section>
diff --git a/templates/region.html b/templates/region.html
index 799adb1..1c3c302 100644
--- a/templates/region.html
+++ b/templates/region.html
@@ -12,9 +12,9 @@
         <div>
             <h2 class="text-2xl font-semibold leading-tight">{{.Region}}</h2>
         </div>
-      {{range $gamemode := $gamemodes}}
-       {{range $gamemodeCount := $gamemodesCount}}
-        {{if eq $gamemode.ID $gamemodeCount.ID}}
+      {{range $gamemode := $gamemodes -}}
+       {{range $gamemodeCount := $gamemodesCount -}}
+        {{if eq $gamemode.ID $gamemodeCount.ID -}}
         <div class="-mx-4 sm:-mx-8 px-4 sm:px-8 py-4 overflow-x-auto">
             <div class="inline-block min-w-full shadow rounded-lg overflow-hidden">
                 <table class="min-w-full leading-normal">
@@ -36,15 +36,15 @@
                         </tr>
                     </thead>
                     <tbody>
-                      {{range $server := $servers}}
-                        {{if eq $gamemode.ID $server.GamemodeID}}
+                      {{range $server := $servers -}}
+                        {{if eq $gamemode.ID $server.GamemodeID -}}
                         <tr id="content">
                             <td class="px-5 border-b border-gray-200 bg-white" id="flag">
-                                  {{range $flag := $flags}}
-                                    {{if eq $server.ServerIP $flag.ServerIP}}
+                                  {{range $flag := $flags -}}
+                                    {{if eq $server.ServerIP $flag.ServerIP -}}
                                     <img src="https://flagcdn.com/16x12/{{$flag.Flag}}.png" srcset="https://flagcdn.com/32x24/{{$flag.Flag}}.png 2x, https://flagcdn.com/48x36/{{$flag.Flag}}.png 3x" width="16" height="12">
-                                    {{end}}
-                                  {{end}}
+                                    {{- end}}
+                                  {{- end}}
                             </td>
                             <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm" id="name">
                                 <div class="flex items-center">
@@ -60,15 +60,15 @@
                                 <p class="text-gray-900 whitespace-no-wrap">{{$server.Players}}/{{$server.MaxPlayers}}</p>
                             </td>
                         </tr>
-                        {{end}}
-                      {{end}}
+                        {{- end}}
+                      {{- end}}
                     </tbody>
                 </table>
             </div>
         </div>
-        {{end}}
-       {{end}}
-      {{end}}
+        {{- end}}
+       {{- end}}
+      {{- end}}
     </div>
 </div>
 </section>