diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css
index 4aca219..2b84c80 100644
--- a/tournaments/static/tournaments/css/style.css
+++ b/tournaments/static/tournaments/css/style.css
@@ -245,6 +245,8 @@ tr {
 
 .ws {
     font-family: "Montserrat-SemiBold";
+    /* text-align: right; */
+    /* background-color: red; */
 }
 
 .center {
@@ -491,7 +493,7 @@ tr {
 
 .table-row-2-colums {
     display: grid;
-    grid-template-columns: 1px auto 40px;
+    grid-template-columns: 2fr 60px;
     align-items: center; /* Vertically center the content within each column */
     padding: 5px 0px;
 }
@@ -550,3 +552,21 @@ tr {
     width: 50px;
     margin-left: 10px;
 }
+
+.flex {
+    display: flex;
+    align-items: center;
+}
+
+.flex-left {
+    flex: 1;
+    text-align: left;
+    padding: 5px 0px;
+}
+
+.flex-right {
+    flex: initial;
+    text-align: right;
+    vertical-align: middle;
+    padding: 5px 0px;
+}
diff --git a/tournaments/templates/tournaments/broadcasted_auto.html b/tournaments/templates/tournaments/broadcasted_auto.html
index 94d90b8..3c0a16b 100644
--- a/tournaments/templates/tournaments/broadcasted_auto.html
+++ b/tournaments/templates/tournaments/broadcasted_auto.html
@@ -85,7 +85,7 @@
                                     class="logo inline"
                                 />
                                 <div class="inline">
-                                    <h1 class="club">{{ tournament.name }}</h1>
+                                    <h1 class="club">{{ tournament.display_name }}</h1>
                                     <h1 class="event"><span x-text="title"></span></h1>
                                     <!-- <span>Propulsé par Padel Club</span> -->
                                 </div>
@@ -124,7 +124,6 @@
 
                     </div>
 
-
                 </main>
             </div>
 
diff --git a/tournaments/templates/tournaments/broadcasted_group_stages.html b/tournaments/templates/tournaments/broadcasted_group_stages.html
index a11093f..3ccfc8d 100644
--- a/tournaments/templates/tournaments/broadcasted_group_stages.html
+++ b/tournaments/templates/tournaments/broadcasted_group_stages.html
@@ -78,9 +78,9 @@
                                         <template x-for="i in group_stage.teams.length">
 
                                                 <div>
-                                                    <div class="table-row-2-colums team-names-box padding-bottom-small">
+                                                    <div class="flex dark-bottom-border">
 
-                                                        <div class="table-cell table-cell-large">
+                                                        <div class="flex-left">
                                                             <template x-for="name in group_stage.teams[i-1].names">
 
                                                                 <div class="semibold" x-data="{
@@ -97,11 +97,44 @@
                                                             </template>
 
                                                         </div>
-                                                        <div class="table-cell center">
-                                                            <div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div>
-                                                            <div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div>
+                                                        <div class="flex-right">
+
+                                                            <div x-show="group_stage.teams[i-1].match_count == 0">
+                                                                <div class="score ws"><span x-text="group_stage.teams[i-1].weight"></span></div>
+                                                            </div>
+
+                                                            <div x-show="group_stage.teams[i-1].match_count > 0">
+                                                                <div class="center">
+                                                                    <div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div>
+                                                                    <div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div>
+                                                                </div>
+                                                            </div>
+
+                                                            <!-- <div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div>
+                                                            <div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div> -->
                                                         </div>
                                                     </div>
+<!--
+                                                    <div class="flex dark-bottom-border">
+                                                        <div class="flex-left">
+                                                            {% for name in team.names %}
+                                                            <div class="semibold {% if team.is_winner %}winner{% endif %}">
+                                                                {{ name }}
+                                                            </div>
+                                                            {% endfor %}
+                                                        </div>
+                                                        <div class="flex-right">
+                                                            {% if team.match_count == 0 %}
+                                                            <div class="score ws">{{ team.weight }}</div>
+                                                            {% else %}
+                                                            <div class="center">
+                                                                <div class="score ws">{{ team.wins_losses }}</div>
+                                                                <div class="ws">{{ team.formatted_diff }}</div>
+                                                            </div>
+                                                            {% endif %}
+                                                        </div>
+                                                    </div> -->
+
 
                                                     <div x-show="i != group_stage.teams.length">
                                                         <div class="dark-bottom-border"></div>
diff --git a/tournaments/templates/tournaments/group_stage_cell.html b/tournaments/templates/tournaments/group_stage_cell.html
index 53c05de..2d1dbae 100644
--- a/tournaments/templates/tournaments/group_stage_cell.html
+++ b/tournaments/templates/tournaments/group_stage_cell.html
@@ -12,20 +12,22 @@
 
                 {% for team in group_stage.teams %}
 
-                <div class="table-row-2-colums dark-bottom-border">
-                    <div class="table-cell table-cell-large">
+                <div class="flex dark-bottom-border">
+                    <div class="flex-left">
                         {% for name in team.names %}
                         <div class="semibold {% if team.is_winner %}winner{% endif %}">
                             {{ name }}
                         </div>
                         {% endfor %}
                     </div>
-                    <div class="table-cell center">
+                    <div class="flex-right">
                         {% if team.match_count == 0 %}
                         <div class="score ws">{{ team.weight }}</div>
                         {% else %}
-                        <div class="score ws">{{ team.wins_losses }}</div>
-                        <div class="ws">{{ team.formatted_diff }}</div>
+                        <div class="center">
+                            <div class="score ws">{{ team.wins_losses }}</div>
+                            <div class="ws">{{ team.formatted_diff }}</div>
+                        </div>
                         {% endif %}
                     </div>
                 </div>
@@ -35,7 +37,11 @@
                 </div>
 
                 <div class="flex-row top-margin">
-                    <label class="left-label minor-info semibold"><span class="beige">{{ group_stage.formatted_duration }}</span></label>
+                    <label class="left-label minor-info semibold">
+                        <span class="beige">
+                            {{ group_stage.formatted_duration }}
+                        </span>
+                    </label>
                     <!-- <label class="right-label minor-info">{{ match.court }}</label> -->
                     <!-- <a href="" class="right-label">{{ match.court }}</a> -->
                 </div>