diff --git a/tournaments/admin.py b/tournaments/admin.py
index b559dd9..b69e2cb 100644
--- a/tournaments/admin.py
+++ b/tournaments/admin.py
@@ -24,6 +24,10 @@ class CustomUserAdmin(UserAdmin):
         ),
     ]
 
+class CustomTeamRegistration(admin.ModelAdmin):
+    model = TeamRegistration
+    list_display = ['player_names', 'name']
+
 admin.site.register(CustomUser, CustomUserAdmin)
 admin.site.register(Club)
 admin.site.register(Event)
@@ -31,6 +35,6 @@ admin.site.register(Round)
 admin.site.register(GroupStage)
 admin.site.register(Match)
 admin.site.register(TeamScore)
-admin.site.register(TeamRegistration)
+admin.site.register(TeamRegistration, CustomTeamRegistration)
 admin.site.register(Tournament)
 admin.site.register(PlayerRegistration)
diff --git a/tournaments/models/match.py b/tournaments/models/match.py
index 5218849..d3089fc 100644
--- a/tournaments/models/match.py
+++ b/tournaments/models/match.py
@@ -127,7 +127,10 @@ class Match(models.Model):
         return livematch
 
     def sorted_team_scores(self):
-        return self.team_scores.order_by('team_registration__bracket_position')
+        if self.group_stage:
+            return self.team_scores.order_by('team_registration__group_stage_position')
+        else:
+            return self.team_scores.order_by('team_registration__bracket_position')
 
     # def sort_value(self):
     #     sort_score = 0
diff --git a/tournaments/models/team_registration.py b/tournaments/models/team_registration.py
index 7d964e1..7dc0eaf 100644
--- a/tournaments/models/team_registration.py
+++ b/tournaments/models/team_registration.py
@@ -18,6 +18,8 @@ class TeamRegistration(models.Model):
     name = models.CharField(max_length=200, null=True, blank=True)
 
     def __str__(self):
+        if self.name:
+            return f"{self.name}: {self.player_names()}"
         return self.player_names()
 
     def team_names(self):