diff --git a/src/app/matches/[id]/page.tsx b/src/app/matches/[id]/page.tsx
index de8468c..e333b83 100644
--- a/src/app/matches/[id]/page.tsx
+++ b/src/app/matches/[id]/page.tsx
@@ -89,7 +89,7 @@ export default async function MatchDetailPage({ params }: PageProps) {
               <div className="relative p-8">
                 {/* Table Square - Larger with more padding */}
                 <div className="w-72 h-72 bg-amber-100 border-4 border-amber-600 rounded-xl relative shadow-lg">
-                  {/* Top: Team 1 Player 1 - Moved 20px up */}
+                  {/* Top: Team 1 Player 1 */}
                   <div className="absolute top-0 left-0 right-0 h-1/2 flex flex-col justify-end items-center pb-8">
                     <div className="text-center bg-white/80 rounded-lg px-3 py-2 shadow-sm -mt-[20px]">
                       <p className="text-base font-semibold text-amber-900">
@@ -107,34 +107,17 @@ export default async function MatchDetailPage({ params }: PageProps) {
                     <div className="text-xs text-amber-600 mt-2 font-medium">Team 1</div>
                   </div>
 
-                  {/* Bottom: Team 2 Player 2 - Moved 10px down */}
+                  {/* Bottom: Team 1 Player 2 - teammate opposite Top */}
                   <div className="absolute bottom-0 left-0 right-0 h-1/2 flex flex-col justify-start items-center pt-8">
-                    <div className="text-xs text-red-600 mb-2 font-medium">Team 2</div>
+                    <div className="text-xs text-amber-600 mb-2 font-medium">Team 1</div>
                     <div className="text-center bg-white/80 rounded-lg px-3 py-2 shadow-sm mt-[10px]">
-                      <p className="text-base font-semibold text-red-900">
-                        {match.team2P2.name}
-                      </p>
-                      <p className="text-xs text-red-700">
-                        Elo: {match.team2P2.currentElo}
-                        {eloChanges[match.team2P2.id] !== undefined && (
-                          <span className={eloChanges[match.team2P2.id] >= 0 ? "text-green-600 ml-1" : "text-red-600 ml-1"}>
-                            ({eloChanges[match.team2P2.id] >= 0 ? "+" : ""}{eloChanges[match.team2P2.id]})
-                          </span>
-                        )}
-                      </p>
-                    </div>
-                  </div>
-
-                  {/* Left: Team 1 Player 2 - Moved 20px left */}
-                  <div className="absolute left-0 top-0 bottom-0 w-1/2 flex flex-col justify-center items-center pl-8">
-                    <div className="text-center bg-white/80 rounded-lg px-3 py-2 shadow-sm rotate-[-90deg] -ml-[20px]">
-                      <p className="text-sm font-semibold text-amber-900">
+                      <p className="text-base font-semibold text-amber-900">
                         {match.team1P2.name}
                       </p>
-                      <p className="text-[11px] text-amber-700">
+                      <p className="text-xs text-amber-700">
                         Elo: {match.team1P2.currentElo}
                         {eloChanges[match.team1P2.id] !== undefined && (
-                          <span className={eloChanges[match.team1P2.id] >= 0 ? "text-green-600" : "text-red-600"}>
+                          <span className={eloChanges[match.team1P2.id] >= 0 ? "text-green-600 ml-1" : "text-red-600 ml-1"}>
                             ({eloChanges[match.team1P2.id] >= 0 ? "+" : ""}{eloChanges[match.team1P2.id]})
                           </span>
                         )}
@@ -142,9 +125,9 @@ export default async function MatchDetailPage({ params }: PageProps) {
                     </div>
                   </div>
 
-                  {/* Right: Team 2 Player 1 - Moved 20px right */}
-                  <div className="absolute right-0 top-0 bottom-0 w-1/2 flex flex-col justify-center items-center pr-8">
-                    <div className="text-center bg-white/80 rounded-lg px-3 py-2 shadow-sm rotate-[90deg] -mr-[20px]">
+                  {/* Left: Team 2 Player 1 */}
+                  <div className="absolute left-0 top-0 bottom-0 w-1/2 flex flex-col justify-center items-center pl-8">
+                    <div className="text-center bg-white/80 rounded-lg px-3 py-2 shadow-sm rotate-[-90deg] -ml-[20px]">
                       <p className="text-sm font-semibold text-red-900">
                         {match.team2P1.name}
                       </p>
@@ -159,6 +142,23 @@ export default async function MatchDetailPage({ params }: PageProps) {
                     </div>
                   </div>
 
+                  {/* Right: Team 2 Player 2 - teammate opposite Left */}
+                  <div className="absolute right-0 top-0 bottom-0 w-1/2 flex flex-col justify-center items-center pr-8">
+                    <div className="text-center bg-white/80 rounded-lg px-3 py-2 shadow-sm rotate-[90deg] -mr-[20px]">
+                      <p className="text-sm font-semibold text-red-900">
+                        {match.team2P2.name}
+                      </p>
+                      <p className="text-[11px] text-red-700">
+                        Elo: {match.team2P2.currentElo}
+                        {eloChanges[match.team2P2.id] !== undefined && (
+                          <span className={eloChanges[match.team2P2.id] >= 0 ? "text-green-600" : "text-red-600"}>
+                            ({eloChanges[match.team2P2.id] >= 0 ? "+" : ""}{eloChanges[match.team2P2.id]})
+                          </span>
+                        )}
+                      </p>
+                    </div>
+                  </div>
+
                   {/* Score in Center */}
                   <div className="absolute inset-0 flex items-center justify-center">
                     <div className="bg-white border-2 border-gray-300 rounded-lg px-6 py-3 shadow-md">