diff --git a/.efrocachemap b/.efrocachemap
index dd4ab21b..95925a3c 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -4182,14 +4182,14 @@
   "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "29422b5c4f29d1c7992748a1fd04a1c1",
   "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "c0f1dc95fcb52f58d521d3b23aef828e",
   "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f92c50cd9f6f199d22e6774bc7771bb4",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "2a38cd1c3d6d728a883a2d06036f3ec5",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "29d3706e79592f02a46524156cec66db",
   "build/prefab/full/mac_arm64_gui/release/ballisticakit": "055d3ca125ec2cc4cab88debe636dbe7",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0991af62f830aae31440482346b1853a",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "157070b431db26add10fa78b2d4ec3c1",
   "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "968b0055431f6451710d21107a69c70f",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "2f0a75fcc42fd892891f57e9d09119d9",
-  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "95d81b0594bc799751bf09933c7c8a59",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "7bf397cb08bbc5bc9e0936040cfaeb88",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ee8054ee2d6b93e76e2f213399a03101",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "3c67d5225bcac7ef234cde44263bfea3",
+  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "8c7e793f291cc790524ec9545e56f9bf",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "ecbe7c842634edd985c73ffbd1d16ab1",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d72021dd04618834154ee7a70538ef77",
   "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "4d70703c4eba1a402fbc2d997d84aa93",
   "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "bb64e2182b1a533679f93c5997f14584",
   "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "4d70703c4eba1a402fbc2d997d84aa93",
@@ -4202,14 +4202,14 @@
   "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "116b500c2d57caf06619408b2176e83b",
   "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "e3e9d9c7a94f8cd22939839fd8fbc178",
   "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "116b500c2d57caf06619408b2176e83b",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "5cd6e9333aa2c9d61dc69f29589d94cc",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "5103063455737d3b3d0c18a9114c93a6",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "acfcba3bf3563a937dc194943ab88fae",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "58d7a1a07846fbe7c2bae5ee242d4c5e",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "4ae23279264f000a37ba8edb19202143",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "e863e776c82a7067cbb282e424e12751",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "b93097028fd07dc5b841d04761a04a57",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a310808f5852a7d6974e738f40b26e53",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "2cc15cbbc10d2ae2a24a19473a273501",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "c27f9b1ef33ab55005f9f0484e14f198",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "dcc442b0d6ba485603430ba5f66557ca",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "af78e2540ca86b5c08bdc6866d443a74",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "475fb627204ff9cfc94acd5d522bfbf6",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "fea88f47db12e4f09e667e023ddb708e",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "832ae1966945e2be619a694a95e6f708",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "69c937c5c4dff8fecd12cda84bbe7532",
   "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
   "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
   "src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91",
diff --git a/src/assets/ba_data/python/bauiv1lib/play.py b/src/assets/ba_data/python/bauiv1lib/play.py
index 1e1a599c..fdda876b 100644
--- a/src/assets/ba_data/python/bauiv1lib/play.py
+++ b/src/assets/ba_data/python/bauiv1lib/play.py
@@ -142,7 +142,11 @@ class PlayWindow(bui.MainWindow):
         v = height * 0.5 - button_height * scl * 0.5
         clr = (0.6, 0.7, 0.6, 1.0)
 
-        total_b_width = 3 * button_width * scl + 2 * button_spacing
+        bcount = 3 if self._playlist_select_context is None else 2
+
+        total_b_width = (
+            bcount * button_width * scl + (bcount - 1) * button_spacing
+        )
         hoffs = (width - total_b_width) * 0.5
 
         self._lineup_tex = bui.gettexture('playerLineup')
@@ -265,8 +269,7 @@ class PlayWindow(bui.MainWindow):
                 color=clr,
             )
 
-        hoffs += scl * button_width + button_spacing
-        # v += 0 if self._playlist_select_context is None else -68
+            hoffs += scl * button_width + button_spacing
 
         self._teams_button = btn = bui.buttonwidget(
             parent=self._root_widget,