diff --git a/Moonlight/Core/UI/Components/Partials/AppHeader.razor b/Moonlight/Core/UI/Components/Partials/AppHeader.razor
index 89ac6ba5..1d4b7ba2 100644
--- a/Moonlight/Core/UI/Components/Partials/AppHeader.razor
+++ b/Moonlight/Core/UI/Components/Partials/AppHeader.razor
@@ -22,15 +22,21 @@
         <div class="app-navbar flex-grow-1 justify-content-end">
 
             <div class="app-navbar-item ms-2 ms-lg-6 me-8">
-                <ConnectionIndicator />
+                <ConnectionIndicator/>
             </div>
 
             @if (IdentityService.IsLoggedIn)
             {
                 <div class="app-navbar-item ms-2 ms-lg-6 me-8">
+                    <div class="btn btn-active-light d-flex align-items-center bg-hover-light py-2 px-2 px-md-3" id="dropdownMenuLink" data-bs-toggle="dropdown">
+                        <div class="d-none d-md-flex flex-column align-items-end justify-content-center me-5">
+                            <span class="text-muted fs-7 fw-semibold lh-1 mb-2">Welcome,</span>
+                            <span class="text-gray-900 fs-base fw-bold lh-1">@@masuowo</span>
+                        </div>
 
-                    <div class="cursor-pointer symbol symbol-circle symbol-40px symbol-lg-45px" id="dropdownMenuLink" data-bs-toggle="dropdown">
-                        <img src="/api/core/avatar" alt="Avatar">
+                        <div class="symbol symbol-30px symbol-md-40px">
+                            <img src="/api/core/avatar" alt="Avatar">
+                        </div>
                     </div>
 
                     <div class="dropdown-menu dropdown-menu-end menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-800 menu-state-bg menu-state-color fw-semibold py-4 fs-6 w-275px" aria-labelledby="dropdownMenuLink">