diff --git a/phronCare.UIBlazor/Shared/Components/PhLoginState.razor b/phronCare.UIBlazor/Shared/Components/PhLoginState.razor
new file mode 100644
index 0000000..462e748
--- /dev/null
+++ b/phronCare.UIBlazor/Shared/Components/PhLoginState.razor
@@ -0,0 +1,22 @@
+@using System.Security.Claims
+<AuthorizeView>
+    <Authorized Context="authContext">
+        <div class="d-flex justify-content-end align-items-center gap-3 px-3 py-2">
+            <span class="fw-bold text-dark">
+                Bienvenido, @GetUserDisplayName(authContext.User)
+            </span>
+            <a href="Logout" class="btn btn-sm btn-danger rounded-3 d-flex align-items-center gap-1 text-decoration-none">
+                <i class="oi oi-account-logout"></i>
+                <span>Cerrar sesión</span>
+            </a>
+        </div>
+    </Authorized>
+</AuthorizeView>
+@code {
+    private string GetUserDisplayName(ClaimsPrincipal user)
+    {
+        return user.FindFirst("fullName")?.Value
+            ?? user.Identity?.Name
+            ?? "Usuario";
+    }
+}
diff --git a/phronCare.UIBlazor/Shared/LoginView.razor.css b/phronCare.UIBlazor/Shared/Components/PhLoginState.razor.css
similarity index 100%
rename from phronCare.UIBlazor/Shared/LoginView.razor.css
rename to phronCare.UIBlazor/Shared/Components/PhLoginState.razor.css
diff --git a/phronCare.UIBlazor/Shared/LoginView.razor b/phronCare.UIBlazor/Shared/LoginView.razor
deleted file mode 100644
index d99e622..0000000
--- a/phronCare.UIBlazor/Shared/LoginView.razor
+++ /dev/null
@@ -1,14 +0,0 @@
-<AuthorizeView>
-    <Authorized>
-        <span>Bienvenido, @(context.User.FindFirst("fullName")?.Value ?? context.User.Identity?.Name)!</span>
-
-        <a href="Logout" class="btn-logout">
-            <i class="oi oi-account-logout"></i>
-            &nbsp;Cerrar sesión
-        </a>
-    </Authorized>
-    <NotAuthorized>
-        <a href="Registro">Registrarse</a>
-        <a href="Login" class="nav-link btn btn-link">Ingresar</a>
-    </NotAuthorized>
-</AuthorizeView>
\ No newline at end of file
diff --git a/phronCare.UIBlazor/Shared/MainLayout.razor b/phronCare.UIBlazor/Shared/MainLayout.razor
index 4221a33..23e93dd 100644
--- a/phronCare.UIBlazor/Shared/MainLayout.razor
+++ b/phronCare.UIBlazor/Shared/MainLayout.razor
@@ -22,7 +22,7 @@
                                 </PhToggle>
                             </div>
                             <div class="col-md-8" style="text-align: right;">
-                                <LoginView />
+                                <PhLoginState/>
                             </div>
                         </div>
                     </div>
diff --git a/phronCare.UIBlazor/phronCare.UIBlazor.csproj b/phronCare.UIBlazor/phronCare.UIBlazor.csproj
index 1f00485..9d23a0c 100644
--- a/phronCare.UIBlazor/phronCare.UIBlazor.csproj
+++ b/phronCare.UIBlazor/phronCare.UIBlazor.csproj
@@ -26,8 +26,4 @@
     <ProjectReference Include="..\Transversal\Transversal.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Interfaces\" />
-  </ItemGroup>
-
 </Project>