diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css
index 18739bb..f54f749 100644
--- a/tournaments/static/tournaments/css/style.css
+++ b/tournaments/static/tournaments/css/style.css
@@ -1105,3 +1105,12 @@ h-margin {
 .odd-row {
     background-color: #e6f2ff; /* Light blue */
 }
+
+.player-flex-row {
+    display: flex;
+    justify-content: space-between;
+    height: 24px;
+    align-items: center;
+    gap: 8px;
+    margin-right: 8px;
+}
diff --git a/tournaments/templates/tournaments/bracket_match_cell.html b/tournaments/templates/tournaments/bracket_match_cell.html
index f6ecdfe..b7181b9 100644
--- a/tournaments/templates/tournaments/bracket_match_cell.html
+++ b/tournaments/templates/tournaments/bracket_match_cell.html
@@ -17,28 +17,31 @@
                 {% for team in match.teams %}
                 <div class="match-result {% cycle 'bottom-border' '' %}">
                     <div class="player {% if team.names|length == 1 %}single-player{% else %}two-players{% endif %}">
-                        {% if team.id %}
-                        <a href="{% url 'team-details' tournament.id team.id %}" class="player-link">
-                        {% endif %}
-
-                        {% if team.is_lucky_loser or team.walk_out == 1 %}
-                        <div class="overlay-text">
-                            {% if match.should_show_lucky_loser_status and team.is_lucky_loser %}(LL){% elif team.walk_out == 1 %}(WO){% endif %}
-                        </div>
-                        {% endif %}
+                        <div class="player-flex-row">
+                            {% if team.id %}
+                            <a href="{% url 'team-details' tournament.id team.id %}" class="player-link">
+                            {% endif %}
+                            <div>
+                                {% for name in team.names %}
+                                <div class="semibold{% if team.walk_out == 1 %} strikethrough{% endif %}{% if team.is_winner %} winner{% endif %}">
+                                    {% if name|length > 0 %}
+                                        {{ name }}
+                                    {% else %}
+                                        &nbsp;
+                                    {% endif %}
+                                </div>
+                                {% endfor %}
+                            </div>
+                            {% if team.id and team.weight %}
+                            </a>
+                            {% endif %}
 
-                        {% for name in team.names %}
-                        <div class="semibold{% if team.walk_out == 1 %} strikethrough{% endif %}{% if team.is_winner %} winner{% endif %}">
-                            {% if name|length > 0 %}
-                                {{ name }}
-                            {% else %}
-                                &nbsp;
+                            {% if team.is_lucky_loser or team.walk_out == 1 %}
+                            <div class="minor-info bold" style="height: 100%; padding-right: 20px;">
+                                {% if match.should_show_lucky_loser_status and team.is_lucky_loser %}(LL){% endif %}
+                            </div>
                             {% endif %}
                         </div>
-                        {% endfor %}
-                        {% if team.id %}
-                        </a>
-                        {% endif %}
                     </div>
 
                     {% if match.has_walk_out %}
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_match.html b/tournaments/templates/tournaments/broadcast/broadcasted_match.html
index 8ab62a8..42000d3 100644
--- a/tournaments/templates/tournaments/broadcast/broadcasted_match.html
+++ b/tournaments/templates/tournaments/broadcast/broadcasted_match.html
@@ -20,23 +20,22 @@
                      'single-player': match.teams[i-1].names.length === 1,
                      'two-players': match.teams[i-1].names.length === 2
                  }">
-                    <!-- Show lucky loser or walkout status -->
-                    <template x-if="match.should_show_lucky_loser_status && match.teams[i-1].is_lucky_loser">
-                        <div class="overlay-text right-label minor-info semibold">(LL)</div>
-                    </template>
-                    <template x-if="match.teams[i-1].walk_out === 1">
-                        <div class="overlay-text right-label minor-info semibold">(WO)</div>
-                    </template>
-
-                    <template x-for="name in match.teams[i-1].names">
-                        <div :class="{
-                                'bold': true,
-                                'strikethrough': match.teams[i-1].walk_out === 1,
-                                'winner': match.teams[i-1].is_winner
-                            }">
-                            <span x-text="name === '' ? ' ' : name"></span>
-                        </div>
-                    </template>
+                     <div class="player-flex-row">
+                         <div>
+                            <template x-for="name in match.teams[i-1].names">
+                                <div :class="{
+                                        'bold': true,
+                                        'strikethrough': match.teams[i-1].walk_out === 1,
+                                        'winner': match.teams[i-1].is_winner
+                                    }">
+                                    <span x-text="name === '' ? ' ' : name"></span>
+                                </div>
+                            </template>
+                         </div>
+                         <template x-if="match.should_show_lucky_loser_status && match.teams[i-1].is_lucky_loser">
+                             <div class="minor-info semibold">(LL)</div>
+                         </template>
+                     </div>
                 </div>
                 <div class="scores">
                     <template x-for="score in match.teams[i-1].scores">
diff --git a/tournaments/templates/tournaments/match_cell.html b/tournaments/templates/tournaments/match_cell.html
index 3205329..c5add90 100644
--- a/tournaments/templates/tournaments/match_cell.html
+++ b/tournaments/templates/tournaments/match_cell.html
@@ -16,7 +16,7 @@
                 <div class="match-result {% cycle 'bottom-border' '' %}">
                     <div class="player {% if team.names|length == 1 %}single-player{% else %}two-players{% endif %}">
 
-                        <div class="flex-row">
+                        <div class="player-flex-row">
                             {% if team.id and team.weight %}
                             <a href="{% url 'team-details' tournament.id team.id %}" class="player-link">
                             {% endif %}
@@ -34,7 +34,7 @@
 
                             {% if team.is_lucky_loser or team.walk_out == 1 %}
                             <div class="minor-info bold" style="height: 100%; padding-right: 20px;">
-                                {% if match.should_show_lucky_loser_status and team.is_lucky_loser %}(LL){% elif team.walk_out == 1 %}(WO){% endif %}
+                                {% if match.should_show_lucky_loser_status and team.is_lucky_loser %}(LL){% endif %}
                             </div>
                             {% endif %}
                         </div>