diff --git a/src/EventSubscriber/NavbarShowUserSubscriber.php b/src/EventSubscriber/NavbarShowUserSubscriber.php
deleted file mode 100644
index 9e3590c6..00000000
--- a/src/EventSubscriber/NavbarShowUserSubscriber.php
+++ /dev/null
@@ -1,67 +0,0 @@
-storage = $tokenStorage;
- }
-
- /**
- * @return array
- */
- public static function getSubscribedEvents(): array
- {
- return [
- ThemeEvents::THEME_NAVBAR_USER => ['onShowUser', 100],
- ThemeEvents::THEME_SIDEBAR_USER => ['onShowUser', 100],
- ];
- }
-
- /**
- * @param ShowUserEvent $event
- */
- public function onShowUser(ShowUserEvent $event)
- {
- if (null === $this->storage->getToken()) {
- return;
- }
-
- /* @var $myUser User */
- $myUser = $this->storage->getToken()->getUser();
-
- $user = new UserModel();
- $user->setName($myUser->getAlias() ?: $myUser->getUsername())
- ->setUsername($myUser->getUsername())
- ->setIsOnline(true)
- ->setTitle($myUser->getTitle())
- ->setAvatar($myUser->getAvatar())
- ->setMemberSince($myUser->getRegisteredAt());
-
- $event->setUser($user);
- }
-}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index b0a394b1..bf1125c4 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -49,7 +49,7 @@
{% endblock %}
-{% block navbar_messages %}
+{% block navbar_start %}
{% if app.user is not null and is_granted('IS_AUTHENTICATED_REMEMBERED') %}
{% if is_granted('view_own_timesheet') %}
@@ -77,18 +77,23 @@
{% endif %}
{% endblock %}
-{% block navbar_notifications %}
- {% if app.user is not null and is_granted('IS_AUTHENTICATED_REMEMBERED') %}
- {{ render(controller('App\\Controller\\NavbarController::recentActivitiesAction')) }}
- {% endif %}
-{% endblock %}
-{# deactivated blocks #}
+{# these blocks and the hook-in logic by the AdminTheme could be re-used by Kimai or an extension at some point #}
+{#
+{% block navbar_messages %}{% endblock %}
+{% block navbar_notifications %}{% endblock %}
{% block navbar_tasks %}{% endblock %}
+{% block navbar_end %}{% endblock %}
+#}
+
+{# deactivated blocks, as Kimai does not ship the sidebar for UX reasons #}
{% block sidebar_user %}{% endblock %}
{% block sidebar_search %}{% endblock %}
{% block navbar_user %}
+ {% if app.user is not null and is_granted('IS_AUTHENTICATED_REMEMBERED') %}
+ {{ render(controller('App\\Controller\\NavbarController::recentActivitiesAction')) }}
+ {% endif %}
{% import "macros/widgets.html.twig" as widgets %}