diff --git a/messages.pot b/messages.pot
index 213a833..b0ea7ea 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-08-06 08:22+0200\n"
+"POT-Creation-Date: 2021-08-06 13:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,24 +165,24 @@ msgstr ""
 msgid "."
 msgstr ""
 
-#: project/forms/admin.py:10 project/templates/layout.html:259
+#: project/forms/admin.py:10 project/templates/layout.html:329
 #: project/views/root.py:42
 msgid "Terms of service"
 msgstr ""
 
-#: project/forms/admin.py:11 project/templates/layout.html:263
+#: project/forms/admin.py:11 project/templates/layout.html:333
 #: project/views/root.py:50
 msgid "Legal notice"
 msgstr ""
 
 #: project/forms/admin.py:12 project/templates/_macros.html:1280
-#: project/templates/layout.html:267
+#: project/templates/layout.html:337
 #: project/templates/widget/event_suggestion/create.html:172
 #: project/views/admin_unit.py:36 project/views/root.py:58
 msgid "Contact"
 msgstr ""
 
-#: project/forms/admin.py:13 project/templates/layout.html:271
+#: project/forms/admin.py:13 project/templates/layout.html:341
 #: project/views/root.py:66
 msgid "Privacy"
 msgstr ""
@@ -698,7 +698,7 @@ msgid "Enter new organizer"
 msgstr ""
 
 #: project/forms/event.py:276 project/templates/event/create.html:4
-#: project/templates/event/create.html:195
+#: project/templates/event/create.html:195 project/templates/layout.html:254
 #: project/templates/manage/events.html:12
 #: project/templates/manage/organizers.html:21
 msgid "Create event"
@@ -929,6 +929,7 @@ msgstr ""
 #: project/templates/_macros.html:521 project/templates/_macros.html:681
 #: project/templates/admin_unit/create.html:19
 #: project/templates/admin_unit/update.html:20
+#: project/templates/layout.html:284
 msgid "Organization"
 msgstr ""
 
@@ -1186,7 +1187,7 @@ msgstr ""
 msgid "Other calendar"
 msgstr ""
 
-#: project/templates/home.html:27 project/templates/layout.html:205
+#: project/templates/home.html:27
 msgid "Manage"
 msgstr ""
 
@@ -1195,22 +1196,31 @@ msgstr ""
 msgid "Register for free"
 msgstr ""
 
-#: project/templates/event_place/read.html:22 project/templates/layout.html:208
-#: project/templates/layout_manage.html:24
-#: project/templates/manage/events.html:5
+#: project/templates/event_place/read.html:22 project/templates/layout.html:204
+#: project/templates/layout.html:247 project/templates/manage/events.html:5
 #: project/templates/manage/events.html:9
 msgid "Events"
 msgstr ""
 
-#: project/templates/layout.html:209
+#: project/templates/layout.html:205
 msgid "Planing"
 msgstr ""
 
-#: project/templates/layout.html:210
+#: project/templates/layout.html:206
 msgid "Example"
 msgstr ""
 
-#: project/templates/layout.html:219
+#: project/templates/admin/admin.html:19
+#: project/templates/admin/admin_units.html:4
+#: project/templates/admin/admin_units.html:11
+#: project/templates/layout.html:215
+#: project/templates/manage/admin_units.html:3
+#: project/templates/manage/admin_units.html:16
+#: project/templates/profile.html:60
+msgid "Organizations"
+msgstr ""
+
+#: project/templates/layout.html:216
 #: project/templates/oauth2_client/list.html:10
 #: project/templates/oauth2_client/read.html:10
 #: project/templates/oauth2_token/list.html:10 project/templates/profile.html:4
@@ -1220,87 +1230,89 @@ msgstr ""
 
 #: project/templates/admin/admin.html:3 project/templates/admin/admin.html:9
 #: project/templates/admin/admin_units.html:10
-#: project/templates/admin/users.html:10 project/templates/layout.html:222
+#: project/templates/admin/users.html:10 project/templates/layout.html:219
 msgid "Admin"
 msgstr ""
 
-#: project/templates/layout.html:226
+#: project/templates/layout.html:223
 msgid "Logout"
 msgstr ""
 
-#: project/templates/developer/read.html:4 project/templates/layout.html:281
-#: project/templates/profile.html:29
-msgid "Developer"
+#: project/templates/layout.html:253
+msgid "Show events"
 msgstr ""
 
-#: project/templates/layout_manage.html:25
-#: project/templates/manage/organizers.html:5
-#: project/templates/manage/organizers.html:9
-msgid "Organizers"
+#: project/templates/layout.html:256
+msgid "Review suggestions"
 msgstr ""
 
-#: project/templates/event_place/list.html:3
-#: project/templates/event_place/list.html:7
-#: project/templates/layout_manage.html:26
-#: project/templates/manage/places.html:5
-#: project/templates/manage/places.html:9
-msgid "Places"
-msgstr ""
-
-#: project/templates/layout_manage.html:27
-#: project/templates/manage/reviews.html:5
-#: project/templates/manage/reviews.html:9
-msgid "Reviews"
-msgstr ""
-
-#: project/templates/layout_manage.html:30
+#: project/templates/layout.html:265
 #: project/templates/manage/references_incoming.html:5
 #: project/templates/manage/references_outgoing.html:5
 msgid "References"
 msgstr ""
 
-#: project/templates/layout_manage.html:36
+#: project/templates/layout.html:271
 #: project/templates/manage/references_incoming.html:9
 msgid "Incoming references"
 msgstr ""
 
-#: project/templates/layout_manage.html:37
+#: project/templates/layout.html:272
 #: project/templates/manage/references_outgoing.html:9
 msgid "Outgoing references"
 msgstr ""
 
