diff --git a/templates/layout_manage.html b/templates/layout_manage.html
index 2919be6..070b309 100644
--- a/templates/layout_manage.html
+++ b/templates/layout_manage.html
@@ -11,20 +11,27 @@
   <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" href="#">{{ admin_unit.name }}</a>
+        <a class="navbar-brand" 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">
           <ul class="flex-column navbar-nav w-100 justify-content-between">
-            {{ render_submenu_item('reviews', _('Reviews'), url_for('manage_admin_unit_event_reviews', id=admin_unit.id), active_id) }}
             {{ render_submenu_item('events', _('Events'), url_for('manage_admin_unit_events', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('references_incoming', _('Incoming references'), url_for('manage_admin_unit_references_incoming', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('references_outgoing', _('Outgoing references'), url_for('manage_admin_unit_references_outgoing', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('reference_requests_incoming', _('Incoming reference requests'), url_for('manage_admin_unit_reference_requests_incoming', id=admin_unit.id), active_id) }}
-            {{ render_submenu_item('reference_requests_outgoing', _('Outgoing reference requests'), url_for('manage_admin_unit_reference_requests_outgoing', 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) }}
+            <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' }}
+              </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') }}</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) }}
diff --git a/views/manage.py b/views/manage.py
index 79c1a40..381ac34 100644
--- a/views/manage.py
+++ b/views/manage.py
@@ -1,9 +1,9 @@
 from app import app, db
 from models import AdminUnit, AdminUnitMember, AdminUnitMemberInvitation, Event, EventPlace, EventReviewStatus, EventOrganizer, User
-from flask import render_template, flash, url_for, redirect, request, jsonify
+from flask import render_template, flash, url_for, redirect, request, jsonify, make_response
 from flask_babelex import gettext
 from flask_security import auth_required, roles_required, current_user
-from access import has_access, access_or_401, get_admin_units_for_manage, get_admin_unit_for_manage_or_404
+from access import has_access, access_or_401, get_admin_unit_for_manage, get_admin_units_for_manage, get_admin_unit_for_manage_or_404
 from sqlalchemy.sql import asc, func
 from sqlalchemy import and_, or_, not_
 from .utils import get_pagination_urls, permission_missing
@@ -13,6 +13,21 @@ from forms.event import FindEventForm
 @app.route("/manage")
 @auth_required()
 def manage():
+    try:
+        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 admin_unit:
+                return redirect(url_for('manage_admin_unit', id=admin_unit.id))
+    except:
+        pass
+
+    return redirect(url_for('manage_admin_units'))
+
+@app.route("/manage/admin_units")
+@auth_required()
+def manage_admin_units():
     admin_units = get_admin_units_for_manage()
     invitations = AdminUnitMemberInvitation.query.filter(AdminUnitMemberInvitation.email == current_user.email).all()
 
@@ -24,7 +39,10 @@ def manage():
 @auth_required()
 def manage_admin_unit(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    return redirect(url_for('manage_admin_unit_event_reviews', id=admin_unit.id))
+
+    response = make_response(redirect(url_for('manage_admin_unit_events', id=admin_unit.id)))
+    response.set_cookie('manage_admin_unit_id', str(admin_unit.id))
+    return response
 
 @app.route('/manage/admin_unit/<int:id>/reviews')
 @auth_required()