diff --git a/layouts/404.html b/layouts/404.html
index e5bb652..8f9d5d6 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,8 +1,14 @@
 <!DOCTYPE html>
-{{ define "main"}}
-    <div>
-        <h1>404 page not found.</h1>
-        <p><a href="/">Go Home</p>
-    </div>
-{{ end }}
-
+<html>
+    {{ partial "head.html" . }}
+    <body>
+        {{ partial "header.html" . }}
+        <div class="main">
+            <div>
+                <h1>404 page not found.</h1>
+                <p><a href="/">Go Home</a></p>
+            </div>
+        </div>
+        {{ partial "footer.html" . }}
+    </body>
+</html>
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 33a1bd0..53a3b4e 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
-    {{- partial "head.html" . -}}
+    {{ partial "head.html" . }}
     <body>
-        {{- partial "header.html" . -}}
+        {{ partial "header.html" . }}
         <div class="main">
-        {{- block "main" . }}{{- end }}
+        {{ block "main" . }}{{ end }}
         </div>
-        {{- partial "footer.html" . -}}
+        {{ partial "footer.html" . }}
     </body>
 </html>
 
