diff --git a/aircox/templates/aircox/base.html b/aircox/templates/aircox/base.html
index 8c3c02a..5e42e48 100644
--- a/aircox/templates/aircox/base.html
+++ b/aircox/templates/aircox/base.html
@@ -62,18 +62,10 @@ Usefull context:
                         {% for item, render in items %}
                         {{ render }}
                         {% endfor %}
-                        {% if user.is_staff %}
-                        <a class="nav-item" href="{% url "admin:index" %}" target="new">
-                            {% translate "Admin" %}
-                        </a>
-                        {% endif %}
-                        {% if user.is_authenticated %}
-                        <a class="nav-item" href="{% url "logout" %}" title="{% translate "Disconnect" %}"
-                            aria-label="{% translate "Disconnect" %}">
-                            <i class="fa fa-power-off"></i>
-                        </a>
-                        {% endif %}
                         {% endblock %}
+                        {% if user.is_authenticated %}
+                        {% include "./dashboard/nav.html" %}
+                        {% endif %}
                     </div>
                     {% endblock %}
                 </nav>
diff --git a/aircox/templates/aircox/dashboard/nav.html b/aircox/templates/aircox/dashboard/nav.html
new file mode 100644
index 0000000..82ffd71
--- /dev/null
+++ b/aircox/templates/aircox/dashboard/nav.html
@@ -0,0 +1,27 @@
+{% load i18n %}
+<div class="dropdown is-hoverable is-right">
+    <div class="dropdown-trigger">
+        <button class="button square" aria-haspopup="true" aria-controls="dropdown-menu" type="button">
+            <span class="icon">
+                <i class="fa fa-user" aria-hidden="true"></i>
+            </span>
+        </button>
+    </div>
+    <div class="dropdown-menu" id="dropdown-menu" role="menu" style="z-index:200">
+        <div class="dropdown-content">
+            {% block user-menu %}
+            {% endblock %}
+            {% if user.is_admin %}
+            {% block admin-menu %}
+            <a class="nav-item" href="{% url "admin:index" %}" target="new">
+                {% translate "Admin" %}
+            </a>
+            {% endblock %}
+            <hr class="dropdown-divider" />
+            {% endif %}
+            <a class="dropdown-item" href="{% url "logout" %}">
+                {% translate "Disconnect" %}
+            </a>
+        </div>
+    </div>
+</div>