diff --git a/core/jsondb/jsondb.go b/core/jsondb/jsondb.go
index e0edfec..445dd97 100644
--- a/core/jsondb/jsondb.go
+++ b/core/jsondb/jsondb.go
@@ -4,6 +4,7 @@ package jsondb
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -26,6 +27,7 @@ var (
 
 // New initializes the JSON database.
 func New(root string) *DB {
+	log.Info("Initialized JsonDB at root: %s", root)
 	return &DB{
 		Root: root,
 	}
@@ -60,14 +62,17 @@ func (db *DB) Commit(document string, v interface{}) error {
 	path := db.toPath(document)
 
 	// Ensure the directory tree is ready.
-	db.makePath(path)
-
-	// Write the document.
-	err := db.writeJSON(path, v)
+	err := db.makePath(path)
 	if err != nil {
 		return err
 	}
 
+	// Write the document.
+	err = db.writeJSON(path, v)
+	if err != nil {
+		return fmt.Errorf("failed to write JSON to path %s: %s", path, err.Error())
+	}
+
 	return nil
 }
 
@@ -107,7 +112,7 @@ func (db *DB) ListAll(path string) ([]string, error) {
 func (db *DB) makePath(path string) error {
 	parts := strings.Split(path, string(filepath.Separator))
 	parts = parts[:len(parts)-1] // pop off the filename
-	directory := filepath.Join(parts...)
+	directory := "/" + filepath.Join(parts...)
 
 	if _, err := os.Stat(directory); err != nil {
 		log.Debug("[JsonDB] Create directory: %s", directory)
diff --git a/core/middleware.go b/core/middleware.go
index dee3194..84aabc4 100644
--- a/core/middleware.go
+++ b/core/middleware.go
@@ -44,8 +44,9 @@ func (b *Blog) Session(r *http.Request) *sessions.Session {
 func (b *Blog) CSRFMiddleware(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 	if r.Method == "POST" {
 		session := b.Session(r)
-		token, ok := session.Values["csrf"].(string)
-		if !ok || token != r.FormValue("_csrf") {
+		token := b.GenerateCSRFToken(w, r, session)
+		if token != r.FormValue("_csrf") {
+			log.Error("CSRF Mismatch: expected %s, got %s", r.FormValue("_csrf"), token)
 			b.Forbidden(w, r, "Failed to validate CSRF token. Please try your request again.")
 			return
 		}
diff --git a/core/pages.go b/core/pages.go
index 7656d20..fb77a32 100644
--- a/core/pages.go
+++ b/core/pages.go
@@ -85,7 +85,7 @@ func (b *Blog) ResolvePath(path string) (Filepath, error) {
 	}
 
 	debug("Resolving filepath for URI: %s", path)
-	for _, root := range []string{b.DocumentRoot, b.UserRoot} {
+	for _, root := range []string{b.UserRoot, b.DocumentRoot} {
 		if len(root) == 0 {
 			continue
 		}
diff --git a/core/templates.go b/core/templates.go
index b4a0ecd..0b9576e 100644
--- a/core/templates.go
+++ b/core/templates.go
@@ -4,6 +4,7 @@ import (
 	"html/template"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/kirsle/blog/core/forms"
 	"github.com/kirsle/blog/core/models/settings"
@@ -108,6 +109,7 @@ func (b *Blog) RenderTemplate(w http.ResponseWriter, r *http.Request, path strin
 	// Useful template functions.
 	t := template.New(filepath.Absolute).Funcs(template.FuncMap{
 		"StringsJoin": strings.Join,
+		"Now":         time.Now,
 		"RenderPost":  b.RenderPost,
 		"RenderComments": func(subject string, ids ...string) template.HTML {
 			session := b.Session(r)
diff --git a/root/.layout.gohtml b/root/.layout.gohtml
index 7b1de6a..d4701eb 100644
--- a/root/.layout.gohtml
+++ b/root/.layout.gohtml
@@ -1,4 +1,4 @@
-{{ define "title" }}WTF?{{ end }}
+{{ define "title" }}{{ end }}
 {{ define "scripts" }}{{ end }}
 
 {{ define "layout" }}
diff --git a/root/admin/settings.gohtml b/root/admin/settings.gohtml
index a97050c..7c36c7a 100644
--- a/root/admin/settings.gohtml
+++ b/root/admin/settings.gohtml
@@ -2,162 +2,159 @@
 {{ define "content" }}
 <form action="/admin/settings" method="POST">
 <input type="hidden" name="_csrf" value="{{ .CSRF }}">
-<div class="card">
-    {{ with .Data.s }}
-    <div class="card-body">
-        <h3>The Basics</h3>
 
-        <div class="form-group">
-            <label for="title">Title</label>
-            <input type="text"
-                class="form-control"
-                name="title"
-                value="{{ .Site.Title }}"
-                placeholder="Website Title">
-        </div>
-
-        <div class="form-group">
-            <label for="admin-email">Admin Email</label>
-            <small class="text-muted">For getting notifications about comments, etc.</small>
-            <input type="text"
-                class="form-control"
-                name="admin-email"
-                value="{{ .Site.AdminEmail }}"
-                placeholder="name@domain.com">
-        </div>
-
-        <div class="form-group">
-            <label for="admin-email">URL Root</label>
-            <small class="text-muted d-block">
-                The base absolute URL to your website. This is used to generate
-                emails such as comment notifications. If not provided, these
-                emails will not be sent.
-            </small>
-            <input type="text"
-                class="form-control"
-                name="url"
-                value="{{ .Site.URL }}"
-                placeholder="https://www.example.com/">
-        </div>
-
-        <h3>Redis Cache</h3>
-
-        <p>
-            Using a <a href="https://redis.io/" target="_blank">Redis</a> cache can
-            boost the performance of the JSON database by caching documents in
-            memory instead of always reading from disk.
-        </p>
-
-        <div class="form-check">
-            <label class="form-check-label">
-                <input type="checkbox"
-                    class="form-check-input"
-                    name="redis-enabled"
-                    value="true"
-                    {{ if .Redis.Enabled }}checked{{ end }}>
-                    Enable Redis
-            </label>
-        </div>
-        <div class="form-group">
-            <label for="redis-host">Redis Host</label>
-            <input type="text"
-                class="form-control"
-                name="redis-host"
-                value="{{ .Redis.Host }}"
-                placeholder="localhost">
-        </div>
-        <div class="form-group">
-            <label for="redis-port">Port</label>
-            <input type="text"
-                class="form-control"
-                name="redis-port"
-                value="{{ .Redis.Port }}"
-                placeholder="6379">
-        </div>
-        <div class="form-group">
-            <label for="redis-db">DB Number</label>
-            <small class="text-muted">0-15</small>
-            <input type="text"
-                class="form-control"
-                name="redis-db"
-                value="{{ .Redis.DB }}"
-                placeholder="0">
-        </div>
-        <div class="form-group">
-            <label for="redis-prefix">Key Prefix</label>
-            <small class="text-muted">(optional)</small>
-            <input type="text"
-                class="form-control"
-                name="redis-prefix"
-                value="{{ .Redis.Prefix }}"
-                placeholder="blog:">
-        </div>
-
-        <h3>Email Settings</h3>
-
-        <div class="form-check">
-            <label class="form-check-label">
-                <input type="checkbox"
-                    class="form-check-input"
-                    name="mail-enabled"
-                    value="true"
-                    {{ if .Mail.Enabled }}checked{{ end }}>
-                    Enable email to be sent by this site
-            </label>
-        </div>
-        <div class="form-group">
-            <label for="mail-sender">Sender Address</label>
-            <input type="email"
-                name="mail-sender"
-                id="mail-sender"
-                class="form-control"
-                value="{{ .Mail.Sender }}"
-                placeholder="no-reply@example.com">
-        </div>
-        <div class="form-group">
-            <label for="mail-host">SMTP Host</label>
-            <input type="text"
-                class="form-control"
-                name="mail-host"
-                id="mail-host"
-                value="{{ .Mail.Host }}"
-                placeholder="localhost">
-        </div>
-        <div class="form-group">
-            <label for="mail-port">SMTP Port</label>
-            <input type="text"
-                class="form-control"
-                name="mail-port"
-                id="mail-port"
-                value="{{ .Mail.Port }}"
-                placeholder="25">
-        </div>
-        <div class="form-group">
-            <label for="mail-username">SMTP Username</label>
-            <small class="text-muted">(optional)</small>
-            <input type="text"
-                class="form-control"
-                name="mail-username"
-                value="{{ .Mail.Username }}"
-                placeholder="">
-        </div>
-        <div class="form-group">
-            <label for="mail-password">SMTP Password</label>
-            <small class="text-muted">(optional)</small>
-            <input type="text"
-                class="form-control"
-                name="mail-password"
-                value="{{ .Mail.Password }}"
-                placeholder="">
-        </div>
-
-        <div class="form-group">
-            <button type="submit" class="btn btn-primary">Save Settings</button>
-            <a href="/admin" class="btn btn-secondary">Cancel</a>
-        </div>
+{{ with .Data.s }}
+    <h3>The Basics</h3>
 
+    <div class="form-group">
+        <label for="title">Title</label>
+        <input type="text"
+            class="form-control"
+            name="title"
+            value="{{ .Site.Title }}"
+            placeholder="Website Title">
     </div>
-    {{ end }}
-</div>
+
+    <div class="form-group">
+        <label for="admin-email">Admin Email</label>
+        <small class="text-muted">For getting notifications about comments, etc.</small>
+        <input type="text"
+            class="form-control"
+            name="admin-email"
+            value="{{ .Site.AdminEmail }}"
+            placeholder="name@domain.com">
+    </div>
+
+    <div class="form-group">
+        <label for="admin-email">URL Root</label>
+        <small class="text-muted d-block">
+            The base absolute URL to your website. This is used to generate
+            emails such as comment notifications. If not provided, these
+            emails will not be sent.
+        </small>
+        <input type="text"
+            class="form-control"
+            name="url"
+            value="{{ .Site.URL }}"
+            placeholder="https://www.example.com/">
+    </div>
+
+    <h3>Redis Cache</h3>
+
+    <p>
+        Using a <a href="https://redis.io/" target="_blank">Redis</a> cache can
+        boost the performance of the JSON database by caching documents in
+        memory instead of always reading from disk.
+    </p>
+
+    <div class="form-check">
+        <label class="form-check-label">
+            <input type="checkbox"
+                class="form-check-input"
+                name="redis-enabled"
+                value="true"
+                {{ if .Redis.Enabled }}checked{{ end }}>
+                Enable Redis
+        </label>
+    </div>
+    <div class="form-group">
+        <label for="redis-host">Redis Host</label>
+        <input type="text"
+            class="form-control"
+            name="redis-host"
+            value="{{ .Redis.Host }}"
+            placeholder="localhost">
+    </div>
+    <div class="form-group">
+        <label for="redis-port">Port</label>
+        <input type="text"
+            class="form-control"
+            name="redis-port"
+            value="{{ .Redis.Port }}"
+            placeholder="6379">
+    </div>
+    <div class="form-group">
+        <label for="redis-db">DB Number</label>
+        <small class="text-muted">0-15</small>
+        <input type="text"
+            class="form-control"
+            name="redis-db"
+            value="{{ .Redis.DB }}"
+            placeholder="0">
+    </div>
+    <div class="form-group">
+        <label for="redis-prefix">Key Prefix</label>
+        <small class="text-muted">(optional)</small>
+        <input type="text"
+            class="form-control"
+            name="redis-prefix"
+            value="{{ .Redis.Prefix }}"
+            placeholder="blog:">
+    </div>
+
+    <h3>Email Settings</h3>
+
+    <div class="form-check">
+        <label class="form-check-label">
+            <input type="checkbox"
+                class="form-check-input"
+                name="mail-enabled"
+                value="true"
+                {{ if .Mail.Enabled }}checked{{ end }}>
+                Enable email to be sent by this site
+        </label>
+    </div>
+    <div class="form-group">
+        <label for="mail-sender">Sender Address</label>
+        <input type="email"
+            name="mail-sender"
+            id="mail-sender"
+            class="form-control"
+            value="{{ .Mail.Sender }}"
+            placeholder="no-reply@example.com">
+    </div>
+    <div class="form-group">
+        <label for="mail-host">SMTP Host</label>
+        <input type="text"
+            class="form-control"
+            name="mail-host"
+            id="mail-host"
+            value="{{ .Mail.Host }}"
+            placeholder="localhost">
+    </div>
+    <div class="form-group">
+        <label for="mail-port">SMTP Port</label>
+        <input type="text"
+            class="form-control"
+            name="mail-port"
+            id="mail-port"
+            value="{{ .Mail.Port }}"
+            placeholder="25">
+    </div>
+    <div class="form-group">
+        <label for="mail-username">SMTP Username</label>
+        <small class="text-muted">(optional)</small>
+        <input type="text"
+            class="form-control"
+            name="mail-username"
+            value="{{ .Mail.Username }}"
+            placeholder="">
+    </div>
+    <div class="form-group">
+        <label for="mail-password">SMTP Password</label>
+        <small class="text-muted">(optional)</small>
+        <input type="text"
+            class="form-control"
+            name="mail-password"
+            value="{{ .Mail.Password }}"
+            placeholder="">
+    </div>
+
+    <div class="form-group">
+        <button type="submit" class="btn btn-primary">Save Settings</button>
+        <a href="/admin" class="btn btn-secondary">Cancel</a>
+    </div>
+{{ end }}
+
 </form>
 {{ end }}