diff --git a/src/lib/components/contest-progress.svelte b/src/lib/components/contest-progress.svelte
index 9f26617..2e3342a 100644
--- a/src/lib/components/contest-progress.svelte
+++ b/src/lib/components/contest-progress.svelte
@@ -11,6 +11,7 @@
     import { base } from "$app/paths";
     import { createBusy, type BusyState } from "$lib/kit";
     import { onMount } from "svelte";
+    import Player from "./player.svelte";
 
     interface TournamentResult {
         id: string;
@@ -138,7 +139,7 @@
                 <div class="field">
                     Winner:
                     {#if t.rankings[0]?.name}
-                    <a href={`${base}/player?name=${t.rankings[0].name}`}>{t.rankings[0].name}</a>
+                    <Player name={t.rankings[0].name} />
                     {:else}
                     None
                     {/if}
diff --git a/src/routes/(app)/bracket/+page.svelte b/src/routes/(app)/bracket/+page.svelte
index 88ae079..03f7542 100644
--- a/src/routes/(app)/bracket/+page.svelte
+++ b/src/routes/(app)/bracket/+page.svelte
@@ -5,6 +5,7 @@
   import CatSpinner from "$lib/components/cat-spinner.svelte";
   import Lede from "$lib/components/lede.svelte";
   import Page from "$lib/components/page.svelte";
+    import Player from "$lib/components/player.svelte";
   import { createBusy, type BusyState } from "$lib/kit";
   import {
       formatScore,
@@ -127,7 +128,7 @@
     <ol>
       {#each data.rankings as player (player.address)}
       <li>
-        <a href={`${base}/player?name=${player.name}`}>{player.name}</a>:
+        <Player name={player.name} />:
         {formatScore(player.score)}
       </li>
       {/each}
@@ -147,7 +148,7 @@
           Match {i + 1}
           <a
             class="smaller"
-            href={`${base}/match?tournament=${data.tournamentId}&season=${data.season + 1}&bracket=${data.bracket + 1}&match=${match.id}`}
+            href={`${base}/match?tournament=${data.tournamentId}&season=${data.season + 1}&bracket=${data.bracket + 1}&match=${match.id}&idx=${i+1}`}
           >
             {#if match.rounds !== undefined}
             ({match.rounds} rounds)
@@ -159,7 +160,7 @@
         <ol>
           {#each match.rankings as player (player.address)}
           <li>
-            <a href={`${base}/player?name=${player.name}`}>{player.name}</a>:
+            <Player name={player.name} />:
             {player.score.toFixed(3)}</li>
           {/each}
         </ol>
diff --git a/src/routes/(app)/players/+page.svelte b/src/routes/(app)/players/+page.svelte
index 21e4cfc..fc162d3 100644
--- a/src/routes/(app)/players/+page.svelte
+++ b/src/routes/(app)/players/+page.svelte
@@ -11,6 +11,7 @@
     import { base } from "$app/paths";
     import { createBusy, type BusyState } from "$lib/kit";
     import { UserError, getFriendlyErrorMsg } from "$lib/util";
+    import Player from "$lib/components/player.svelte";
 
     interface Player {
         name: string;
@@ -126,7 +127,7 @@
                 {#each players as player, i (player.address)}
                 <li>
                     <span>{i + 1}.</span>
-                    <span><a href={`${base}/player?name=${encodeURIComponent(player.name)}`}>{player.name}</a></span>
+                    <span><Player name={player.name} /></span>
                     <span>{player.created.toLocaleDateString()}</span>
                 </li>
                 {/each}
diff --git a/src/routes/(app)/tournament/+page.svelte b/src/routes/(app)/tournament/+page.svelte
index 7643538..89b621e 100644
--- a/src/routes/(app)/tournament/+page.svelte
+++ b/src/routes/(app)/tournament/+page.svelte
@@ -5,6 +5,7 @@ import { page } from "$app/stores";
     import CatSpinner from "$lib/components/cat-spinner.svelte";
     import Lede from "$lib/components/lede.svelte";
     import Page from "$lib/components/page.svelte";
+    import Player from "$lib/components/player.svelte";
     import { createBusy, type BusyState } from "$lib/kit";
     import {
         formatScore,
@@ -96,7 +97,7 @@ import { page } from "$app/stores";
     <ol>
       {#each data.rankings as player (player.address)}
       <li>
-        <a href={`${base}/player?name=${player.name}`}>{player.name}</a>:
+        <Player name={player.name} />:
         {formatScore(player.score)}
       </li>
       {/each}
@@ -122,8 +123,9 @@ import { page } from "$app/stores";
         <ol>
           {#each bracket.rankings as player (player.address)}
           <li>
-            <a href={`${base}/player?name=${player.name}`}>{player.name}</a>:
-            {formatScore(player.score)}</li>
+            <Player name={player.name} />:
+            {formatScore(player.score)}
+          </li>
           {/each}
         </ol>
       </div>