-#: project/templates/layout_manage.html:38
+#: project/templates/layout.html:274
 #: project/templates/manage/reference_requests_incoming.html:9
 msgid "Incoming reference requests"
 msgstr ""
 
-#: project/templates/layout_manage.html:43
+#: project/templates/layout.html:279
 #: project/templates/manage/reference_requests_outgoing.html:9
 msgid "Outgoing reference requests"
 msgstr ""
 
-#: project/templates/layout_manage.html:46
-#: project/templates/manage/members.html:5
-#: project/templates/manage/members.html:28
-msgid "Members"
+#: project/templates/layout.html:287 project/templates/manage/organizers.html:5
+#: project/templates/manage/organizers.html:9
+msgid "Organizers"
 msgstr ""
 
-#: project/templates/layout_manage.html:47
-#: project/templates/manage/reviews.html:10
-#: project/templates/manage/widgets.html:5
-#: project/templates/manage/widgets.html:9
-msgid "Widgets"
+#: project/templates/event_place/list.html:3
+#: project/templates/event_place/list.html:7 project/templates/layout.html:288
+#: project/templates/manage/places.html:5
+#: project/templates/manage/places.html:9
+msgid "Places"
+msgstr ""
+
+#: project/templates/layout.html:290 project/templates/manage/members.html:5
+#: project/templates/manage/members.html:28
+msgid "Members"
 msgstr ""
 
 #: project/templates/admin/admin.html:15
 #: project/templates/admin/settings.html:4
 #: project/templates/admin/settings.html:8
 #: project/templates/admin_unit/update.html:14
-#: project/templates/layout_manage.html:48
-#: project/templates/manage/widgets.html:12 project/templates/profile.html:19
+#: project/templates/layout.html:291 project/templates/manage/widgets.html:12
+#: project/templates/profile.html:19
 msgid "Settings"
 msgstr ""
 
+#: project/templates/layout.html:292 project/templates/manage/reviews.html:10
+#: project/templates/manage/widgets.html:5
+#: project/templates/manage/widgets.html:9
+msgid "Widgets"
+msgstr ""
+
+#: project/templates/layout.html:302
+msgid "Switch organization"
+msgstr ""
+
+#: project/templates/developer/read.html:4 project/templates/layout.html:351
+#: project/templates/profile.html:29
+msgid "Developer"
+msgstr ""
+
 #: project/templates/profile.html:23
 msgid "Applications"
 msgstr ""
@@ -1317,15 +1329,6 @@ msgstr ""
 msgid "Invitations"
 msgstr ""
 
-#: project/templates/admin/admin.html:19
-#: project/templates/admin/admin_units.html:4
-#: project/templates/admin/admin_units.html:11
-#: project/templates/manage/admin_units.html:3
-#: project/templates/manage/admin_units.html:16
-#: project/templates/profile.html:60
-msgid "Organizations"
-msgstr ""
-
 #: project/templates/admin/admin.html:23 project/templates/admin/users.html:4
 #: project/templates/admin/users.html:11
 msgid "Users"
@@ -1570,6 +1573,11 @@ msgstr ""
 msgid "Show review status"
 msgstr ""
 
+#: project/templates/manage/reviews.html:5
+#: project/templates/manage/reviews.html:9
+msgid "Reviews"
+msgstr ""
+
 #: project/templates/manage/widgets.html:25
 msgid "Veranstaltungen als iFrame einbetten"
 msgstr ""
diff --git a/project/jinja_filters.py b/project/jinja_filters.py
index ffd9034..e6b7a2d 100644
--- a/project/jinja_filters.py
+++ b/project/jinja_filters.py
@@ -1,7 +1,7 @@
 import os
 from urllib.parse import quote_plus
 
-from flask import url_for
+from flask import request, url_for
 
 from project import app
 from project.utils import (
@@ -80,6 +80,27 @@ def get_context_processors():
             "reference_requests_incoming_badge": reference_requests_incoming_badge,
         }
 
+    def get_current_admin_unit():
+        from flask_security import current_user
+
+        from project.access import get_admin_unit_for_manage, get_admin_units_for_manage
+
+        admin_unit = None
+
+        if current_user.is_authenticated:
+            if "manage_admin_unit_id" in request.cookies:
+                manage_admin_unit_id = int(request.cookies.get("manage_admin_unit_id"))
+                admin_unit = get_admin_unit_for_manage(manage_admin_unit_id)
+
+            if not admin_unit:
+                admin_units = get_admin_units_for_manage()
+
+                if len(admin_units) > 0:
+                    admin_unit = admin_units[0]
+
+        return admin_unit
+
     return dict(
+        current_admin_unit=get_current_admin_unit(),
         get_manage_menu_options=get_manage_menu_options,
     )
diff --git a/project/templates/admin_unit/invite_member.html b/project/templates/admin_unit/invite_member.html
index d08d5a1..5223b8e 100644
--- a/project/templates/admin_unit/invite_member.html
+++ b/project/templates/admin_unit/invite_member.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "members" %}
 {% from "_macros.html" import render_field_with_errors, render_field %}
 {% block content %}
diff --git a/project/templates/admin_unit/update.html b/project/templates/admin_unit/update.html
index 1303164..e41104f 100644
--- a/project/templates/admin_unit/update.html
+++ b/project/templates/admin_unit/update.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "settings" %}
 {% from "_macros.html" import render_admin_unit_form_script, render_jquery_steps_header, render_cropper_logo_block, render_crop_image_form_section, render_google_place_autocomplete_header, render_google_place_autocomplete_field, render_field_with_errors, render_field %}
 
