Index: src/views/partials/bottom-tab.ejs
===================================================================
--- src/views/partials/bottom-tab.ejs	(revision 43dbf9c41de8e6cc1512805acbe92a1f05069786)
+++ src/views/partials/bottom-tab.ejs	(revision 64b90c0e630134d0553240912a7ff41aed78fe78)
@@ -56,15 +56,4 @@
     <span class="bottom-tab-label">Zoek</span>
   </button>
-
-  <!-- Cirkel (alleen in circle-modus) -->
-  <% if (typeof tenancy !== 'undefined' && tenancy === 'circle') { %>
-    <a class="bottom-tab-item<%= _active === 'cirkel' ? ' is-active' : '' %>"
-       href="<%= _siteUrlBase %>/cirkel"
-       hx-get="<%= _siteUrlBase %>/cirkel?partial=1" hx-target="#pcms-main" hx-swap="innerHTML"
-       hx-push-url="<%= _siteUrlBase %>/cirkel" hx-indicator="#pcms-loading">
-      <svg class="bottom-tab-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="8" cy="9" r="3.2"/><circle cx="16.5" cy="15" r="3.2"/><path d="M10.6 10.9l3.3 2.4"/></svg>
-      <span class="bottom-tab-label">Cirkel</span>
-    </a>
-  <% } %>
 
   <!-- Plus (FAB-style, only when user can post) -->
Index: src/views/partials/topnav.ejs
===================================================================
--- src/views/partials/topnav.ejs	(revision 43dbf9c41de8e6cc1512805acbe92a1f05069786)
+++ src/views/partials/topnav.ejs	(revision 64b90c0e630134d0553240912a7ff41aed78fe78)
@@ -64,14 +64,4 @@
           <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 8v13H3V8"/><rect x="1" y="3" width="22" height="5" rx="1"/><line x1="10" y1="12" x2="14" y2="12"/></svg>
           <span class="nav-label">Archief</span>
-        </a>
-      <% } %>
-
-      <% if (typeof tenancy !== 'undefined' && tenancy === 'circle') { %>
-        <a class="nav-link" href="<%= _siteUrlBase %>/cirkel"
-           hx-get="<%= _siteUrlBase %>/cirkel?partial=1" hx-target="#pcms-main"
-           hx-swap="innerHTML" hx-push-url="<%= _siteUrlBase %>/cirkel"
-           hx-indicator="#pcms-loading">
-          <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="8" cy="9" r="3.2"/><circle cx="16.5" cy="15" r="3.2"/><path d="M10.6 10.9l3.3 2.4"/></svg>
-          <span class="nav-label">Cirkel</span>
         </a>
       <% } %>
Index: src/views/partials/view-switcher.ejs
===================================================================
--- src/views/partials/view-switcher.ejs	(revision 43dbf9c41de8e6cc1512805acbe92a1f05069786)
+++ src/views/partials/view-switcher.ejs	(revision 64b90c0e630134d0553240912a7ff41aed78fe78)
@@ -5,4 +5,15 @@
 <div class="view-switcher-wrap">
   <div class="container">
+    <% if (typeof tenancy !== 'undefined' && tenancy === 'circle') {
+         var _onCirkel = (typeof bodyClass === 'string' && bodyClass.indexOf('on-cirkel') >= 0);
+         var _sb = (typeof siteUrlBase !== 'undefined' && siteUrlBase) ? siteUrlBase : '';
+    %>
+    <div class="feed-scope" role="tablist" aria-label="Solo of cirkel">
+      <a class="feed-scope-btn<%= _onCirkel ? '' : ' is-active' %>" href="<%= _sb %>/"
+         role="tab" aria-selected="<%= _onCirkel ? 'false' : 'true' %>">Solo</a>
+      <a class="feed-scope-btn<%= _onCirkel ? ' is-active' : '' %>" href="<%= _sb %>/cirkel"
+         role="tab" aria-selected="<%= _onCirkel ? 'true' : 'false' %>">Cirkel</a>
+    </div>
+    <% } %>
     <div class="view-switcher" role="tablist" aria-label="Weergave">
       <button type="button" class="view-switch-btn" data-view="timeline" role="tab"