diff --git a/qgis-app/static/style/scss/bulma/components/navbar.sass b/qgis-app/static/style/scss/bulma/components/navbar.sass
index f21ba45..4af983f 100644
--- a/qgis-app/static/style/scss/bulma/components/navbar.sass
+++ b/qgis-app/static/style/scss/bulma/components/navbar.sass
@@ -167,7 +167,7 @@ body
   color: $navbar-item-color
   display: block
   line-height: 1.5
-  padding: 0.5rem 1.75rem
+  padding: 0.5rem 1rem
   position: relative
   .icon
     &:only-child
diff --git a/qgis-app/static/style/scss/style.scss b/qgis-app/static/style/scss/style.scss
index 844c5b0..da60d84 100644
--- a/qgis-app/static/style/scss/style.scss
+++ b/qgis-app/static/style/scss/style.scss
@@ -179,7 +179,7 @@ p {
     &.is-active {
       display: block;
       position: fixed;
-      height: 88dvh;
+      height: calc(100% - 112px);
       overflow: auto;
       left: 0;
       animation: slideInFromLeft 0.3s ease-out forwards;
diff --git a/qgis-app/templates/layouts/header.html b/qgis-app/templates/layouts/header.html
index 1ec5430..0dbd956 100644
--- a/qgis-app/templates/layouts/header.html
+++ b/qgis-app/templates/layouts/header.html
@@ -65,6 +65,12 @@
                             {% endif %}
                         </div>
                     </div>
+                    {% if user.is_authenticated and user.is_staff %}
+                    <a class="navbar-item has-text-weight-semibold is-size-7" href="/admin">
+                        <i class="fas fa-tools mr-3"></i>
+                        {% trans "Admin" %}
+                    </a>
+                    {% endif %}
 
                 </div>
                 <div class="navbar-end">
@@ -78,9 +84,19 @@
                     </div>
                     <div class="navbar-item">
                         {% if user.is_authenticated %}
-                        <a class="button is-danger is-small is-outlined" href="{% url "logout" %}">{% trans "Logout" %}</a>
+                        <a class="button is-danger is-small is-outlined is-fullwidth" href="{% url "logout" %}">
+                            <span class="icon">
+                                <i class="fas fa-sign-out-alt"></i>
+                            </span>
+                            <span>
+                                {% trans "Logout" %}
+                            </span>
+                        </a>
                         {% else %}
-                        <a class="button is-info is-small" href="{% url "login" %}">{% trans "Login" %}</a>
+                        <a class="button is-info is-small" href="{% url "login" %}">
+                            <i class="fas fa-sign-in-alt mr-3"></i>
+                            {% trans "Login" %}
+                        </a>
                         {% endif %}
                         {% block navigation_extra %}
                         {% endblock %}