diff --git a/apps/frontend/app/clan/[clanName]/page.tsx b/apps/frontend/app/clan/[clanName]/page.tsx
index a2ff795..df08783 100644
--- a/apps/frontend/app/clan/[clanName]/page.tsx
+++ b/apps/frontend/app/clan/[clanName]/page.tsx
@@ -157,7 +157,7 @@ export default async function Index({
         players={clan.clanPlayerInfos.map((playerInfo, index) => ({
           rank: index + 1,
           name: playerInfo.player.name,
-          clan: clanName,
+          clan: playerInfo.player.clanName ?? undefined,
           isActiveClan: playerInfo.player.clanName === clanName,
           playTime: playerInfo.playTime,
           lastSeenAt: playerInfo.player.lastSeenAt,
diff --git a/apps/frontend/components/PlayerList.tsx b/apps/frontend/components/PlayerList.tsx
index d38f460..0a17454 100644
--- a/apps/frontend/components/PlayerList.tsx
+++ b/apps/frontend/components/PlayerList.tsx
@@ -43,7 +43,7 @@ export function PlayerList({
     },
     {
       title: (
-        <>
+        <span className="flex flex-row items-center gap-2 whitespace-nowrap">
           Name
           <Suspense>
             <EyeToggle
@@ -52,7 +52,7 @@ export function PlayerList({
               param="shared"
               value="hidden"
               visibleWhenSet={false}
-              className="ml-3"
+              className="ml-1"
             />
             {showInactiveToggle && (
               <EyeToggle
@@ -61,11 +61,10 @@ export function PlayerList({
                 param="past"
                 value="true"
                 visibleWhenSet={true}
-                className="ml-2"
               />
             )}
           </Suspense>
-        </>
+        </span>
       ),
       expand: true,
     },