diff --git a/cmd/web/handlers.go b/cmd/web/handlers.go
index d091dac..83b74e9 100644
--- a/cmd/web/handlers.go
+++ b/cmd/web/handlers.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"net/http"
@@ -16,11 +17,15 @@ func (app *application) render(w http.ResponseWriter, status int, page string, d
 		app.serverError(w, err)
 		return
 	}
-	w.WriteHeader(status)
-	err := ts.ExecuteTemplate(w, "base", data)
+	buf := new(bytes.Buffer)
+
+	err := ts.ExecuteTemplate(buf, "base", data)
 	if err != nil {
 		app.serverError(w, err)
+		return
 	}
+	w.WriteHeader(status)
+	buf.WriteTo(w)
 }
 
 func (app *application) home(w http.ResponseWriter, r *http.Request) {
diff --git a/cmd/web/templates.go b/cmd/web/templates.go
index 9cba446..7c858c1 100644
--- a/cmd/web/templates.go
+++ b/cmd/web/templates.go
@@ -27,7 +27,7 @@ func newTemplateCache() (map[string]*template.Template, error) {
 			return nil, err
 		}
 
-		ts, err = ts.ParseGlob("./ui/html/pages/nav.tmpl")
+		ts, err = ts.ParseGlob("./ui/html/partials/nav.tmpl")
 		if err != nil {
 			return nil, err
 		}