diff --git a/theme/templates/base.html b/theme/templates/base.html
index 66a813c..3b117e6 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -77,27 +77,17 @@
           </svg>          
         </button>
         {% if user.is_authenticated %}
-          <div class="dropdown dropdown-end hidden sm:block">
-            <div tabindex="0" role="button" class="btn btn-ghost btn-circle avatar">
+          <div class="hidden sm:block">
+            <div class="btn btn-ghost btn-circle avatar">
               <div class="w-10 rounded-full">
-                {{ user.email|gravatar_no_hover:40 }}
+                <a tabindex="0" role="button" href="{% url 'dashboard' %}">{{ user.email|gravatar_no_hover:40 }}</a>
               </div>
             </div>
-            <ul
-              tabindex="0"
-              class="menu menu-sm dropdown-content bg-base-100 rounded-box z-1 mt-3 w-32 p-2 shadow">
-              <li>
-                <a class="justify-between" href="{% url 'dashboard' %}">
-                  Dashboard
-                </a>
-              </li>
-              <li><a href="{% url 'account_logout' %}">Sign Out</a></li>
-            </ul>
           </div>
       {% else %}
         <div class="flex gap-2">
-          <a class="btn btn-primary" href="{% url 'account_login' %}">Login</a>
-          <a class="btn btn-secondary" href="{% url 'account_signup' %}">Sign Up</a>
+          <a tabindex="0" role="button" class="btn btn-primary" href="{% url 'account_login' %}">Login</a>
+          <a tabindex="1" role="button" class="btn btn-secondary" href="{% url 'account_signup' %}">Sign Up</a>
         </div>
       {% endif %}
     </div>