diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj
index d2c05a1..1dd8dcb 100644
--- a/PadelClub.xcodeproj/project.pbxproj
+++ b/PadelClub.xcodeproj/project.pbxproj
@@ -3344,7 +3344,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3389,7 +3389,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/PadelClub/Data/Round.swift b/PadelClub/Data/Round.swift
index 38355c2..de2cb34 100644
--- a/PadelClub/Data/Round.swift
+++ b/PadelClub/Data/Round.swift
@@ -650,9 +650,9 @@ defer {
         let roundCount = RoundRule.numberOfRounds(forTeams: currentRoundMatchCount)
         
         var loserBracketMatchFormat = tournamentObject()?.loserBracketMatchFormat
-        if let parentRound {
-            loserBracketMatchFormat = tournamentObject()?.loserBracketSmartMatchFormat(parentRound.index)
-        }
+//        if let parentRound {
+//            loserBracketMatchFormat = tournamentObject()?.loserBracketSmartMatchFormat(parentRound.index)
+//        }
         
         let rounds = (0..<roundCount).map { //index 0 is the final
             let round = Round(tournament: tournament, index: $0, matchFormat: loserBracketMatchFormat)
diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index 492386c..6f18e49 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -1931,7 +1931,7 @@ defer {
 
         var _groupStages = [GroupStage]()
         for index in 0..<groupStageCount {
-            let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, matchFormat: groupStageSmartMatchFormat())
+            let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, matchFormat: groupStageFormat)
             _groupStages.append(groupStage)
         }
         
@@ -1956,7 +1956,7 @@ defer {
 
         
         let rounds = (0..<roundCount).map { //index 0 is the final
-            return Round(tournament: id, index: $0, matchFormat: roundSmartMatchFormat($0), loserBracketMode: loserBracketMode)
+            return Round(tournament: id, index: $0, matchFormat: matchFormat, loserBracketMode: loserBracketMode)
         }
         
         if rounds.isEmpty {
diff --git a/PadelClub/Views/Team/Components/TeamWeightView.swift b/PadelClub/Views/Team/Components/TeamWeightView.swift
index 0868ed3..a2dbdf5 100644
--- a/PadelClub/Views/Team/Components/TeamWeightView.swift
+++ b/PadelClub/Views/Team/Components/TeamWeightView.swift
@@ -11,9 +11,14 @@ struct TeamWeightView: View {
     @EnvironmentObject var dataStore: DataStore
     let team: TeamRegistration
     var teamPosition: TeamPosition? = nil
-
     var teamIndex: Int?
     
+    init(team: TeamRegistration, teamPosition: TeamPosition? = nil, teamIndex: Int? = nil) {
+        self.team = team
+        self.teamPosition = teamPosition
+        self.teamIndex = teamIndex ?? team.tournamentObject()?.indexOf(team: team)
+    }
+    
     var displayWeight: Bool {
         team.shouldDisplayRankAndWeight() && team.tournamentObject()?.hideWeight() == false
     }
diff --git a/PadelClub/Views/Team/TeamPickerView.swift b/PadelClub/Views/Team/TeamPickerView.swift
index e8d3ad8..d00d67a 100644
--- a/PadelClub/Views/Team/TeamPickerView.swift
+++ b/PadelClub/Views/Team/TeamPickerView.swift
@@ -120,8 +120,10 @@ struct TeamPickerView: View {
             }
         }
     }
-    
+
+    @ViewBuilder
     private func _teamListView(_ teams: [TeamRegistration]) -> some View {
+        let selectedSortedTeams = tournament.selectedSortedTeams()
         ForEach(teams) { team in
             if searchField.isEmpty || team.contains(searchField) {
                 Button {
@@ -134,7 +136,8 @@ struct TeamPickerView: View {
 //                        presentTeamPickerView = false
 //                    }
                 } label: {
-                    TeamRowView(team: team)
+                    let teamIndex = team.index(in: selectedSortedTeams)
+                    TeamRowView(team: team, teamIndex: teamIndex)
                         .environment(\.isEditingTournamentSeed, .constant(false))
                         .contentShape(Rectangle())
                 }