diff --git a/site/src/components/ActivityDetail.svelte b/site/src/components/ActivityDetail.svelte
index ea242f8..5025455 100644
--- a/site/src/components/ActivityDetail.svelte
+++ b/site/src/components/ActivityDetail.svelte
@@ -70,7 +70,17 @@
     return DOMPurify.sanitize(marked(rawDescription, { renderer }) as string);
   })();
 
-  $: imageBase = `${base}data/activities/images/${activity.id}/`;
+  // Derive image dir from detail_url so multi-user paths resolve correctly.
+  // "dave/_merged/activities/foo.json" → "/data/dave/_merged/activities/images/{id}/"
+  $: imageBase = (() => {
+    const du = activity.detail_url ?? '';
+    const dir = du.startsWith('http')
+      ? du.substring(0, du.lastIndexOf('/') + 1)
+      : du.includes('/')
+        ? `${base}data/${du.substring(0, du.lastIndexOf('/') + 1)}`
+        : `${base}data/activities/`;
+    return `${dir}images/${activity.id}/`;
+  })();
   $: galleryImages = (detail?.custom as any)?.images as string[] ?? [];
 
 
diff --git a/site/src/layouts/Base.astro b/site/src/layouts/Base.astro
index 7439464..5411cff 100644
--- a/site/src/layouts/Base.astro
+++ b/site/src/layouts/Base.astro
@@ -155,40 +155,48 @@ try {
       <a href={baseUrl} class="font-bold text-white tracking-tight hover:text-[--accent] transition-colors">
         Bincio<span class="text-[--accent]">Activity</span>
       </a>
-      <!-- Feed tab: only shown for multi-user (more than one shard) -->
-      {!singleHandle && (
-        <a href={baseUrl} class="text-sm text-zinc-400 hover:text-white transition-colors">Feed</a>
-      )}
-      <!-- Single-user: static handle link. Multi-user: populated by user-widget script. -->
-      {singleHandle
-        ? <a href={`${baseUrl}u/${singleHandle}/`} class="text-sm text-zinc-400 hover:text-white transition-colors">@{singleHandle}</a>
-        : <a id="nav-me" href="#" style="display:none" class="text-sm text-[--accent] hover:text-white transition-colors"></a>
-      }
-      <!-- Per-user nav links — updated by user-widget script in multi-user mode -->
-      <a id="nav-stats"   href={singleHandle ? `${baseUrl}u/${singleHandle}/stats/`   : `${baseUrl}stats/`}   data-user-path="stats/"   class="text-sm text-zinc-400 hover:text-white transition-colors">Stats</a>
-      <a id="nav-athlete" href={singleHandle ? `${baseUrl}u/${singleHandle}/athlete/` : `${baseUrl}athlete/`} data-user-path="athlete/" class="text-sm text-zinc-400 hover:text-white transition-colors">Athlete</a>
-      {mobileApp && (
-        <a id="nav-record" href={singleHandle ? `${baseUrl}u/${singleHandle}/record/` : `${baseUrl}record/`} data-user-path="record/" class="text-sm text-zinc-400 hover:text-white transition-colors">Record</a>
-      )}
-      {mobileApp && (
-        <a href={`${baseUrl}convert/`} class="text-sm text-zinc-400 hover:text-white transition-colors">Convert</a>
+      {!isPublicPage && (
+        <>
+          <!-- Feed tab: only shown for multi-user (more than one shard) -->
+          {!singleHandle && (
+            <a href={baseUrl} class="text-sm text-zinc-400 hover:text-white transition-colors">Feed</a>
+          )}
+          <!-- Single-user: static handle link. Multi-user: populated by user-widget script. -->
+          {singleHandle
+            ? <a href={`${baseUrl}u/${singleHandle}/`} class="text-sm text-zinc-400 hover:text-white transition-colors">@{singleHandle}</a>
+            : <a id="nav-me" href="#" style="display:none" class="text-sm text-[--accent] hover:text-white transition-colors"></a>
+          }
+          <!-- Per-user nav links — updated by user-widget script in multi-user mode -->
+          <a id="nav-stats"   href={singleHandle ? `${baseUrl}u/${singleHandle}/stats/`   : `${baseUrl}stats/`}   data-user-path="stats/"   class="text-sm text-zinc-400 hover:text-white transition-colors">Stats</a>
+          <a id="nav-athlete" href={singleHandle ? `${baseUrl}u/${singleHandle}/athlete/` : `${baseUrl}athlete/`} data-user-path="athlete/" class="text-sm text-zinc-400 hover:text-white transition-colors">Athlete</a>
+          {mobileApp && (
+            <a id="nav-record" href={singleHandle ? `${baseUrl}u/${singleHandle}/record/` : `${baseUrl}record/`} data-user-path="record/" class="text-sm text-zinc-400 hover:text-white transition-colors">Record</a>
+          )}
+          {mobileApp && (
+            <a href={`${baseUrl}convert/`} class="text-sm text-zinc-400 hover:text-white transition-colors">Convert</a>
+          )}
+        </>
       )}
 
       <div class="ml-auto flex items-center gap-1">
-        <!-- Logout button — hidden until logged in -->
-        <button
-          id="nav-logout"
-          style="display:none"
-          class="text-xs text-zinc-500 hover:text-white transition-colors px-2 h-8"
-          aria-label="Log out"
-        >Log out</button>
-        {editEnabled && (
-          <button
-            id="upload-btn"
-            class="text-zinc-400 hover:text-white transition-colors w-8 h-8 flex items-center justify-center rounded-md hover:bg-zinc-800 text-base"
-            aria-label="Upload activity"
-            title="Upload activity"
-          >↑</button>
+        {!isPublicPage && (
+          <>
+            <!-- Logout button — hidden until logged in -->
+            <button
+              id="nav-logout"
+              style="display:none"
+              class="text-xs text-zinc-500 hover:text-white transition-colors px-2 h-8"
+              aria-label="Log out"
+            >Log out</button>
+            {editEnabled && (
+              <button
+                id="upload-btn"
+                class="text-zinc-400 hover:text-white transition-colors w-8 h-8 flex items-center justify-center rounded-md hover:bg-zinc-800 text-base"
+                aria-label="Upload activity"
+                title="Upload activity"
+              >↑</button>
+            )}
+          </>
         )}
         <button
           id="theme-toggle"