diff --git a/src/content/themes/default/index.php b/src/content/themes/default/index.php
index eebccdb..2eb44fa 100644
--- a/src/content/themes/default/index.php
+++ b/src/content/themes/default/index.php
@@ -46,13 +46,10 @@ $().ready(function(){
   <div class="topblock-bar">
   <div id="msg"><span class="msg-text"></span><div class="msg-details"></div></div>
   <div class="bar-menu">
-    <span class="need-owner">
-      <a href="#settings" id="settings_btn"><?php _e('a_settings');?></a>
-    </span>
-    <span id="bar_auth">
-      <span id="bar_public" style="display:none"><?php _e('public_tasks');?> |</span>
-      <a href="#login" id="login_btn"><?php _e('a_login');?></a>
-      <a href="#logout" id="logout_btn"><?php _e('a_logout');?></a>
+    <a href="#settings" id="settings_btn" class="mtt-only-authorized"><?php _e('a_settings');?></a>
+    <span id="bar_public" style="display:none" class="mtt-need-auth-enabled"><?php _e('public_tasks');?></span>
+    <a href="#login" id="login_btn" class="mtt-need-auth-enabled"><?php _e('a_login');?></a>
+    <a href="#logout" id="logout_btn" class="mtt-need-auth-enabled" style="display:none" ><?php _e('a_logout');?></a>
     </span>
   </div>
   </div>
@@ -271,7 +268,7 @@ $().ready(function(){
 
 <div id="slmenucontainer" class="mtt-menu-container" style="display:none">
 <ul>
-  <li id="slmenu_list:-1" class="list-id--1 mtt-need-authorized"><div class="menu-icon"></div><a href="#alltasks"><?php _e('alltasks'); ?></a></li>
+  <li id="slmenu_list:-1" class="list-id--1 mtt-only-authorized"><div class="menu-icon"></div><a href="#alltasks"><?php _e('alltasks'); ?></a></li>
   <li class="mtt-menu-delimiter slmenu-lists-begin mtt-need-list"></li>
 </ul>
 </div>
diff --git a/src/content/themes/default/style.css b/src/content/themes/default/style.css
index 58240a6..8f2eae1 100644
--- a/src/content/themes/default/style.css
+++ b/src/content/themes/default/style.css
@@ -171,12 +171,12 @@ a { color: var(--color-link); cursor:pointer; text-decoration:underline; }
   text-align:right;
   white-space: nowrap;
 }
+.bar-menu > * {
+  margin-left: 10px;
+}
 
-#bar_auth::before { content:'\00a0| '; } /* &nbsp; = \00a0 */
-#bar_logout { display:none; }
-#mtt_body.no-need-auth #bar_auth { display:none; }
-#mtt_body.readonly .need-owner { display:none; }
-#mtt_body.readonly #bar_auth::before { display:none; }
+
+#mtt_body.no-need-auth .mtt-need-auth-enabled { display:none; }
 
 #page_login {
   max-width: 250px;
@@ -850,7 +850,7 @@ li.mtt-item-hidden { display:none; }
 #slmenucontainer li.mtt-list-hidden a { font-style:italic; }
 #cmenulistscontainer li.mtt-list-hidden { font-style:italic; }
 #mtt_body.readonly .mtt-need-list { display:none; }
-#mtt_body.readonly .mtt-need-authorized { display:none; }
+#mtt_body.readonly .mtt-only-authorized { display:none; }
 
 /**/
 
@@ -926,8 +926,6 @@ li.mtt-item-hidden { display:none; }
     text-overflow: ellipsis; /* min-width of parent flex is required for this */
   }
 
-  #login_btn, #logout_btn { padding-right:1px; }
-
   .mtt-img-button { padding:4px; }
   .mtt-menu-button { padding:4px; }
   h3.page-title a.mtt-back-button { width:2rem; }