diff --git a/cmd/server/template/home.html b/cmd/server/template/home.html
index 68b9f0c..0539e23 100644
--- a/cmd/server/template/home.html
+++ b/cmd/server/template/home.html
@@ -1,4 +1,4 @@
-{{ define "content" }}
+{{ define "content" -}}
             <div class="container position-relative h-75">
                 <div class="position-absolute bottom-50 start-0 w-100 translate-middle-y">
                     <div class="row">
@@ -18,4 +18,4 @@
                     </div>
                 </div>
             </div>
-{{ end }}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/cmd/server/template/messages.html b/cmd/server/template/messages.html
index 35f96d0..e1c7ce8 100644
--- a/cmd/server/template/messages.html
+++ b/cmd/server/template/messages.html
@@ -1,4 +1,4 @@
-{{ define "content" }}
+{{ define "content" -}}
             <div class="container">
                 <h3 class="my-4 ps-2">Recent messages ({{ .Data.Count }}/{{ .Data.Total }})</h3>
                 <table class="table">
@@ -10,18 +10,18 @@
                         </tr>
                     </thead>
                     <tbody>
-                    {{ range .Data.Messages }}
+                    {{- range .Data.Messages }}
                         <tr>
                             <td>{{ .TimeFmt }} ago</td>
                             <td>{{ .Text }}</td>
                             <td>{{ .Source }}</td>
                         </tr>
-                    {{ else }}
+                    {{- else }}
                         <tr>
                             <td colspan="3">No messages</td>
                         </tr>
-                    {{ end }}
+                    {{- end }}
                     </tbody>
                 </table>
             </div>
-{{ end }}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/cmd/server/template/navbar.html b/cmd/server/template/navbar.html
index 21eccfc..ac46fdb 100644
--- a/cmd/server/template/navbar.html
+++ b/cmd/server/template/navbar.html
@@ -1,4 +1,4 @@
-{{ define "navbar" }}
+{{ define "navbar" -}}
             <nav class="navbar navbar-expand navbar-light bg-transparent">
                 <div class="container-fluid">
                     <ul class="navbar-nav">
@@ -11,4 +11,4 @@
                     </ul>
                 </div>
             </nav>
-{{ end }}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/cmd/server/template/template.html b/cmd/server/template/template.html
index 91ff29f..eaefb29 100644
--- a/cmd/server/template/template.html
+++ b/cmd/server/template/template.html
@@ -1,4 +1,5 @@
-{{ define "layout" }}<!doctype html>
+{{ define "layout" -}}
+<!doctype html>
 <html lang="en">
     <head>
         <title>Microservices</title>
@@ -12,8 +13,8 @@
             {{ template "navbar" . }}
             {{ template "content" . }}
         </div>
-
         <script src="http://127.0.0.1:8000/index.js"></script>
         <!-- <script src="static/build/index.js"></script> -->
     </body>
-</html>{{ end }}
\ No newline at end of file
+</html>
+{{- end }}
\ No newline at end of file
