diff --git a/client/src/pages/Home.tsx b/client/src/pages/Home.tsx
index 70fb8ed..4cc84b4 100644
--- a/client/src/pages/Home.tsx
+++ b/client/src/pages/Home.tsx
@@ -79,17 +79,17 @@ export default function Home() {
                 />
               </div>
               
+              <Button 
+                variant="ghost" 
+                size="sm"
+                onClick={() => setLocation("/auctions")}
+                data-testid="button-auctions"
+              >
+                Auctions
+              </Button>
+              
               {isAuthenticated && user ? (
                 <>
-                  <Button 
-                    variant="ghost" 
-                    size="sm"
-                    onClick={() => setLocation("/auctions")}
-                    data-testid="button-auctions"
-                  >
-                    Auctions
-                  </Button>
-                  
                   <Button 
                     variant="ghost" 
                     size="sm"
@@ -99,11 +99,18 @@ export default function Home() {
                     Admin Dashboard
                   </Button>
                   
-                  <div className="flex items-center space-x-2 px-3 py-1 bg-gray-100 rounded-md">
+                  <div className="flex items-center gap-2 px-3 py-1 bg-gray-100 rounded-md">
                     <User className="h-4 w-4 text-gray-600" />
-                    <span className="text-sm font-medium text-gray-700" data-testid="user-name">
-                      {user.firstName} {user.lastName}
-                    </span>
+                    <div className="flex flex-col">
+                      <span className="text-sm font-medium text-gray-700" data-testid="user-name">
+                        {user.firstName} {user.lastName}
+                      </span>
+                      {user.role && (
+                        <span className="text-xs text-gray-500 capitalize" data-testid="user-role">
+                          {user.role === 'superadmin' ? 'SuperAdmin' : user.role}
+                        </span>
+                      )}
+                    </div>
                   </div>
                   
                   <Button 
@@ -120,29 +127,21 @@ export default function Home() {
                   <Button 
                     variant="ghost" 
                     size="sm"
-                    onClick={() => setLocation("/auctions")}
-                    data-testid="button-auctions"
+                    data-testid="button-settings"
                   >
-                    Auctions
+                    <Settings className="h-4 w-4" />
                   </Button>
+                  
                   <Button 
                     variant="ghost" 
                     size="sm"
                     onClick={() => setIsLoginModalOpen(true)}
                     data-testid="button-login"
                   >
-                    Login
+                    <User className="h-4 w-4" />
                   </Button>
                 </>
               )}
-              
-              <Button 
-                variant="ghost" 
-                size="sm"
-                data-testid="button-settings"
-              >
-                <Settings className="h-4 w-4" />
-              </Button>
             </div>
           </div>
         </div>
diff --git a/client/src/pages/Landing.tsx b/client/src/pages/Landing.tsx
index db0d46f..fdbea62 100644
--- a/client/src/pages/Landing.tsx
+++ b/client/src/pages/Landing.tsx
@@ -5,7 +5,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/u
 import { useToast } from "@/hooks/use-toast";
 import { apiRequest, queryClient } from "@/lib/queryClient";
 import { useMutation } from "@tanstack/react-query";
-import { Search, Settings } from "lucide-react";
+import { Search, Settings, User } from "lucide-react";
 import MainContent from "@/components/MainContent";
 
 export default function Landing() {
@@ -85,14 +85,13 @@ export default function Landing() {
       <header className="bg-white border-b border-gray-200 sticky top-0 z-50">
         <div className="max-w-7xl mx-auto px-6 py-4">
           <div className="flex items-center justify-between">
-            <div className="flex items-center space-x-6">
+            <div className="flex items-center">
               <img 
                 src="/attached_assets/logo_black_1759162717640.png" 
                 alt="SAPIENS" 
                 className="h-6 w-auto"
                 data-testid="logo-sapiens"
               />
-              <span className="text-sm text-gray-600 font-medium">Nostra</span>
             </div>
             
             <div className="flex items-center space-x-4">
@@ -109,18 +108,18 @@ export default function Landing() {
               <Button 
                 variant="ghost" 
                 size="sm"
-                onClick={handleLogin}
-                data-testid="button-login"
+                data-testid="button-settings"
               >
-                관리자 페이지
+                <Settings className="h-4 w-4" />
               </Button>
               
               <Button 
                 variant="ghost" 
                 size="sm"
-                data-testid="button-settings"
+                onClick={handleLogin}
+                data-testid="button-login"
               >
-                <Settings className="h-4 w-4" />
+                <User className="h-4 w-4" />
               </Button>
             </div>
           </div>