diff --git a/project/templates/admin_unit/update_member.html b/project/templates/admin_unit/update_member.html
index 5c0f287..15550ce 100644
--- a/project/templates/admin_unit/update_member.html
+++ b/project/templates/admin_unit/update_member.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "members" %}
 {% from "_macros.html" import render_field_with_errors, render_field %}
 {% block content %}
diff --git a/project/templates/event_suggestion/reject.html b/project/templates/event_suggestion/reject.html
index cbf8472..a9d3f51 100644
--- a/project/templates/event_suggestion/reject.html
+++ b/project/templates/event_suggestion/reject.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "reviews" %}
 {% from "_macros.html" import render_event_suggestion, render_image, render_radio_buttons, render_phone_prop, render_email_prop, render_string_prop, render_field_with_errors, render_field, render_event_props, render_image_with_link, render_place, render_link_prop %}
 {%- block title -%}
diff --git a/project/templates/event_suggestion/review.html b/project/templates/event_suggestion/review.html
index 54ec5be..34c0e2b 100644
--- a/project/templates/event_suggestion/review.html
+++ b/project/templates/event_suggestion/review.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "reviews" %}
 {% from "_macros.html" import render_event_suggestion, render_image, render_radio_buttons, render_phone_prop, render_email_prop, render_string_prop, render_field_with_errors, render_field, render_event_props, render_image_with_link, render_place, render_link_prop %}
 {%- block title -%}
diff --git a/project/templates/layout.html b/project/templates/layout.html
index a89a5a3..5b3d0ed 100644
--- a/project/templates/layout.html
+++ b/project/templates/layout.html
@@ -192,7 +192,7 @@
         {% endif %}
       {%- endblock gtm_body %}
       {% block navbar %}
-      <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+      <nav class="navbar navbar-expand-md navbar-dark bg-dark">
           <a class="navbar-brand" href="{{ url_for('home') }}">
             <img src="{{ url_for('static', filename='calendar_icon_90.png')}}" width="30" height="30" class="d-inline-block align-top rounded" alt="Logo"> Oveda
           </a>
@@ -201,10 +201,6 @@
           </button>
           <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
               <div class="navbar-nav mr-auto">
-                {% if current_user.is_authenticated %}
-                <a class="nav-item nav-link" href="{{ url_for('manage') }}">{{ _('Manage') }}</a>
-                {% endif %}
-
                 <a class="nav-item nav-link" href="{{ url_for('event_dates') }}">{{ _('Events') }}</a>
                 <a class="nav-item nav-link" href="{{ url_for('planing') }}">{{ _('Planing') }}</a>
                 <a class="nav-item nav-link" href="{{ url_for('example') }}">{{ _('Example') }}</a>
@@ -212,10 +208,11 @@
               <div class="navbar-nav navbar-right">
                 {% if current_user.is_authenticated %}
                   <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarUserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                       {{ current_user.email }}
                     </a>
-                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarUserDropdown">
+                      <a class="dropdown-item" href="{{ url_for('manage_admin_units') }}">{{ _('Organizations') }}</a>
                       <a class="dropdown-item" href="{{ url_for('profile') }}">{{ _('Profile') }}</a>
 
                       {% if current_user.has_role('admin') %}
@@ -236,6 +233,79 @@
           </div>
       </nav>
       {%- endblock navbar %}
+      {% if current_admin_unit %}
+      {% set menu_options = get_manage_menu_options(current_admin_unit) %}
+      <nav class="navbar navbar-expand-md navbar-light bg-light">
+          <span></span>
+          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAdminUnitMarkup" aria-controls="navbarNavAdminUnitMarkup" aria-expanded="false" aria-label="Toggle navigation">
+              <span class="navbar-toggler-icon"></span>
+          </button>
+          <div class="collapse navbar-collapse" id="navbarNavAdminUnitMarkup">
+              <div class="navbar-nav mr-auto">
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle text-truncate" href="#" id="navbarAdminUnitEventsDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    {{ _('Events') }}
+                    {% if menu_options['reviews_badge'] > 0 %}
+                      <span class="badge badge-secondary badge-pill">{{ menu_options['reviews_badge'] }}</span>
+                    {% endif %}
+                  </a>
+                  <div class="dropdown-menu" aria-labelledby="navbarAdminUnitEventsDropdown">
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_events', id=current_admin_unit.id) }}">{{ _('Show events') }}</a>
+                    <a class="dropdown-item" href="{{ url_for('event_create_for_admin_unit_id', id=current_admin_unit.id) }}">{{ _('Create event') }}</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_event_reviews', id=current_admin_unit.id) }}">{{ _('Review suggestions') }}
+                      {% if menu_options['reviews_badge'] > 0 %}
+                        <span class="badge badge-secondary badge-pill">{{ menu_options['reviews_badge'] }}</span>
+                      {% endif %}
+                    </a>
+                  </div>
+                </li>
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle text-truncate" href="#" id="navbarAdminUnitReferencesDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    {{ _('References') }}
+                    {% if menu_options['reference_requests_incoming_badge'] > 0 %}
+                      <span class="badge badge-secondary badge-pill">{{ menu_options['reference_requests_incoming_badge'] }}</span>
+                    {% endif %}
+                  </a>
+                  <div class="dropdown-menu" aria-labelledby="navbarAdminUnitReferencesDropdown">
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_references_incoming', id=current_admin_unit.id) }}">{{ _('Incoming references') }}</a>
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_references_outgoing', id=current_admin_unit.id) }}">{{ _('Outgoing references') }}</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_reference_requests_incoming', id=current_admin_unit.id) }}">{{ _('Incoming reference requests') }}
+                      {% if menu_options['reference_requests_incoming_badge'] > 0 %}
+                        <span class="badge badge-secondary badge-pill">{{ menu_options['reference_requests_incoming_badge'] }}</span>
+                      {% endif %}
+                    </a>
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_reference_requests_outgoing', id=current_admin_unit.id) }}">{{ _('Outgoing reference requests') }}</a>
+                  </div>
+                </li>
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle text-truncate" href="#" id="navbarAdminUnitOrganizationDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    {{ _('Organization') }}
+                  </a>
+                  <div class="dropdown-menu" aria-labelledby="navbarAdminUnitOrganizationDropdown">
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_organizers', id=current_admin_unit.id) }}">{{ _('Organizers') }}</a>
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_event_places', id=current_admin_unit.id) }}">{{ _('Places') }}</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_members', id=current_admin_unit.id) }}">{{ _('Members') }}</a>
+                    <a class="dropdown-item" href="{{ url_for('admin_unit_update', id=current_admin_unit.id) }}">{{ _('Settings') }}</a>
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_unit_widgets', id=current_admin_unit.id) }}">{{ _('Widgets') }}</a>
+                  </div>
+                </li>
+              </div>
+              <div class="navbar-nav navbar-right">
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle" href="#" id="navbarAdminUnitSwitchDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    {{ current_admin_unit.name }}
+                  </a>
+                  <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarAdminUnitSwitchDropdown">
+                    <a class="dropdown-item" href="{{ url_for('manage_admin_units') }}">{{ _('Switch organization') }}</a>
+                  </div>
+                </li>
+              </div>
+          </div>
+      </nav>
+      {% endif %}
 
       <div class="body-content"{% block body_content__attribs %}{% endblock body_content__attribs %}>
 
