diff --git a/templates/base.tmpl b/templates/base.tmpl
index aae7850..3826917 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -1,92 +1,92 @@
{{define "base"}}
{{ template "head" . }}
{{ if .Chorus }}
{{end}}
{{ template "content" . }}
{{ template "footer" . }}
{{if not .JSDisabled}}
{{else}}
{{if .WebFonts}}{{end}}
{{end}}
{{end}}
{{define "body-attrs"}}{{end}}
diff --git a/templates/user/include/header.tmpl b/templates/user/include/header.tmpl
index 0feca89..c53ac33 100644
--- a/templates/user/include/header.tmpl
+++ b/templates/user/include/header.tmpl
@@ -1,108 +1,106 @@
{{define "user-navigation"}}
{{if .SingleUser}}
Drafts
New Post
{{else}}
- {{ if .Chorus }}
+
- {{ else }}
-
- {{ end }}
{{if .Username}}
{{end}}
{{if .SimpleNav}}
{{ if not .SingleUser }}
{{if and (and .LocalTimeline .CanViewReader) .Chorus}}Home{{end}}
{{ end }}
About
{{ if not .SingleUser }}
{{ if .Username }}
{{if gt .MaxBlogs 1}}Blogs{{end}}
{{if and .Chorus (eq .MaxBlogs 1)}}My Posts{{end}}
{{if not .DisableDrafts}}Drafts{{end}}
{{ end }}
{{if and (and .LocalTimeline .CanViewReader) (not .Chorus)}}Reader{{end}}
{{if and (and (and .Chorus .OpenRegistration) (not .Username)) (or (not .Private) (ne .Landing ""))}}Sign up{{end}}
{{if .Username}}Log out{{else}}Log in{{end}}
{{ end }}
{{else}}
Blogs
{{if not .DisableDrafts}}Drafts{{end}}
+ {{if and (and .LocalTimeline .CanViewReader) (not .Chorus)}}Reader{{end}}
{{end}}
{{if .Chorus}}{{if .Username}}{{end}}
{{end}}
{{end}}
{{end}}
{{define "header"}}
{{.PageTitle}} {{if .Separator}}{{.Separator}}{{else}}—{{end}} {{.SiteName}}
{{template "user-navigation" .}}
{{end}}
{{define "admin-header"}}
{{end}}