diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index db2cb92e9..842b66673 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -1162,7 +1162,8 @@
         },
         "settingsDialog": {
             "description": "Manage your personal notification preferences here. Cloudron will send an email for the selected events to your primary email address."
-        }
+        },
+        "allCaughtUp": "All caught up"
     },
     "logs": {
         "title": "Logs",
diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json
index 81c1d600a..8c9ca31b1 100644
--- a/dashboard/public/translation/nl.json
+++ b/dashboard/public/translation/nl.json
@@ -43,7 +43,9 @@
             "close": "Sluiten",
             "no": "Nee",
             "yes": "Ja",
-            "delete": "Verwijder"
+            "delete": "Verwijder",
+            "edit": "Bewerk",
+            "done": "Klaar"
         },
         "username": "Gebruikersnaam",
         "displayName": "Naam",
@@ -519,7 +521,13 @@
         "changeBackgroundImage": {
             "title": "Stel achtergrond afbeelding in"
         },
-        "enable2FANotAvailable": "Niet beschikbaar voor gebruikers met een externe authenticatie bron"
+        "enable2FANotAvailable": "Niet beschikbaar voor gebruikers met een externe authenticatie bron",
+        "removeApiToken": {
+            "title": "Weet je zeker dat je deze token wilt verwijderen?"
+        },
+        "removeAppPassword": {
+            "title": "Weet je zeker dat je dit wachtwoord wilt verwijderen?"
+        }
     },
     "backups": {
         "title": "Backups",
@@ -1148,7 +1156,9 @@
             "appDocsUrl": "Bekijk de <a target=\"_blank\" href=\"{{ docsUrl }}\">{{ title }} documentatie</a> voor informatie en tips over deze app. Indien je meer hulp nodig hebt ga dan naar Cloudron's <a target=\"_blank\" href=\"{{ forumUrl }}\">{{ title }} forum</a>.",
             "sso": "Deze app is ingesteld voor authenticatie via het Cloudron gebuikersadresboek. Cloudron gebruikers kunnen inloggen en het direct gebruiken.",
             "ssoEmail": "Deze app is zodanig ingesteld dat alle gebruikers met een e-mailbox op deze Cloudron toegang hebben. Log in met je e-mailadres en wachtwoord voor toegang tot die e-mailbox.",
-            "checklist": "Admin Controlelijst"
+            "checklist": "Admin Controlelijst",
+            "checklistShow": "Toon Controlelijst",
+            "checklistHide": "Verberg Controlelijst"
         },
         "uninstallDialog": {
             "uninstallAction": "De-installeer",
@@ -1845,7 +1855,7 @@
         "signInAction": "Aanmelden",
         "password": "Wachtwoord",
         "resetPasswordAction": "Herstel wachtwoord",
-        "2faToken": "2FA Token (indien ingeschakeld)",
+        "2faToken": "2FA Token",
         "errorIncorrectCredentials": "Onjuiste gebruikersnaam of wachtwoord",
         "errorIncorrect2FAToken": "2FA token is niet geldig",
         "errorInternal": "Interne fout, probeer later opnieuw",
diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue
index 907232ee9..9307fa30f 100644
--- a/dashboard/src/Index.vue
+++ b/dashboard/src/Index.vue
@@ -233,7 +233,7 @@ onMounted(async () => {
             <a class="sidebar-item" :class="{ active: activeSidebarItem === 'backups' }" v-show="profile.isAtLeastAdmin" href="#/backups" @click="onSidebarClose()"><i class="fa fa-archive fa-fw"></i> {{ $t('backups.title') }}</a>
             <a class="sidebar-item" :class="{ active: activeSidebarItem === 'branding' }" v-show="profile.isAtLeastAdmin" href="#/branding" @click="onSidebarClose()"><i class="fa fa-passport fa-fw"></i> {{ $t('branding.title') }}</a>
             <a class="sidebar-item" :class="{ active: activeSidebarItem === 'domains' }" v-show="profile.isAtLeastAdmin" href="#/domains" @click="onSidebarClose()"><i class="fa fa-globe fa-fw"></i> {{ $t('domains.title') }}</a>
-            <div class="sidebar-item actionable" v-show="profile.isAtLeastMailManager" @click="onToggleGroup('email')"><i class="fa fa-envelope fa-fw"></i> {{ $t('emails.title') }}</div>
+            <div class="sidebar-item" v-show="profile.isAtLeastMailManager" @click="onToggleGroup('email')"><i class="fa fa-envelope fa-fw"></i> {{ $t('emails.title') }}</div>
             <Transition name="sidebar-item-group-animation">
               <div class="sidebar-item-group" v-if="activeSidebarGroup === 'email'">
                 <a class="sidebar-item" :class="{ active: activeSidebarItem === 'emails-mailboxes' }" href="#/emails-mailboxes" @click="onSidebarClose()"><i class="fa fa-inbox fa-fw"></i> {{ $t('email.incoming.mailboxes.title') }}</a>
@@ -326,6 +326,7 @@ onMounted(async () => {
   border-radius: 3px;
   padding: 10px 15px;
   white-space: nowrap;
+  cursor: pointer;
 }
 
 .sidebar-item i {
diff --git a/dashboard/src/components/Headerbar.vue b/dashboard/src/components/Headerbar.vue
index e2098e443..c861d9abc 100644
--- a/dashboard/src/components/Headerbar.vue
+++ b/dashboard/src/components/Headerbar.vue
@@ -62,7 +62,7 @@ onMounted(async () => {
   <div class="headerbar">
     <Popover ref="notificationPopover" :width="'min(80%, 400px)'" :height="'min(80%, 600px)'">
       <div style="padding: 10px; display: flex; flex-direction: column; overflow: hidden; height: 100%;">
-        <div style="overflow: auto; margin-bottom: 10px">
+        <div v-if="notifications.length" style="overflow: auto; margin-bottom: 10px">
           <div class="notification-item" v-for="notification in notifications" :key="notification.id">
             <div class="notification-item-title" @click="notification.isCollapsed = !notification.isCollapsed">
               {{ notification.title }}
@@ -74,7 +74,10 @@ onMounted(async () => {
             </div>
           </div>
         </div>
-        <Button @click="onMarkAllNotificationRead()" :loading="notificationsAllBusy" :disabled="notificationsAllBusy">{{ $t('notifications.markAllAsRead') }}</Button>
+        <Button v-if="notifications.length" @click="onMarkAllNotificationRead()" :loading="notificationsAllBusy" :disabled="notificationsAllBusy">{{ $t('notifications.markAllAsRead') }}</Button>
+        <div v-if="notifications.length === 0" class="notification-item-empty-placeholder">
+          {{ $t('notifications.allCaughtUp') }}
+        </div>
       </div>
     </Popover>
 
@@ -140,10 +143,7 @@ onMounted(async () => {
   display: flex;
   justify-content: space-between;
   align-items: center;
-}
-
-.notification-item:hover .notification-item-title {
-  font-weight: bold;
+  gap: 6px;
 }
 
 .notification-read-button {
diff --git a/dashboard/src/views/AppsView.vue b/dashboard/src/views/AppsView.vue
index 015477567..3232d2454 100644
--- a/dashboard/src/views/AppsView.vue
+++ b/dashboard/src/views/AppsView.vue
@@ -290,14 +290,12 @@ onUnmounted(() => {
       </div>
 
       <div class="empty-placeholder" v-if="apps.length === 0">
-        <!-- for admins -->
+        <!-- admins or not-->
         <div v-if="profile.isAtLeastAdmin">
           <h4>{{ $t('apps.noApps.title') }}</h4>
           <h5 v-html="$t('apps.noApps.description', { appStoreLink: '#/appstore' })"></h5>
         </div>
-
-        <!-- for non-admins -->
-        <div v-if="!profile.isAtLeastAdmin">
+        <div v-else>
           <h4>{{ $t('apps.noAccess.title') }}</h4>
           <h5>{{ $t('apps.noAccess.description') }}</h5>
         </div>
@@ -456,7 +454,8 @@ onUnmounted(() => {
 }
 
 .empty-placeholder {
-  margin-top: 20px;
+  font-size: 18px;
+  margin: 10px;
 }
 
 </style>