diff --git a/padelclub_backend/settings.py b/padelclub_backend/settings.py
index 3fa806a..deff1f2 100644
--- a/padelclub_backend/settings.py
+++ b/padelclub_backend/settings.py
@@ -85,6 +85,9 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': BASE_DIR / 'db.sqlite3',
+        'OPTIONS': {
+            'timeout': 20,
+        }
     }
 }
 
diff --git a/tournaments/models/match.py b/tournaments/models/match.py
index 617443f..acf21fa 100644
--- a/tournaments/models/match.py
+++ b/tournaments/models/match.py
@@ -99,10 +99,10 @@ class Match(models.Model):
             return 0
 
     def started(self):
-        if self.start_date:
-            return timezone.now() > self.start_date
-        elif self.end_date:
+        if self.end_date:
             return True
+        elif self.start_date:
+            return timezone.now() > self.start_date
         else:
             return False
 
diff --git a/tournaments/models/team_score.py b/tournaments/models/team_score.py
index 16445f2..f66a48d 100644
--- a/tournaments/models/team_score.py
+++ b/tournaments/models/team_score.py
@@ -18,7 +18,7 @@ class TeamScore(models.Model):
         if self.team_registration.name:
             return self.team_registration.name
         else:
-            names = [player.name() for player in self.player_registrations.all()]
+            names = self.team_registration.team_names()
             return " - ".join(names)
 
     def team_names(self):
@@ -26,7 +26,7 @@ class TeamScore(models.Model):
         if self.team_registration.name:
             names.append(self.team_registration.name)
         else:
-            names = [player.name() for player in self.player_registrations.all()]
+            names = self.team_registration.team_names()
         return names
 
     def scores(self):
diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index b5c3b6e..1e173e0 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -468,7 +468,7 @@ class Tournament(models.Model):
             return True
         bracket_matches = self.bracket_matches()
         if len(bracket_matches) == 0:
-            return False
+            return self.display_group_stages
         if self.publish_brackets:
             return True
 
diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css
index b371b94..caeac88 100644
--- a/tournaments/static/tournaments/css/style.css
+++ b/tournaments/static/tournaments/css/style.css
@@ -586,7 +586,7 @@ svg {
 
 .table-row-3-colums-teams {
     display: grid;
-    grid-template-columns: 1px auto 70px 80px;
+    grid-template-columns: 1px auto auto 80px;
     /* first column is a hack */
     align-items: center;
     /* Vertically center the content within each column */
diff --git a/tournaments/templates/tournaments/ranking_row.html b/tournaments/templates/tournaments/ranking_row.html
index 144077a..97f4b03 100644
--- a/tournaments/templates/tournaments/ranking_row.html
+++ b/tournaments/templates/tournaments/ranking_row.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-        <div class="table-row-3-colums bottom-border">
+        <div class="table-row-3-colums-teams bottom-border">
 
             <div class="table-cell table-cell-large semibold">
                 {% for name in ranking.names %}
@@ -8,6 +8,6 @@
                 {% endfor %}
             </div>
 
-            <div class="table-cell center">{{ ranking.points_earned_display }}</div>
+            <div class="table-cell right horizontal-padding">{{ ranking.points_earned_display }}</div>
             <div class="table-cell"><div class="mybox center">{{ ranking.ranking_display }}</div></div>
         </div>
diff --git a/tournaments/templates/tournaments/team_row.html b/tournaments/templates/tournaments/team_row.html
index a084287..05ed85d 100644
--- a/tournaments/templates/tournaments/team_row.html
+++ b/tournaments/templates/tournaments/team_row.html
@@ -8,9 +8,9 @@
                 {% endfor %}
             </div>
             {% if hide_teams_weight %}
-            <div class="table-cell center"></div>
+            <div class="table-cell right horizontal-padding"></div>
             {% else %}
-            <div class="table-cell center">{{ team.weight }}</div>
+            <div class="table-cell right horizontal-padding">{{ team.weight }}</div>
             {% endif %}
-            <div class="table-cell"><div class="mybox center">{{ team.stage }}</div></div>
+            <div class="table-cell "><div class="mybox center">{{ team.stage }}</div></div>
         </div>