diff --git a/views/layouts/base.njk b/views/layouts/base.njk
index 773fd80..b240ed1 100644
--- a/views/layouts/base.njk
+++ b/views/layouts/base.njk
@@ -18,20 +18,30 @@
         <ul id="main-menu">
             <li><a href="{{ route('about') }}"><i data-feather="info"></i> <span class="tip">About</span></a></li>
             {% if user %}
-                <li><a href="{{ route('file-manager') }}"><i data-feather="folder"></i> <span class="tip">File manager</span></a></li>
-                <li><a href="{{ route('file-upload') }}"><i data-feather="upload"></i> <span class="tip">Upload file</span></a></li>
-                <li><a href="{{ route('url-manager') }}"><i data-feather="link"></i> <span class="tip">URL manager</span></a></li>
-                <li><a href="{{ route('url-shrinker') }}"><i data-feather="crosshair"></i> <span class="tip">Shrink URL</span></a></li>
+                <li><a href="{{ route('file-manager') }}"><i data-feather="folder"></i> <span class="tip">File manager</span></a>
+                    <ul class="dropdown">
+                        <li><a href="{{ route('file-upload') }}"><i data-feather="upload"></i> <span class="tip">Upload file</span></a></li>
+                    </ul>
+                </li>
+                <li><a href="{{ route('url-manager') }}"><i data-feather="link"></i> <span class="tip">URL manager</span></a>
+                    <ul class="dropdown">
+                        <li><a href="{{ route('url-shrinker') }}"><i data-feather="crosshair"></i> <span class="tip">Shrink URL</span></a></li>
+                    </ul>
+                </li>
                 {% if user.is_admin %}
                     <li><a href="{{ route('backend') }}"><i data-feather="settings"></i> <span class="tip">Backend</span></a></li>
                 {% endif %}
-                <li><a href="{{ route('account') }}"><i data-feather="user"></i> <span class="tip">Account</span></a></li>
-                <li>
-                    <form action="{{ route('logout') }}?{{ querystring.stringify({redirect_uri: '/'}) }}" method="POST">
-                        <button><i data-feather="log-out"></i> <span class="tip">Logout</span></button>
+                <li><a href="{{ route('account') }}"><i data-feather="user"></i> <span class="tip">{{ user.name | default('Account') }}</span></a>
+                    <ul class="dropdown">
+                        <li>
+                            <hr>
+                            <form action="{{ route('logout') }}?{{ querystring.stringify({redirect_uri: '/'}) }}" method="POST">
+                                <button><i data-feather="log-out"></i> <span class="tip">Logout</span></button>
 
-                        {{ macros.csrf(getCsrfToken) }}
-                    </form>
+                                {{ macros.csrf(getCsrfToken) }}
+                            </form>
+                        </li>
+                    </ul>
                 </li>
             {% else %}
                 <li><a href="{{ route('auth') }}"><i data-feather="user"></i> <span class="tip">Login / Register</span></a></li>