diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue
index 6e6df7695..d7f279be1 100644
--- a/dashboard/src/Index.vue
+++ b/dashboard/src/Index.vue
@@ -184,12 +184,12 @@ onMounted(async () => {
     <Transition name="pankow-animation-pop-up">
       <div v-if="ready" style="display: flex; flex-direction: row; overflow: hidden; height: 100%;">
 
-        <Sidebar :profile="profile" :config="config"/>
+        <Sidebar v-if="profile.isAtLeastUserManager" :profile="profile" :config="config"/>
 
         <div style="flex-grow: 1; display: flex; flex-direction: column; overflow: hidden; height: 100%;">
-          <Headerbar :subscription="subscription" :profile="profile"/>
+          <Headerbar :config="config" :subscription="subscription" :profile="profile"/>
 
-          <div style="overflow: auto; flex-grow: 1;">
+          <div style="display: flex; justify-content: center; overflow: auto; flex-grow: 1; padding: 0 6px;">
             <AppsView v-if="view === VIEWS.APPS" />
             <AppConfigureView v-else-if="view === VIEWS.APP" />
             <AppstoreView v-else-if="view === VIEWS.APPSTORE" />
diff --git a/dashboard/src/components/Headerbar.vue b/dashboard/src/components/Headerbar.vue
index a865f4abe..795095a4d 100644
--- a/dashboard/src/components/Headerbar.vue
+++ b/dashboard/src/components/Headerbar.vue
@@ -6,7 +6,7 @@ import { eachLimit } from 'async';
 import { Button, Popover } from 'pankow';
 import NotificationsModel from '../models/NotificationsModel.js';
 
-const props = defineProps(['profile', 'subscription']);
+const props = defineProps(['config', 'profile', 'subscription']);
 
 const notificationModel = NotificationsModel.create();
 const notificationButton = useTemplateRef('notificationButton');
@@ -53,7 +53,7 @@ async function refresh() {
 }
 
 onMounted(async () => {
-  await refresh();
+  if (props.profile.isAtLeastAdmin) await refresh();
 });
 
 </script>
@@ -80,7 +80,14 @@ onMounted(async () => {
       </div>
     </Popover>
 
+    <div v-if="!profile.isAtLeastUserManager">
+      <a href="#/" class="headerbar-logo" @click="onClose()">
+        <img :src="`https://${config.adminFqdn}/api/v1/cloudron/avatar`" width="40" height="40"/> {{ config.cloudronName || 'Cloudron' }}
+      </a>
+    </div>
+
     <div style="flex-grow: 1;"></div>
+
     <div v-show="profile.isAtLeastOwner && (subscription.plan.id === 'free' || subscription.plan.id === 'expired')" ng-click="openSubscriptionSetup()" style="cursor: pointer">
       <span class="badge" ng-class="{'badge-danger': subscription.plan.id !== 'free', 'badge-success': subscription.plan.id === 'free' }">
         {{ $t(subscription.plan.id === 'free' ? 'settings.appstoreAccount.subscriptionSetupAction' : 'settings.appstoreAccount.subscriptionReactivateAction') }}
@@ -91,7 +98,7 @@ onMounted(async () => {
     </div>
     <Button plain secondary tool v-if="profile.isAtLeastAdmin" ref="notificationButton" @click="onOpenNotifications(notificationPopover, $event, notificationButton.$el)" :icon="notifications.length ? 'fas fa-bell' : 'far fa-bell'">{{ notifications.length > 99 ? '99+' : notifications.length }}</Button>
     <Button plain secondary tool v-if="profile.isAtLeastAdmin" href="#/support" icon="fa fa-question fa-fw"/>
-    <Button plain secondary v-if="profile.isAtLeastAdmin" href="#/profile"><img :src="profile.avatarUrl" class="headerbar-avatar"/> {{ profile.username }}</Button>
+    <Button plain secondary href="#/profile"><img :src="profile.avatarUrl" class="headerbar-avatar"/> {{ profile.username }}</Button>
   </div>
 </template>
 
@@ -99,7 +106,8 @@ onMounted(async () => {
 
 .headerbar {
   display: flex;
-  padding: 6px;
+  padding: 10px;
+  padding-bottom: 6px;
   align-items: center;
   gap: 15px;
 }
@@ -116,6 +124,20 @@ onMounted(async () => {
   border-radius: var(--pankow-border-radius);
 }
 
+.headerbar-logo img {
+  margin-right: 10px;
+  border-radius: var(--pankow-border-radius);
+}
+
+.headerbar-logo,
+.headerbar-logo:hover {
+  display: flex;
+  align-items: center;
+  color: var(--pankow-text-color);
+  text-decoration: none;
+/*  padding-left: 10px;*/
+}
+
 .notification-item {
   margin-bottom: 10px;
   padding-bottom: 10px;
diff --git a/dashboard/src/components/Sidebar.vue b/dashboard/src/components/Sidebar.vue
index e9a382932..2aa93a9f4 100644
--- a/dashboard/src/components/Sidebar.vue
+++ b/dashboard/src/components/Sidebar.vue
@@ -117,6 +117,7 @@ onUnmounted(() => {
 
 .sidebar-logo img {
   margin-right: 10px;
+  border-radius: var(--pankow-border-radius);
 }
 
 .sidebar-logo,
diff --git a/dashboard/src/views/AppsView.vue b/dashboard/src/views/AppsView.vue
index 88fdefb40..a67feb497 100644
--- a/dashboard/src/views/AppsView.vue
+++ b/dashboard/src/views/AppsView.vue
@@ -201,7 +201,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div>
+  <div style="width: 100%;">
     <ApplinkDialog ref="applinkDialog" @success="refreshApps()"/>
 
     <h1 class="section-header">
diff --git a/dashboard/src/views/AppstoreView.vue b/dashboard/src/views/AppstoreView.vue
index c77a3f2e9..60b4a80d7 100644
--- a/dashboard/src/views/AppstoreView.vue
+++ b/dashboard/src/views/AppstoreView.vue
@@ -78,7 +78,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div>
+  <div style="width: 100%;">
     <AppInstallDialog ref="appInstallDialog" @close="onAppInstallDialogClose"/>
     <ApplinkDialog ref="applinkDialog" @success="onApplinkDialogSuccess()"/>
 
diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index 602ab31fc..ae84e45b7 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -163,7 +163,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div>
+  <div class="content">
     <InputDialog ref="inputDialog"/>
 
     <Dialog ref="connectionDialog"
diff --git a/dashboard/src/views/MailboxesView.vue b/dashboard/src/views/MailboxesView.vue
index 19b5524ae..1aa3a193b 100644
--- a/dashboard/src/views/MailboxesView.vue
+++ b/dashboard/src/views/MailboxesView.vue
@@ -137,7 +137,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div>
+  <div class="content">
     <Dialog ref="removeDialog"
       :title="$t('email.deleteMailboxDialog.title', { name: removeMailbox.name, domain: removeMailbox.domain })"
       :confirm-label="$t('email.deleteMailboxDialog.deleteAction')"
diff --git a/dashboard/src/views/MailinglistsView.vue b/dashboard/src/views/MailinglistsView.vue
index 907316153..91d1a87d3 100644
--- a/dashboard/src/views/MailinglistsView.vue
+++ b/dashboard/src/views/MailinglistsView.vue
@@ -100,7 +100,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div>
+  <div class="content">
     <Dialog ref="removeDialog"
       :title="$t('email.deleteMailinglistDialog.title', { name: removeMailinglist.name, domain: removeMailinglist.domain })"
       :confirm-label="$t('email.deleteMailinglistDialog.deleteAction')"