diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php
index 5e6ad6a14..66f0af399 100644
--- a/app/templates/element/menuMain.php
+++ b/app/templates/element/menuMain.php
@@ -51,17 +51,6 @@
         ]
       ];
 
-      if(count($vv_available_cos) > 1) {
-        // More than one CO is available, so present the switcher
-        $menuItems[] = [
-          'controller' => 'cos',
-          'action'     => 'select',
-          'permission' => null,
-          'icon'       => 'transfer_within_a_station',
-          'label'      => __d('menu', 'co.switch')
-        ];
-      }
-
       foreach($menuItems as $m) {
         if(!isset($m['permission']) || $vv_menu_permissions[ $m['permission'] ]) {
           $linkContent = '<em class="material-icons" aria-hidden="true">' . $m['icon'] . '</em>'
diff --git a/app/templates/element/menuTop.php b/app/templates/element/menuTop.php
index 01feae8c5..06ea25f00 100644
--- a/app/templates/element/menuTop.php
+++ b/app/templates/element/menuTop.php
@@ -36,11 +36,12 @@
         <em class="material-icons icon-adjust">person</em>
       </a>
       <!-- Account Dropdown -->
-      <div id="user-panel"  class="dropdown-menu" aria-labelledby="user-panel-toggle">
+      <div id="user-panel"  class="dropdown-menu <?= (count($vv_available_cos) > 1) ? ' with-co-switcher' : ''; ?>" aria-labelledby="user-panel-toggle">
         <div id="logout-in-panel">
           <?= $this->Html->link(__d('operation','logout') . ' <span class="fa fa-sign-out"></span>',
             '/auth/logout/logout.php',
             ['escape'     => false,
+             'id'         => 'logout-in-panel-link',
              'class'      => 'btn']);
           ?>
         </div>
@@ -49,6 +50,16 @@
           <div id="user-panel-cn"><?= $vv_user['username']; ?></div>
           <div id="user-panel-id"><!-- XXX identifier goes here --></div>
         </div>
+        <?php if(count($vv_available_cos) > 1): // More than one CO is available, so present the switch button ?>
+          <div id="user-panel-switch-co">
+            <?= $this->Html->link(__d('menu','co.switch') . ' <em class="material-icons" aria-hidden="true">transfer_within_a_station</em>',
+              '/cos/select',
+              ['escape'     => false,
+               'id'         => 'co-switch-link',
+               'class'      => 'btn']);
+            ?>
+          </div>  
+        <?php endif; ?>
       </div>
     </li>
   </ul>
diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php
index 765f49a50..356bd917b 100644
--- a/app/templates/layout/default.php
+++ b/app/templates/layout/default.php
@@ -79,6 +79,8 @@
     $controller_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', strtolower($this->request->getParam('controller')));
     $action_stripped = preg_replace('/[^a-zA-Z0-9\-_]/', '', strtolower($this->request->getParam('action')));
     $bodyClasses = $controller_stripped . ' ' .$action_stripped;
+    $isCoSelectView = $controller_stripped == 'cos' && $action_stripped == 'select';
+    $isDashboard = $controller_stripped == 'dashboards' && $action_stripped == 'dashboard';
 
     // add further body classes as needed
     if(!empty($vv_user)) {
@@ -95,7 +97,7 @@
     <!-- Primary layout -->
     <div id="comanage-wrapper">
       <div id="top-bar">
-        <?php if(!empty($vv_user) && !empty($vv_cur_co)): ?>
+        <?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView): ?>
           <div id="co-hamburger"><em class="material-icons">menu</em></div>
         <?php endif; // vv_user ?>
         <nav id="top-menu">
@@ -106,7 +108,9 @@
       <header id="banner">
         <div id="siteTitle">
           <!-- XXX Sanitize $vv_cur_co['name'] -->
-          <?php if(!empty($vv_cur_co)): ?>
+          <?php if($isCoSelectView): // just print the name ?>
+            <?= __('registry.meta.registry') ?>
+          <?php elseif(!empty($vv_cur_co)): ?>
             <?= $this->Html->link(
               $vv_cur_co['name'],
               ['controller' => 'Dashboards',
@@ -136,7 +140,7 @@
       </header>
 
       <div id="main-wrapper">
-        <?php if(!empty($vv_user) && !empty($vv_cur_co)): ?>
+        <?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView): ?>
           <div id="navigation-drawer">
             <nav id="navigation" aria-label="main menu">
               <?= $this->element('menuMain'); ?>
@@ -147,8 +151,7 @@
         <main id="main">
           <div id="content">
             <div id="content-inner">
-              <?php if(!(($controller_stripped == 'cos' && $action_stripped == 'select') ||
-                         ($controller_stripped == 'dashboards' && $action_stripped == 'dashboard'))): ?>
+              <?php if(!($isCoSelectView || $isDashboard)): ?>
                 <!-- insert breadcrumbs on all but the front page ("Select Collaborations")
                      and Dashboards (including the CO landing page) -->
                 <div id="breadcrumbs">
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 462ac938f..8a90af79a 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -264,6 +264,22 @@ body.logged-in #top-menu {
 #user-panel #panel-orgid {
   margin-top: 0;
 }
+#user-panel.with-co-switcher {
+  padding-bottom: 0;
+}
+#user-panel #user-panel-switch-co {
+  clear: both;
+  text-align: center;
+  border-top: 1px solid var(--cmg-color-lightgray-006);
+  margin-top: 4em;
+  padding: 0;
+}
+#user-panel #co-switch-link {
+  text-transform: unset;
+  font-size: 1.1em;
+  display: block;
+  padding: 1em;
+}
 /* LOGIN & LOGOUT */
 #login {
   margin-top: -2px;