diff --git a/project/templates/layout_manage.html b/project/templates/layout_manage.html
deleted file mode 100644
index 6758818..0000000
--- a/project/templates/layout_manage.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "layout.html" %}
-
-{% macro render_submenu_item(id, title, link, active_id=None, badge_count=0) %}
-  <li class="nav-item d-flex justify-content-between align-items-center">
-    <a class="nav-link pl-0{% if active_id == id %} active{% endif %}" href="{{ link }}">{{ title }}</a>
-    {% if badge_count > 0 %}
-      <span class="badge badge-secondary badge-pill">{{ badge_count }}</span>
-    {% endif %}
-  </li>
-{% endmacro %}
-
-{% block content_container -%}
-<div class="container-fluid">
-  <div class="row wrapper min-vh-100 flex-column flex-sm-row">
-    <aside class="col-12 col-sm-3 p-0 bg-light flex-shrink-1">
-      <nav class="navbar navbar-expand-sm navbar-light bg-light align-items-start flex-sm-column flex-row">
-        <a class="navbar-brand text-wrap" href="{{ url_for('manage_admin_units') }}">{{ admin_unit.name }} <i class="fa fa-exchange-alt text-muted ml-1 small"></i></a>
-        <a href class="navbar-toggler" data-toggle="collapse" data-target=".sidebar">
-          <span class="navbar-toggler-icon"></span>
-        </a>
-        <div class="collapse navbar-collapse sidebar">
-          {% set menu_options = get_manage_menu_options(admin_unit) %}
-          <ul class="flex-column navbar-nav w-100 justify-content-between">
-            {{ render_submenu_item('events', _('Events'), url_for('manage_admin_unit_events', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('organizers', _('Organizers'), url_for('manage_admin_unit_organizers', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('places', _('Places'), url_for('manage_admin_unit_event_places', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('reviews', _('Reviews'), url_for('manage_admin_unit_event_reviews', id=admin_unit.id), active_id, menu_options['reviews_badge']) }}
-            <li class="nav-item dropdown">
-              <a class="nav-link pl-0 dropdown-toggle{% if active_id.startswith('reference') %} active{% endif %}" href="#" id="navbarDropdownReferences" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                {{ _('References') }}
-                {% if menu_options['reference_requests_incoming_badge'] > 0 %}
-                  <span class="badge badge-secondary badge-pill">{{ menu_options['reference_requests_incoming_badge'] }}</span>
-                {% endif %}
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownReferences">
-                <a class="dropdown-item" href="{{ url_for('manage_admin_unit_references_incoming', id=admin_unit.id) }}">{{ _('Incoming references') }}</a>
-                <a class="dropdown-item" href="{{ url_for('manage_admin_unit_references_outgoing', id=admin_unit.id) }}">{{ _('Outgoing references') }}</a>
-                <a class="dropdown-item" href="{{ url_for('manage_admin_unit_reference_requests_incoming', id=admin_unit.id) }}">{{ _('Incoming reference requests') }}
-                  {% if menu_options['reference_requests_incoming_badge'] > 0 %}
-                    <span class="badge badge-secondary badge-pill">{{ menu_options['reference_requests_incoming_badge'] }}</span>
-                  {% endif %}
-                </a>
-                <a class="dropdown-item" href="{{ url_for('manage_admin_unit_reference_requests_outgoing', id=admin_unit.id) }}">{{ _('Outgoing reference requests') }}</a>
-              </div>
-            </li>
-            {{ render_submenu_item('members', _('Members'), url_for('manage_admin_unit_members', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('widgets', _('Widgets'), url_for('manage_admin_unit_widgets', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('settings', _('Settings'), url_for('admin_unit_update', id=admin_unit.id), active_id) }}
-          </ul>
-        </div>
-      </nav>
-    </aside>
-    <main class="col bg-faded p-3 overflow-auto">
-      {% include "_messages.html" %}
-
-      {% block content -%}
-      {%- endblock content %}
-    </main>
-  </div>
-</div>
-{%- endblock content_container %}
\ No newline at end of file
diff --git a/project/templates/manage/events.html b/project/templates/manage/events.html
index c5ae8bf..608e424 100644
--- a/project/templates/manage/events.html
+++ b/project/templates/manage/events.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "events" %}
 {% from "_macros.html" import render_event_dates_filter_form, render_event_warning_pills, render_pagination, render_event_date, render_field_with_errors, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/members.html b/project/templates/manage/members.html
index 34b5eaa..de52dd8 100644
--- a/project/templates/manage/members.html
+++ b/project/templates/manage/members.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "members" %}
 {% from "_macros.html" import render_roles, render_pagination, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/organizers.html b/project/templates/manage/organizers.html
index a85f14b..82e1534 100644
--- a/project/templates/manage/organizers.html
+++ b/project/templates/manage/organizers.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "organizers" %}
 {% from "_macros.html" import render_pagination, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/places.html b/project/templates/manage/places.html
index b3bdb7b..43d8eef 100644
--- a/project/templates/manage/places.html
+++ b/project/templates/manage/places.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "places" %}
 {% from "_macros.html" import render_pagination, render_field_with_errors, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/reference_requests_incoming.html b/project/templates/manage/reference_requests_incoming.html
index 95a5875..0c14363 100644
--- a/project/templates/manage/reference_requests_incoming.html
+++ b/project/templates/manage/reference_requests_incoming.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "reference_requests_incoming" %}
 {% from "_macros.html" import render_reference_request_review_status_pill, render_event_date, render_pagination, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/reference_requests_outgoing.html b/project/templates/manage/reference_requests_outgoing.html
index b786513..6114ac6 100644
--- a/project/templates/manage/reference_requests_outgoing.html
+++ b/project/templates/manage/reference_requests_outgoing.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "reference_requests_outgoing" %}
 {% from "_macros.html" import render_reference_request_review_status_pill, render_event_date, render_pagination, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/references_incoming.html b/project/templates/manage/references_incoming.html
index af080e4..800de13 100644
--- a/project/templates/manage/references_incoming.html
+++ b/project/templates/manage/references_incoming.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "references_incoming" %}
 {% from "_macros.html" import render_event_warning_pills, render_event_date, render_pagination, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/references_outgoing.html b/project/templates/manage/references_outgoing.html
index 255960d..9bd7d3d 100644
--- a/project/templates/manage/references_outgoing.html
+++ b/project/templates/manage/references_outgoing.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "references_outgoing" %}
 {% from "_macros.html" import render_event_warning_pills, render_event_date, render_pagination, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/reviews.html b/project/templates/manage/reviews.html
index c2a959e..2738fda 100644
--- a/project/templates/manage/reviews.html
+++ b/project/templates/manage/reviews.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "reviews" %}
 {% from "_macros.html" import render_event_review_status_pill, render_pagination, render_event_date, render_field_with_errors, render_event_organizer %}
 {%- block title -%}
diff --git a/project/templates/manage/widgets.html b/project/templates/manage/widgets.html
index e93918b..b3874a5 100644
--- a/project/templates/manage/widgets.html
+++ b/project/templates/manage/widgets.html
@@ -1,4 +1,4 @@
-{% extends "layout_manage.html" %}
+{% extends "layout.html" %}
 {% set active_id = "widgets" %}
 {% from "_macros.html" import render_pagination, render_event_date, render_field, render_field_with_errors, render_event_organizer %}
 {%- block title -%}
diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo
index 506d2c4..603ae8f 100644
Binary files a/project/translations/de/LC_MESSAGES/messages.mo and b/project/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po
index 07b214f..da760e3 100644
--- a/project/translations/de/LC_MESSAGES/messages.po
+++ b/project/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-08-06 08:22+0200\n"
+"POT-Creation-Date: 2021-08-06 13:48+0200\n"
 "PO-Revision-Date: 2020-06-07 18:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -166,24 +166,24 @@ msgstr "Event_"
 msgid "."
 msgstr "."
 
-#: project/forms/admin.py:10 project/templates/layout.html:259
+#: project/forms/admin.py:10 project/templates/layout.html:329
 #: project/views/root.py:42
 msgid "Terms of service"
 msgstr "Nutzungsbedingungen"
 
-#: project/forms/admin.py:11 project/templates/layout.html:263
+#: project/forms/admin.py:11 project/templates/layout.html:333
 #: project/views/root.py:50
 msgid "Legal notice"
 msgstr "Impressum"
 
 #: project/forms/admin.py:12 project/templates/_macros.html:1280
-#: project/templates/layout.html:267
+#: project/templates/layout.html:337
 #: project/templates/widget/event_suggestion/create.html:172
 #: project/views/admin_unit.py:36 project/views/root.py:58
 msgid "Contact"
 msgstr "Kontakt"
 
-#: project/forms/admin.py:13 project/templates/layout.html:271
+#: project/forms/admin.py:13 project/templates/layout.html:341
 #: project/views/root.py:66
 msgid "Privacy"
 msgstr "Datenschutz"
@@ -727,7 +727,7 @@ msgid "Enter new organizer"
 msgstr "Neuen Veranstalter eingeben"
 
 #: project/forms/event.py:276 project/templates/event/create.html:4
-#: project/templates/event/create.html:195
+#: project/templates/event/create.html:195 project/templates/layout.html:254
 #: project/templates/manage/events.html:12
 #: project/templates/manage/organizers.html:21
 msgid "Create event"
@@ -966,6 +966,7 @@ msgstr "Wochentage"
 #: project/templates/_macros.html:521 project/templates/_macros.html:681
 #: project/templates/admin_unit/create.html:19
 #: project/templates/admin_unit/update.html:20
+#: project/templates/layout.html:284
 msgid "Organization"
 msgstr "Organisation"
 
@@ -1225,7 +1226,7 @@ msgstr "Yahoo Kalender"
 msgid "Other calendar"
 msgstr "Anderer Kalender"
 
-#: project/templates/home.html:27 project/templates/layout.html:205
+#: project/templates/home.html:27
 msgid "Manage"
 msgstr "Verwaltung"
 
@@ -1234,22 +1235,31 @@ msgstr "Verwaltung"
 msgid "Register for free"
 msgstr "Kostenlos registrieren"
 
-#: project/templates/event_place/read.html:22 project/templates/layout.html:208
-#: project/templates/layout_manage.html:24
-#: project/templates/manage/events.html:5
+#: project/templates/event_place/read.html:22 project/templates/layout.html:204
+#: project/templates/layout.html:247 project/templates/manage/events.html:5
 #: project/templates/manage/events.html:9
 msgid "Events"
 msgstr "Veranstaltungen"
 
-#: project/templates/layout.html:209
+#: project/templates/layout.html:205
 msgid "Planing"
 msgstr "Planung"
 
-#: project/templates/layout.html:210
+#: project/templates/layout.html:206
 msgid "Example"
 msgstr "Beispiel"
 
-#: project/templates/layout.html:219
+#: project/templates/admin/admin.html:19
+#: project/templates/admin/admin_units.html:4
+#: project/templates/admin/admin_units.html:11
+#: project/templates/layout.html:215
+#: project/templates/manage/admin_units.html:3
+#: project/templates/manage/admin_units.html:16
+#: project/templates/profile.html:60
+msgid "Organizations"
+msgstr "Organisationen"
+
+#: project/templates/layout.html:216
 #: project/templates/oauth2_client/list.html:10
 #: project/templates/oauth2_client/read.html:10
 #: project/templates/oauth2_token/list.html:10 project/templates/profile.html:4
@@ -1259,87 +1269,89 @@ msgstr "Profil"
 
 #: project/templates/admin/admin.html:3 project/templates/admin/admin.html:9
 #: project/templates/admin/admin_units.html:10
-#: project/templates/admin/users.html:10 project/templates/layout.html:222
+#: project/templates/admin/users.html:10 project/templates/layout.html:219
 msgid "Admin"
 msgstr "Administration"
 
-#: project/templates/layout.html:226
+#: project/templates/layout.html:223
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: project/templates/developer/read.html:4 project/templates/layout.html:281
-#: project/templates/profile.html:29
-msgid "Developer"
-msgstr "Entwickler"
+#: project/templates/layout.html:253
+msgid "Show events"
+msgstr "Veranstaltungen anzeigen"
 
-#: project/templates/layout_manage.html:25
-#: project/templates/manage/organizers.html:5
-#: project/templates/manage/organizers.html:9
-msgid "Organizers"
-msgstr "Veranstalter"
+#: project/templates/layout.html:256
+msgid "Review suggestions"
+msgstr "Vorschläge prüfen"
 
-#: project/templates/event_place/list.html:3
-#: project/templates/event_place/list.html:7
-#: project/templates/layout_manage.html:26
-#: project/templates/manage/places.html:5
-#: project/templates/manage/places.html:9
-msgid "Places"
-msgstr "Orte"
-
-#: project/templates/layout_manage.html:27
-#: project/templates/manage/reviews.html:5
-#: project/templates/manage/reviews.html:9
-msgid "Reviews"
-msgstr "Prüfungen"
-
-#: project/templates/layout_manage.html:30
+#: project/templates/layout.html:265
 #: project/templates/manage/references_incoming.html:5
 #: project/templates/manage/references_outgoing.html:5
 msgid "References"
 msgstr "Empfehlungen"
 
-#: project/templates/layout_manage.html:36
+#: project/templates/layout.html:271
 #: project/templates/manage/references_incoming.html:9
 msgid "Incoming references"
 msgstr "Eingehende Empfehlungen"
 
-#: project/templates/layout_manage.html:37
+#: project/templates/layout.html:272
 #: project/templates/manage/references_outgoing.html:9
 msgid "Outgoing references"
 msgstr "Ausgehende Empfehlungen"
 
-#: project/templates/layout_manage.html:38
+#: project/templates/layout.html:274
 #: project/templates/manage/reference_requests_incoming.html:9
 msgid "Incoming reference requests"
 msgstr "Eingehende Empfehlungsanfragen"
 
-#: project/templates/layout_manage.html:43
+#: project/templates/layout.html:279
 #: project/templates/manage/reference_requests_outgoing.html:9
 msgid "Outgoing reference requests"
 msgstr "Ausgehende Empfehlungsanfragen"
 
-#: project/templates/layout_manage.html:46
-#: project/templates/manage/members.html:5
+#: project/templates/layout.html:287 project/templates/manage/organizers.html:5
+#: project/templates/manage/organizers.html:9
+msgid "Organizers"
+msgstr "Veranstalter"
+
+#: project/templates/event_place/list.html:3
+#: project/templates/event_place/list.html:7 project/templates/layout.html:288
+#: project/templates/manage/places.html:5
+#: project/templates/manage/places.html:9
+msgid "Places"
+msgstr "Orte"
+
+#: project/templates/layout.html:290 project/templates/manage/members.html:5
 #: project/templates/manage/members.html:28
 msgid "Members"
 msgstr "Mitglieder"
 
-#: project/templates/layout_manage.html:47
-#: project/templates/manage/reviews.html:10
-#: project/templates/manage/widgets.html:5
-#: project/templates/manage/widgets.html:9
-msgid "Widgets"
-msgstr "Widgets"
-
 #: project/templates/admin/admin.html:15
 #: project/templates/admin/settings.html:4
 #: project/templates/admin/settings.html:8
 #: project/templates/admin_unit/update.html:14
-#: project/templates/layout_manage.html:48
-#: project/templates/manage/widgets.html:12 project/templates/profile.html:19
+#: project/templates/layout.html:291 project/templates/manage/widgets.html:12
+#: project/templates/profile.html:19
 msgid "Settings"
 msgstr "Einstellungen"
 
+#: project/templates/layout.html:292 project/templates/manage/reviews.html:10
+#: project/templates/manage/widgets.html:5
+#: project/templates/manage/widgets.html:9
+msgid "Widgets"
+msgstr "Widgets"
+
+#: project/templates/layout.html:302
+msgid "Switch organization"
+msgstr "Organisation wechseln"
+
+#: project/templates/developer/read.html:4 project/templates/layout.html:351
+#: project/templates/profile.html:29
+msgid "Developer"
+msgstr "Entwickler"
+
 #: project/templates/profile.html:23
 msgid "Applications"
 msgstr "Apps"
@@ -1356,15 +1368,6 @@ msgstr "OAuth2 Clients"
 msgid "Invitations"
 msgstr "Einladungen"
 
-#: project/templates/admin/admin.html:19
-#: project/templates/admin/admin_units.html:4
-#: project/templates/admin/admin_units.html:11
-#: project/templates/manage/admin_units.html:3
-#: project/templates/manage/admin_units.html:16
-#: project/templates/profile.html:60
-msgid "Organizations"
-msgstr "Organisationen"
-
 #: project/templates/admin/admin.html:23 project/templates/admin/users.html:4
 #: project/templates/admin/users.html:11
 msgid "Users"
@@ -1611,6 +1614,11 @@ msgstr "Empfehlung anfragen"
 msgid "Show review status"
 msgstr "Prüfungsstatus anzeigen"
 
+#: project/templates/manage/reviews.html:5
+#: project/templates/manage/reviews.html:9
+msgid "Reviews"
+msgstr "Prüfungen"
+
 #: project/templates/manage/widgets.html:25
 msgid "Veranstaltungen als iFrame einbetten"
 msgstr "Veranstaltungen als iFrame einbetten"
diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo
index 1125b85..07ccd8f 100644
Binary files a/project/translations/en/LC_MESSAGES/messages.mo and b/project/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po
index 63aa5a3..ed92e3f 100644
--- a/project/translations/en/LC_MESSAGES/messages.po
+++ b/project/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-08-06 08:22+0200\n"
+"POT-Creation-Date: 2021-08-06 13:48+0200\n"
 "PO-Revision-Date: 2021-04-30 15:04+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -166,24 +166,24 @@ msgstr ""
 msgid "."
 msgstr ""
 
-#: project/forms/admin.py:10 project/templates/layout.html:259
+#: project/forms/admin.py:10 project/templates/layout.html:329
 #: project/views/root.py:42
 msgid "Terms of service"
 msgstr ""
 
-#: project/forms/admin.py:11 project/templates/layout.html:263
+#: project/forms/admin.py:11 project/templates/layout.html:333
 #: project/views/root.py:50
 msgid "Legal notice"
 msgstr ""
 
 #: project/forms/admin.py:12 project/templates/_macros.html:1280
-#: project/templates/layout.html:267
+#: project/templates/layout.html:337
 #: project/templates/widget/event_suggestion/create.html:172
 #: project/views/admin_unit.py:36 project/views/root.py:58
 msgid "Contact"
 msgstr ""
 
-#: project/forms/admin.py:13 project/templates/layout.html:271
+#: project/forms/admin.py:13 project/templates/layout.html:341
 #: project/views/root.py:66
 msgid "Privacy"
 msgstr ""
@@ -699,7 +699,7 @@ msgid "Enter new organizer"
 msgstr ""
 
 #: project/forms/event.py:276 project/templates/event/create.html:4
-#: project/templates/event/create.html:195
+#: project/templates/event/create.html:195 project/templates/layout.html:254
 #: project/templates/manage/events.html:12
 #: project/templates/manage/organizers.html:21
 msgid "Create event"
@@ -930,6 +930,7 @@ msgstr ""
 #: project/templates/_macros.html:521 project/templates/_macros.html:681
 #: project/templates/admin_unit/create.html:19
 #: project/templates/admin_unit/update.html:20
+#: project/templates/layout.html:284
 msgid "Organization"
 msgstr ""
 
@@ -1187,7 +1188,7 @@ msgstr ""
 msgid "Other calendar"
 msgstr ""
 
-#: project/templates/home.html:27 project/templates/layout.html:205
+#: project/templates/home.html:27
 msgid "Manage"
 msgstr ""
 
@@ -1196,22 +1197,31 @@ msgstr ""
 msgid "Register for free"
 msgstr ""
 
-#: project/templates/event_place/read.html:22 project/templates/layout.html:208
-#: project/templates/layout_manage.html:24
-#: project/templates/manage/events.html:5
+#: project/templates/event_place/read.html:22 project/templates/layout.html:204
+#: project/templates/layout.html:247 project/templates/manage/events.html:5
 #: project/templates/manage/events.html:9
 msgid "Events"
 msgstr ""
 
-#: project/templates/layout.html:209
+#: project/templates/layout.html:205
 msgid "Planing"
 msgstr ""
 
-#: project/templates/layout.html:210
+#: project/templates/layout.html:206
 msgid "Example"
 msgstr ""
 
-#: project/templates/layout.html:219
+#: project/templates/admin/admin.html:19
+#: project/templates/admin/admin_units.html:4
+#: project/templates/admin/admin_units.html:11
+#: project/templates/layout.html:215
+#: project/templates/manage/admin_units.html:3
+#: project/templates/manage/admin_units.html:16
+#: project/templates/profile.html:60
+msgid "Organizations"
+msgstr ""
+
+#: project/templates/layout.html:216
 #: project/templates/oauth2_client/list.html:10
 #: project/templates/oauth2_client/read.html:10
 #: project/templates/oauth2_token/list.html:10 project/templates/profile.html:4
@@ -1221,87 +1231,89 @@ msgstr ""
 
 #: project/templates/admin/admin.html:3 project/templates/admin/admin.html:9
 #: project/templates/admin/admin_units.html:10
-#: project/templates/admin/users.html:10 project/templates/layout.html:222
+#: project/templates/admin/users.html:10 project/templates/layout.html:219
 msgid "Admin"
 msgstr ""
 
-#: project/templates/layout.html:226
+#: project/templates/layout.html:223
 msgid "Logout"
 msgstr ""
 
-#: project/templates/developer/read.html:4 project/templates/layout.html:281
-#: project/templates/profile.html:29
-msgid "Developer"
+#: project/templates/layout.html:253
+msgid "Show events"
 msgstr ""
 
-#: project/templates/layout_manage.html:25
-#: project/templates/manage/organizers.html:5
-#: project/templates/manage/organizers.html:9
-msgid "Organizers"
+#: project/templates/layout.html:256
+msgid "Review suggestions"
 msgstr ""
 
-#: project/templates/event_place/list.html:3
-#: project/templates/event_place/list.html:7
-#: project/templates/layout_manage.html:26
-#: project/templates/manage/places.html:5
-#: project/templates/manage/places.html:9
-msgid "Places"
-msgstr ""
-
-#: project/templates/layout_manage.html:27
-#: project/templates/manage/reviews.html:5
-#: project/templates/manage/reviews.html:9
-msgid "Reviews"
-msgstr ""
-
-#: project/templates/layout_manage.html:30
+#: project/templates/layout.html:265
 #: project/templates/manage/references_incoming.html:5
 #: project/templates/manage/references_outgoing.html:5
 msgid "References"
 msgstr ""
 
-#: project/templates/layout_manage.html:36
+#: project/templates/layout.html:271
 #: project/templates/manage/references_incoming.html:9
 msgid "Incoming references"
 msgstr ""
 
-#: project/templates/layout_manage.html:37
+#: project/templates/layout.html:272
 #: project/templates/manage/references_outgoing.html:9
 msgid "Outgoing references"
 msgstr ""
 
-#: project/templates/layout_manage.html:38
+#: project/templates/layout.html:274
 #: project/templates/manage/reference_requests_incoming.html:9
 msgid "Incoming reference requests"
 msgstr ""
 
-#: project/templates/layout_manage.html:43
+#: project/templates/layout.html:279
 #: project/templates/manage/reference_requests_outgoing.html:9
 msgid "Outgoing reference requests"
 msgstr ""
 
-#: project/templates/layout_manage.html:46
-#: project/templates/manage/members.html:5
-#: project/templates/manage/members.html:28
-msgid "Members"
+#: project/templates/layout.html:287 project/templates/manage/organizers.html:5
+#: project/templates/manage/organizers.html:9
+msgid "Organizers"
 msgstr ""
 
-#: project/templates/layout_manage.html:47
-#: project/templates/manage/reviews.html:10
-#: project/templates/manage/widgets.html:5
-#: project/templates/manage/widgets.html:9
-msgid "Widgets"
+#: project/templates/event_place/list.html:3
+#: project/templates/event_place/list.html:7 project/templates/layout.html:288
+#: project/templates/manage/places.html:5
+#: project/templates/manage/places.html:9
+msgid "Places"
+msgstr ""
+
+#: project/templates/layout.html:290 project/templates/manage/members.html:5
+#: project/templates/manage/members.html:28
+msgid "Members"
 msgstr ""
 
 #: project/templates/admin/admin.html:15
 #: project/templates/admin/settings.html:4
 #: project/templates/admin/settings.html:8
 #: project/templates/admin_unit/update.html:14
-#: project/templates/layout_manage.html:48
-#: project/templates/manage/widgets.html:12 project/templates/profile.html:19
+#: project/templates/layout.html:291 project/templates/manage/widgets.html:12
+#: project/templates/profile.html:19
 msgid "Settings"
 msgstr ""
 
+#: project/templates/layout.html:292 project/templates/manage/reviews.html:10
+#: project/templates/manage/widgets.html:5
+#: project/templates/manage/widgets.html:9
+msgid "Widgets"
+msgstr ""
+
+#: project/templates/layout.html:302
+msgid "Switch organization"
+msgstr ""
+
+#: project/templates/developer/read.html:4 project/templates/layout.html:351
+#: project/templates/profile.html:29
+msgid "Developer"
+msgstr ""
+
 #: project/templates/profile.html:23
 msgid "Applications"
 msgstr ""
@@ -1318,15 +1330,6 @@ msgstr ""
 msgid "Invitations"
 msgstr ""
 
-#: project/templates/admin/admin.html:19
-#: project/templates/admin/admin_units.html:4
-#: project/templates/admin/admin_units.html:11
-#: project/templates/manage/admin_units.html:3
-#: project/templates/manage/admin_units.html:16
-#: project/templates/profile.html:60
-msgid "Organizations"
-msgstr ""
-
 #: project/templates/admin/admin.html:23 project/templates/admin/users.html:4
 #: project/templates/admin/users.html:11
 msgid "Users"
@@ -1571,6 +1574,11 @@ msgstr ""
 msgid "Show review status"
 msgstr ""
 
+#: project/templates/manage/reviews.html:5
+#: project/templates/manage/reviews.html:9
+msgid "Reviews"
+msgstr ""
+
 #: project/templates/manage/widgets.html:25
 msgid "Veranstaltungen als iFrame einbetten"
 msgstr ""