diff --git a/tests/webadmin/test_auth.py b/tests/webadmin/test_auth.py
index 8ef1692..587d258 100644
--- a/tests/webadmin/test_auth.py
+++ b/tests/webadmin/test_auth.py
@@ -48,11 +48,11 @@ def test_index_redirects_to_login_when_anon(self, client):
         assert resp.status_code == 302
         assert resp.location.endswith('/login')
 
-    def test_index_redirects_to_admin_for_admin(self, client):
+    def test_index_redirects_admin_to_the_same_page_as_owner(self, client):
         login_as(client, BOB_PORT1, BOB_PASS)
         resp = client.get('/')
         assert resp.status_code == 302
-        assert '/admin/' in resp.location
+        assert resp.location.endswith('/me/'), resp.location
 
     def test_index_redirects_to_me_for_owner(self, client):
         login_as(client, ALICE_PORT1, ALICE_PASS)
diff --git a/tests/webadmin/test_nav.py b/tests/webadmin/test_nav.py
new file mode 100644
index 0000000..3615e00
--- /dev/null
+++ b/tests/webadmin/test_nav.py
@@ -0,0 +1,82 @@
+"""The main menu: the same tabs for everyone, extra ones for admins."""
+import re
+
+from _test_helpers import (ALICE_PASS, ALICE_PORT1, BOB_PASS, BOB_PORT1,
+                           login_as)
+
+SHARED = ['Dashboard', 'Video', 'Logs']
+ADMIN_ONLY = ['All entries', 'Connections', 'Server']
+
+
+def _nav(html):
+    m = re.search(r'<nav class="main-nav".*?</nav>', html, re.S)
+    assert m, 'no main menu on the page'
+    return m.group(0)
+
+
+def _tabs(html):
+    return re.findall(r'<a [^>]*>([^<]+)</a>', _nav(html))
+
+
+def _current(html):
+    return re.findall(r'<a [^>]*class="[^"]*\bcurrent\b[^"]*"[^>]*>([^<]+)</a>',
+                      _nav(html))
+
+
+class TestMainMenu:
+    def test_owner_gets_the_shared_tabs_only(self, client):
+        login_as(client, ALICE_PORT1, ALICE_PASS)
+        html = client.get('/me/').get_data(as_text=True)
+        assert _tabs(html) == SHARED
+
+    def test_admin_gets_the_shared_tabs_then_the_admin_ones(self, client):
+        login_as(client, BOB_PORT1, BOB_PASS)
+        html = client.get('/me/').get_data(as_text=True)
+        assert _tabs(html) == SHARED + ADMIN_ONLY
+
+    def test_no_menu_for_a_visitor_who_is_not_logged_in(self, client):
+        html = client.get('/login').get_data(as_text=True)
+        assert 'class="main-nav"' not in html
+
+    def test_the_current_tab_is_marked(self, client):
+        login_as(client, BOB_PORT1, BOB_PASS)
+        for url, tab in (('/me/', 'Dashboard'), ('/video/', 'Video'),
+                         ('/me/logs/', 'Logs'),
+                         ('/admin/', 'All entries'),
+                         ('/admin/connections', 'Connections'),
+                         ('/admin/system/', 'Server')):
+            html = client.get(url).get_data(as_text=True)
+            assert _current(html) == [tab], (url, _current(html))
+
+    def test_an_entrys_logs_are_still_under_all_entries(self, client):
+        from _test_helpers import ALICE_PORT2
+        login_as(client, BOB_PORT1, BOB_PASS)
+        html = client.get('/admin/logs/%d/' % ALICE_PORT2).get_data(
+            as_text=True)
+        assert _current(html) == ['All entries']
+
+    def test_who_and_log_out_are_in_the_title_bar(self, client):
+        login_as(client, BOB_PORT1, BOB_PASS)
+        html = client.get('/me/').get_data(as_text=True)
+        head = re.search(r'<header>.*?</header>', html, re.S).group(0)
+        assert 'logged in as port' in head and '(admin)' in head
+        assert 'action="/logout"' in head
+        assert 'action="/logout"' not in _nav(html)
+
+    def test_a_non_admin_reading_shared_logs_is_on_logs(self, client,
+                                                        keydb_path):
+        import keydb_lib
+        from _test_helpers import ALICE_PORT2
+        db = keydb_lib.open_db(keydb_path)
+        db.transaction_start()
+        ke = keydb_lib.KeyEntry(ALICE_PORT2)
+        assert ke.fetch(db)
+        ke.set_log_access(keydb_lib.LOG_ACCESS_LOGIN_REQUIRED)
+        ke.store(db)
+        db.transaction_prepare_commit()
+        db.transaction_commit()
+        db.close()
+        login_as(client, ALICE_PORT1, ALICE_PASS)
+        resp = client.get('/admin/logs/%d/' % ALICE_PORT2)
+        assert resp.status_code == 200
+        assert _current(resp.get_data(as_text=True)) == ['Logs']
diff --git a/webadmin/__init__.py b/webadmin/__init__.py
index 4cc3544..344c0d1 100644
--- a/webadmin/__init__.py
+++ b/webadmin/__init__.py
@@ -126,9 +126,8 @@ def create_app(test_config=None):
 
     @app.route('/')
     def index():
