diff --git a/src/features/teams/components/team-list.tsx b/src/features/teams/components/team-list.tsx
index 2c006e0..cc8859e 100644
--- a/src/features/teams/components/team-list.tsx
+++ b/src/features/teams/components/team-list.tsx
@@ -31,7 +31,7 @@ const TeamListItem = React.memo(({ team }: TeamListItemProps) => {
 
   return (
     <Group justify="space-between" w="100%" wrap="nowrap">
-      <Text fw={500} size={teamNameSize} style={{ flexShrink: 1, minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+      <Text fw={500} size={teamNameSize} style={{ flexShrink: 1, minWidth: 0, maxWidth: 170, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
         {`${team.name}`}
       </Text>
       <Stack ml="auto" gap={0} style={{ flexShrink: 0 }}>
diff --git a/src/features/teams/components/team-profile/header.tsx b/src/features/teams/components/team-profile/header.tsx
index 691955d..73a0c0d 100644
--- a/src/features/teams/components/team-profile/header.tsx
+++ b/src/features/teams/components/team-profile/header.tsx
@@ -19,7 +19,7 @@ const Header = ({ name, logo, id }: HeaderProps) => {
           src={logo && id ? `/api/files/teams/${id}/${logo}` : undefined}
         />
         <Flex align="center" justify="center" gap={4} pb={20} w="100%">
-          <Title ta="center" order={1}>
+          <Title ta="center" order={name.length > 25 ? 2 : 1}>
             {name}
           </Title>
         </Flex>
diff --git a/src/lib/pocketbase/services/badges.ts b/src/lib/pocketbase/services/badges.ts
index e4b5261..3e396df 100644
--- a/src/lib/pocketbase/services/badges.ts
+++ b/src/lib/pocketbase/services/badges.ts
@@ -175,6 +175,20 @@ export function createBadgesService(pb: PocketBase) {
       const tournamentsAttended = tournamentIds.size;
 
       if (criteria.tournaments_attended !== undefined) {
+        if (tournamentsAttended === 0 && criteria.tournaments_attended === 0) {
+          const teams = await pb.collection("teams").getFullList({
+            filter: `players.id ?~ "${playerId}"`,
+            expand: 'tournaments',
+          });
+
+          const hasEnrollment = teams.some((team: any) => {
+            const tournaments = team.tournaments || [];
+            return tournaments.length > 0;
+          });
+
+          return 0;
+        }
+
         return tournamentsAttended;
       }
 
@@ -433,8 +447,8 @@ export function createBadgesService(pb: PocketBase) {
 
       const badges = await this.listBadges();
 
-      const playerStats = await pb.collection("player_stats").getFullList<PlayerStats>();
-      const uniquePlayers = new Set(playerStats.map(s => s.player_id));
+      const allPlayers = await pb.collection("players").getFullList();
+      const uniquePlayers = new Set(allPlayers.map((p: any) => p.id));
 
       let totalProgressRecords = 0;
       let totalBadgesEarned = 0;