diff --git a/www/.layout.gohtml b/www/.layout.gohtml
index 62ed35c..b8fbba5 100644
--- a/www/.layout.gohtml
+++ b/www/.layout.gohtml
@@ -66,9 +66,9 @@
 
 				{{ template "content" . }}
 
-				{{ if and .CurrentUser.Admin .Editable }}
+				{{ if and .CurrentUser.Admin .Editable (ne .TemplatePath ".markdown.gohtml") }}
 					<p>
-						<strong>Admin:</strong> [<a href="/admin/editor?file={{ or .Data.MarkdownFile TemplateName }}">edit this page</a>]
+						<strong>Admin:</strong> [<a href="/admin/editor?file={{ .TemplatePath }}">edit this page</a>]
 					</p>
 				{{ end }}
 
diff --git a/www/blog/tags.partial.gohtml b/www/blog/tags.partial.gohtml
deleted file mode 100644
index 560464b..0000000
--- a/www/blog/tags.partial.gohtml
+++ /dev/null
@@ -1,20 +0,0 @@
-{{ if .IndexView }}
-    Sorted by most frequently used:
-
-    <ul class="list-unstyled">
-    {{ range .Tags }}
-        <li><a href="/tagged/{{ .Name }}">{{ .Name }}</a> ({{ .Count }})</li>
-    {{ end }}
-    </ul>
-{{ else }}
-    <ul class="list-unstyled">
-        <li>&#0187; <a href="/archive">Blog Archives</a></li>
-        {{ range .Tags }}
-            {{ if ge .Count 8 }}
-            <li>&#0187; <a href="/tagged/{{ .Name }}">{{ .Name }}</a>
-                <small>({{ .Count }})</small></li>
-            {{ end }}
-        {{ end }}
-        <li>&#0187; <a href="/tagged">View all tags</a></li>
-    </ul>
-{{ end }}
diff --git a/www/guestbook.gohtml b/www/guestbook.gohtml
index 50ed42e..65b1154 100644
--- a/www/guestbook.gohtml
+++ b/www/guestbook.gohtml
@@ -3,6 +3,6 @@
 
 <h1>My Guestbook</h1>
 
-{{ RenderComments "Guestbook" "guestbook" }}
+{{ RenderComments .Request "Guestbook" "guestbook" }}
 
 {{ end }}