-        from .auth import is_admin, current_owner
-        if is_admin():
-            return redirect(url_for('admin.list_entries'))
+        from .auth import current_owner
+        # One landing page for everyone, admins included.
         if current_owner() is not None:
             return redirect(url_for('owner.me'))
         return redirect(url_for('auth.login'))
diff --git a/webadmin/static/style.css b/webadmin/static/style.css
index 1d97181..2b59bbf 100644
--- a/webadmin/static/style.css
+++ b/webadmin/static/style.css
@@ -9,11 +9,29 @@ header h1 { font-size: 1.2rem; margin: 0; color: #fff; }
 header .brand { display: flex; align-items: center; gap: 0.6rem;
                 text-decoration: none; color: inherit; }
 header .brand .logo { height: 2.4rem; width: auto; display: block; }
-header nav { display: flex; gap: 1rem; align-items: center; font-size: 0.9rem; }
-header nav a { color: #fff; }
-header nav form.inline { display: inline; }
-header nav button { background: #fff; color: #3a7cb3; border: 1px solid #2a5e88; }
-header nav button:hover { background: #e6f0fa; }
+
+/* Main menu: one row of pill buttons, the same for everyone. Admin tabs
+   follow the shared ones after a gap. */
+nav.main-nav { display: flex; flex-wrap: wrap; align-items: center;
+               gap: 0.5rem; margin: 0 0 1rem; }
+nav.main-nav a { padding: 0.4rem 0.9rem; border: 1px solid #b8c4d0;
+                 border-radius: 6px; background: #fff; color: #2050a0;
+                 text-decoration: none; font-size: 0.95rem; }
+nav.main-nav a:hover { background: #e6f0fa; }
+nav.main-nav a.current { background: #3a7cb3; border-color: #2a5e88;
+                         color: #fff; }
+nav.main-nav a.admin-first { margin-left: 1rem; }
+@media (max-width: 650px) { nav.main-nav a.admin-first { margin-left: 0; } }
+
+/* Who is logged in, and Log out, at the right of the title bar. */
+header { flex-wrap: wrap; gap: 0.4rem 1rem; }
+header .who { display: flex; align-items: center; gap: 0.8rem;
+              font-size: 0.9rem; white-space: nowrap; margin-left: auto; }
+header .who form.inline { display: inline; margin: 0; }
+header .who button { background: #fff; color: #3a7cb3;
+                     border: 1px solid #2a5e88; border-radius: 6px;
+                     padding: 0.3rem 0.8rem; font-size: 0.9rem; }
+header .who button:hover { background: #e6f0fa; }
 main { padding: 0.5rem 0; }
 
 .field { margin: 0.5rem 0; }
diff --git a/webadmin/templates/admin_connections.html b/webadmin/templates/admin_connections.html
index 8363367..cee44d6 100644
--- a/webadmin/templates/admin_connections.html
+++ b/webadmin/templates/admin_connections.html
@@ -3,7 +3,7 @@
 {% block auto_refresh_seconds %}5{% endblock %}
 {% block content %}
 <h2>Active connections ({{ active | length }})</h2>
-<p><a href="{{ url_for('admin.list_entries') }}">&larr; all entries</a></p>
+<p><a href="{{ url_for('admin.list_entries') }}">&larr; All entries</a></p>
 <table class="entries">
   <thead><tr>
     <th>port1</th><th>port2</th><th>name</th>
diff --git a/webadmin/templates/admin_logs.html b/webadmin/templates/admin_logs.html
index a1eb059..3a1a96c 100644
--- a/webadmin/templates/admin_logs.html
+++ b/webadmin/templates/admin_logs.html
@@ -8,7 +8,7 @@ <h2>Logs for {{ entry.port1 }}/{{ entry.port2 }} '{{ entry.name }}'</h2>
 <p>
   {% if can_manage %}
   <a href="{{ url_for('admin.edit', port2=entry.port2) }}">edit entry</a> ·
-  <a href="{{ url_for('admin.list_entries') }}">all entries</a>
+  <a href="{{ url_for('admin.list_entries') }}">All entries</a>
   {% if entry.video_enabled() and entry.active_video_ports() %}
   · <a href="{{ url_for('video.index', port2=entry.port2) }}">watch live video &rarr;</a>
   {% endif %}
diff --git a/webadmin/templates/base.html b/webadmin/templates/base.html
index d64847c..f58c416 100644
--- a/webadmin/templates/base.html
+++ b/webadmin/templates/base.html
@@ -14,23 +14,48 @@
          width="245" height="88" fetchpriority="high">
     <h1>{{ config.WEBUI_TITLE }}</h1>
   </a>
-  <nav>
-    {% if session.get('owner') %}
-      <span>logged in as port {{ session['owner'] }}{% if session.get('is_admin') %} (admin){% endif %}</span>
-      {% if session.get('is_admin') %}
-        <a href="{{ url_for('admin.list_entries') }}">all entries</a>
-        <a href="{{ url_for('admin.connections') }}">connections</a>
-        <a href="{{ url_for('system.index') }}">server</a>
-      {% endif %}
-      <a href="{{ url_for('owner.me') }}">my entry</a>
-      <a href="{{ url_for('video.index') }}">video</a>
-      <form method="post" action="{{ url_for('auth.logout') }}" class="inline">
-        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-        <button type="submit">log out</button>
-      </form>
-    {% endif %}
-  </nav>
+  {% if session.get('owner') %}
+  <div class="who">
+    <span>logged in as port {{ session['owner'] }}{% if session.get('is_admin') %} (admin){% endif %}</span>
+    <form method="post" action="{{ url_for('auth.logout') }}" class="inline">
+      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+      <button type="submit">Log out</button>
+    </form>
+  </div>
+  {% endif %}
 </header>
+{% if session.get('owner') %}
+{#
+  One menu for everyone, in one order; admins get extra tabs after the
+  shared ones. Who is logged in, and Log out, are in the header.
+
+  The tab for the page being viewed is marked. An admin looking at an
+  entry's logs is still on All entries; anyone else reading them (the
+  shared read-only link) is on Logs.
+#}
+{% macro tab(href, label, active, extra='') -%}
+<a href="{{ href }}"
+   {%- if extra or active %} class="{{ extra }}{{ ' ' if extra and active }}{{ 'current' if active }}"{% endif %}
+   {%- if active %} aria-current="page"{% endif %}>{{ label }}</a>
+{%- endmacro %}
+{% set ep = request.endpoint or '' %}
+{% set bp = request.blueprint or '' %}
+{% set admin = session.get('is_admin') %}
+<nav class="main-nav" aria-label="Main">
+  {{ tab(url_for('owner.me'), 'Dashboard', bp == 'owner') }}
+  {{ tab(url_for('video.index'), 'Video', bp == 'video') }}
+  {{ tab(url_for('owner_logs.owner_dates'), 'Logs',
+         bp == 'owner_logs' or (bp == 'admin_logs' and not admin)) }}
+  {% if admin %}
+    {{ tab(url_for('admin.list_entries'), 'All entries',
+           bp in ('admin', 'admin_logs') and ep != 'admin.connections',
+           'admin-first') }}
+    {{ tab(url_for('admin.connections'), 'Connections',
+           ep == 'admin.connections') }}
+    {{ tab(url_for('system.index'), 'Server', bp == 'system') }}
+  {% endif %}
+</nav>
+{% endif %}
 <main>
   {% with msgs = get_flashed_messages(with_categories=true) %}
     {% for cat, msg in msgs %}
diff --git a/webadmin/templates/owner.html b/webadmin/templates/owner.html
index a4f10ad..8a90c67 100644
--- a/webadmin/templates/owner.html
+++ b/webadmin/templates/owner.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% from "_macros.html" import row, check, tip %}
-{% block title %}My entry — {{ config.WEBUI_TITLE }}{% endblock %}
+{% block title %}Dashboard — {{ config.WEBUI_TITLE }}{% endblock %}
 {% block auto_refresh_seconds %}5{% endblock %}
 {% block content %}
 <h2>Active connections ({{ active | length }})</h2>
diff --git a/webadmin/templates/owner_logs.html b/webadmin/templates/owner_logs.html
index d5fae91..4fa7c84 100644
--- a/webadmin/templates/owner_logs.html
+++ b/webadmin/templates/owner_logs.html
@@ -5,7 +5,7 @@
 {% block content %}
 <h2>My logs ({{ entry.port1 }}/{{ entry.port2 }})</h2>
 
-<p><a href="{{ url_for('owner.me') }}">back to my entry</a>
+<p><a href="{{ url_for('owner.me') }}">back to the dashboard</a>
   {% if entry.video_enabled() and entry.active_video_ports() %}
   · <a href="{{ url_for('video.index') }}">watch live video &rarr;</a>
   {% endif %}