diff --git a/core/templates/base.html b/core/templates/base.html
index 032443c..e5dc640 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -67,31 +67,25 @@
                             <i class="fas fa-receipt me-1"></i> Receipts
                         </a>
                     </li>
+                    {% if user.is_staff %}
+                    <li class="nav-item">
+                        <a class="nav-link" href="{% url 'admin:index' %}">
+                            <i class="fas fa-cog me-1"></i> Admin
+                        </a>
+                    </li>
+                    {% endif %}
                 </ul>
                 <ul class="navbar-nav">
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle d-flex align-items-center" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            <i class="fas fa-user-circle me-2 fs-5"></i>
-                            {{ user.username }}
-                        </a>
-                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
-                            {% if user.is_staff %}
-                            <li>
-                                <a class="dropdown-item" href="{% url 'admin:index' %}">
-                                    <i class="fas fa-cog me-2 text-secondary"></i> Admin Panel
-                                </a>
-                            </li>
-                            <li><hr class="dropdown-divider"></li>
-                            {% endif %}
-                            <li>
-                                <form method="post" action="{% url 'logout' %}" class="px-3 py-2">
-                                    {% csrf_token %}
-                                    <button type="submit" class="btn btn-danger w-100 btn-sm">
-                                        <i class="fas fa-sign-out-alt me-1"></i> Logout
-                                    </button>
-                                </form>
-                            </li>
-                        </ul>
+                    <li class="nav-item d-flex align-items-center">
+                        <span class="nav-link text-light pe-2">
+                            <i class="fas fa-user-circle me-1"></i> {{ user.username }}
+                        </span>
+                        <form method="post" action="{% url 'logout' %}">
+                            {% csrf_token %}
+                            <button type="submit" class="btn btn-outline-danger btn-sm">
+                                <i class="fas fa-sign-out-alt me-1"></i> Logout
+                            </button>
+                        </form>
                     </li>
                 </ul>
             </div>