diff --git a/components/Nav.vue b/components/Nav.vue
index 9bf57cac..16e02103 100644
--- a/components/Nav.vue
+++ b/components/Nav.vue
@@ -11,58 +11,42 @@
         v-list-item-subtitle {{settings.description}}
 
     v-spacer
+    v-btn(v-if='$auth.loggedIn || settings.allow_anon_event' icon nuxt to='/add' :aria-label='$t("common.add_event")')
+      v-icon(large color='primary') mdi-plus
 
-    client-only(v-if='could_add')
-      v-tooltip(bottom) {{$t('common.add_event')}}
-        template(v-slot:activator='{ on }')
-          v-btn(icon nuxt to='/add' v-on='on' :aria-label='$t("common.add_event")')
-            v-icon(large color='primary') mdi-plus
-      template(#placeholder)
-        v-btn(icon nuxt to='/add' :aria-label='$t("common.add_event")')
-          v-icon(large color='primary') mdi-plus
+    v-btn(icon nuxt to='/export' :aria-label='$t("common.share")')
+      v-icon mdi-share-variant
 
+    v-btn(v-if='!$auth.loggedIn' icon nuxt to='/login' :aria-label='$t("common.login")')
+      v-icon mdi-login
 
     client-only
-      v-tooltip(bottom) {{$t('common.share')}}
-        template(v-slot:activator='{ on }')
-          v-btn(icon nuxt to='/export' v-on='on' :aria-label='$t("common.share")')
-            v-icon mdi-share-variant
-      template(#placeholder)
-        v-btn(icon nuxt to='/export' :aria-label='$t("common.share")')
-          v-icon mdi-share-variant
+      v-menu(v-if='$auth.loggedIn' offset-y)
+        template(v-slot:activator="{ on, attrs }")
+          v-btn(icon v-bind='attrs' v-on='on' aria-label='Menu')
+            v-icon mdi-dots-vertical
+        v-list
+          v-list-item(nuxt to='/settings')
+            v-list-item-icon
+              v-icon mdi-cog
+            v-list-item-content
+              v-list-item-title {{$t('common.settings')}}
 
-    client-only
-      v-tooltip(v-if='!$auth.loggedIn' bottom) {{$t('common.login')}}
-        template(v-slot:activator='{ on }')
-          v-btn(icon nuxt to='/login' v-on='on' :aria-label='$t("common.login")')
-            v-icon mdi-login
-      template(#placeholder)
-        v-btn(icon nuxt to='/login' :aria-label='$t("common.login")')
-          v-icon mdi-login
+          v-list-item(v-if='$auth.user.is_admin' nuxt to='/admin')
+            v-list-item-icon
+              v-icon mdi-account
+            v-list-item-content
+              v-list-item-title {{$t('common.admin')}}
 
-    v-menu(v-if='$auth.loggedIn')
-      offset-y(bottom open-on-hover transition="slide-y-transition")
-      template(v-slot:activator="{ on, attrs }")
-        v-btn(icon v-bind='attrs' v-on='on' aria-label='Menu')
+          v-list-item(@click='logout')
+            v-list-item-icon
+              v-icon mdi-logout
+            v-list-item-content
+              v-list-item-title {{$t('common.logout')}}
+      template(#placeholder)
+        v-btn(icon aria-label='Menu')
           v-icon mdi-dots-vertical
-      v-list
-        v-list-item(nuxt to='/settings')
-          v-list-item-icon
-            v-icon mdi-cog
-          v-list-item-content
-            v-list-item-title {{$t('common.settings')}}
 
-        v-list-item(v-if='$auth.user.is_admin' nuxt to='/admin')
-          v-list-item-icon
-            v-icon mdi-account
-          v-list-item-content
-            v-list-item-title {{$t('common.admin')}}
-
-        v-list-item(@click='logout')
-          v-list-item-icon
-            v-icon mdi-logout
-          v-list-item-content
-            v-list-item-title {{$t('common.logout')}}
 
     v-btn(icon @click='clipboard(feedLink, "common.feed_url_copied")' aria-label='RSS')
       v-icon(color='orange') mdi-rss