diff --git a/templates/header.html b/templates/header.html
index 287db10..8fc7eb1 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,3 +1,4 @@
+{% if not request.path.startswith('/admin') %}
 <div id="header">
 
 <div class="h-card p-author">
@@ -8,15 +9,12 @@
         {% if not session.logged_in %}<small><a class="remote-follow-button" href="/remote_follow">Remote follow</a></small>{% endif %}
 </a>
 
-{% if not request.path.startswith('/admin') %}
 <div class="p-note summary">
 {{ config.SUMMARY | safe }}
 </div>
-{% endif %}
 
 </div>
 
-{% if not request.path.startswith('/admin') %}
 <div class="menu">
 <ul>
 <li><a href="/" {% if request.path == "/" %}class="selected"{% endif %}>Notes <small class="badge">{{ notes_count }}</small></a></li>
@@ -29,6 +27,6 @@
 -->
 </ul>
 </div>
-{% endif %}
 
 </div>
+{% endif %}
diff --git a/templates/layout.html b/templates/layout.html
index a61a703..fb7d6d2 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -18,7 +18,8 @@
 {% if logged_in %}
 <div id="admin-menu-wrapper">
 <ul id="admin-menu">
-<li class="left"><a href="/admin" class="admin-title{% if request.path == "/admin" %} selected{% endif %}">Admin</a></li>
+<li class="left"><a href="/admin" class="admin-title{% if request.path.startswith("/admin") %} selected{% endif %}">Admin</a></li>
+<li class="left"><a href="/" class="admin-title {% if not request.path.startswith("/admin") %} selected{% endif %}">Public</a></li>
 <li class="left"><a href="/admin/new"{% if request.path == "/admin/new" %} class="selected" {% endif %}>New</a></li>
 <li class="left"><a href="/admin/stream"{% if request.path == "/admin/stream" %} class="selected" {% endif %}>Stream</a></li>
 <li class="left"><a href="/admin/notifications"{% if request.path == "/admin/notifications" %} class="selected" {% endif %}>Notifications</a></li>