diff --git a/app/components/league/DraftInfoCard.tsx b/app/components/league/DraftInfoCard.tsx
index e2b7d5b..a7d3bab 100644
--- a/app/components/league/DraftInfoCard.tsx
+++ b/app/components/league/DraftInfoCard.tsx
@@ -121,7 +121,7 @@ function DraftInfoCardVariant({
             </Button>
           ) : queueBuilderHref ? (
             <Button asChild variant="outline">
-              <Link to={queueBuilderHref}>Set Pre-Draft Rankings</Link>
+              <Link to={queueBuilderHref}>Set Pre-Draft Queue</Link>
             </Button>
           ) : null}
         </div>
diff --git a/app/routes/leagues/$leagueId.draft-queue.$seasonId.tsx b/app/routes/leagues/$leagueId.draft-queue.$seasonId.tsx
index 2899cc6..b48f32e 100644
--- a/app/routes/leagues/$leagueId.draft-queue.$seasonId.tsx
+++ b/app/routes/leagues/$leagueId.draft-queue.$seasonId.tsx
@@ -13,7 +13,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs";
 import type { Route } from "./+types/$leagueId.draft-queue.$seasonId";
 
 export function meta({ data }: Route.MetaArgs): Route.MetaDescriptors {
-  return [{ title: `Pre-Draft Rankings — ${data?.season?.league?.name ?? "League"} - Brackt` }];
+  return [{ title: `Set Pre-Draft Queue — ${data?.season?.league?.name ?? "League"} - Brackt` }];
 }
 
 export async function loader(args: Route.LoaderArgs) {
@@ -41,7 +41,7 @@ export async function loader(args: Route.LoaderArgs) {
   }
 
   if (!userId) {
-    throw new Response("You must be logged in to set pre-draft rankings", { status: 401 });
+    throw new Response("You must be logged in to set pre-draft queue", { status: 401 });
   }
 
   const userTeam = season.teams.find((t) => t.ownerId === userId);
@@ -64,7 +64,7 @@ export async function loader(args: Route.LoaderArgs) {
 
 type QueueItem = { id: string; participantId: string };
 
-export default function PreDraftRankings() {
+export default function SetPreDraftQueue() {
   const { season, userTeam, availableParticipants, userQueue } =
     useLoaderData<typeof loader>();
   const { leagueId } = useParams<{ leagueId: string }>();
@@ -79,6 +79,9 @@ export default function PreDraftRankings() {
 
   // Always-current ref so reorder callback stays stable (no localQueue dependency)
   const queueRef = useRef(localQueue);
+  // Track in-flight removes to prevent add racing ahead of a pending remove
+  const pendingRemovesRef = useRef(new Set<string>());
+
   useEffect(() => {
     queueRef.current = localQueue;
   }, [localQueue]);
@@ -91,6 +94,10 @@ export default function PreDraftRankings() {
   const handleAdd = useCallback(
     async (participantId: string) => {
       if (queuedParticipantIds.has(participantId)) return;
+      if (pendingRemovesRef.current.has(participantId)) {
+        toast("Player is being removed — try again in a moment");
+        return;
+      }
       const tempId = `temp-${Date.now()}-${participantId}`;
       setLocalQueue((prev) => [...prev, { id: tempId, participantId }]);
 
@@ -118,7 +125,15 @@ export default function PreDraftRankings() {
 
   const handleRemove = useCallback(
     async (queueId: string) => {
-      setLocalQueue((prev) => prev.filter((item) => item.id !== queueId));
+      const item = queueRef.current.find((q) => q.id === queueId);
+      const participantId = item?.participantId;
+
+      setLocalQueue((prev) => prev.filter((q) => q.id !== queueId));
+
+      // Temp IDs haven't been written to the DB yet — nothing to delete server-side.
+      if (queueId.startsWith("temp-")) return;
+
+      if (participantId) pendingRemovesRef.current.add(participantId);
 
       const formData = new FormData();
       formData.append("queueId", queueId);
@@ -134,6 +149,8 @@ export default function PreDraftRankings() {
       } catch {
         toast.error("Network error — failed to remove from rankings");
         revalidate();
+      } finally {
+        if (participantId) pendingRemovesRef.current.delete(participantId);
       }
     },
     [userTeam.id, revalidate]
@@ -194,11 +211,6 @@ export default function PreDraftRankings() {
                 <p className="font-medium text-sm truncate">{p.name}</p>
                 <p className="text-xs text-muted-foreground">{p.sport.name}</p>
               </div>
-              {p.vorpValue !== null && p.vorpValue !== undefined && (
-                <span className="text-xs text-muted-foreground tabular-nums shrink-0">
-                  {Number(p.vorpValue).toFixed(1)}
-                </span>
-              )}
               {inQueue ? (
                 <Button
                   size="sm"
@@ -269,7 +281,7 @@ export default function PreDraftRankings() {
         </Link>
         <div className="flex items-center gap-2 mb-1">
           <ListOrdered className="h-6 w-6" />
-          <h1 className="text-2xl font-bold">Pre-Draft Rankings</h1>
+          <h1 className="text-2xl font-bold">Set Pre-Draft Queue</h1>
         </div>
         <p className="text-sm text-muted-foreground">
           Rank the players you want. Your rankings carry into the live draft as your autopick
@@ -296,9 +308,6 @@ export default function PreDraftRankings() {
             </TabsTrigger>
           </TabsList>
           <TabsContent value="players">
-            <div className="flex items-center justify-between mb-3">
-              <span className="text-xs text-muted-foreground">Sorted by VORP</span>
-            </div>
             {allPlayersPanel}
           </TabsContent>
           <TabsContent value="rankings">{rankingsPanel}</TabsContent>
@@ -308,9 +317,8 @@ export default function PreDraftRankings() {
       {/* Desktop: side-by-side */}
       <div className="hidden lg:grid gap-6 lg:grid-cols-3">
         <div className="lg:col-span-2">
-          <div className="flex items-center justify-between mb-3">
+          <div className="mb-3">
             <h2 className="font-semibold">All Players</h2>
-            <span className="text-xs text-muted-foreground">Sorted by VORP</span>
           </div>
           {allPlayersPanel}
         </div>
diff --git a/app/routes/leagues/__tests__/draft-queue-access.test.ts b/app/routes/leagues/__tests__/draft-queue-access.test.ts
index c5969d5..77c6357 100644
--- a/app/routes/leagues/__tests__/draft-queue-access.test.ts
+++ b/app/routes/leagues/__tests__/draft-queue-access.test.ts
@@ -57,7 +57,7 @@ function checkPreDraftRankingsAccess(opts: {
   }
 
   if (!userId) {
-    return { status: 401, message: 'You must be logged in to set pre-draft rankings' };
+    return { status: 401, message: 'You must be logged in to set pre-draft queue' };
   }
 
   if (!hasTeam) {
@@ -71,7 +71,7 @@ function checkPreDraftRankingsAccess(opts: {
 // Redirect behaviour based on season status
 // ---------------------------------------------------------------------------
 
-describe('Pre-Draft Rankings Access - Season Status Redirects', () => {
+describe('Set Pre-Draft Queue Access - Season Status Redirects', () => {
   it('redirects to the draft room when status is draft', () => {
     const season = createMockSeason({ status: 'draft' });
     const result = checkPreDraftRankingsAccess({
@@ -121,7 +121,7 @@ describe('Pre-Draft Rankings Access - Season Status Redirects', () => {
 // Authentication
 // ---------------------------------------------------------------------------
 
-describe('Pre-Draft Rankings Access - Authentication', () => {
+describe('Set Pre-Draft Queue Access - Authentication', () => {
   it('returns 401 when no user is logged in', () => {
     const season = createMockSeason({ status: 'pre_draft' });
     const result = checkPreDraftRankingsAccess({
@@ -141,7 +141,7 @@ describe('Pre-Draft Rankings Access - Authentication', () => {
       userId: null,
       hasTeam: false,
     });
-    expect(result).toMatchObject({ message: 'You must be logged in to set pre-draft rankings' });
+    expect(result).toMatchObject({ message: 'You must be logged in to set pre-draft queue' });
   });
 });
 
@@ -149,7 +149,7 @@ describe('Pre-Draft Rankings Access - Authentication', () => {
 // Team membership
 // ---------------------------------------------------------------------------
 
-describe('Pre-Draft Rankings Access - Team Membership', () => {
+describe('Set Pre-Draft Queue Access - Team Membership', () => {
   it('returns 403 for a logged-in user with no team in the season', () => {
     const season = createMockSeason({ status: 'pre_draft' });
     const result = checkPreDraftRankingsAccess({
@@ -188,7 +188,7 @@ describe('Pre-Draft Rankings Access - Team Membership', () => {
 // Redirect targets use the correct leagueId and seasonId
 // ---------------------------------------------------------------------------
 
-describe('Pre-Draft Rankings Access - Redirect URL Correctness', () => {
+describe('Set Pre-Draft Queue Access - Redirect URL Correctness', () => {
   it('uses the leagueId from params in the redirect URL', () => {
     const season = createMockSeason({ id: 'season-99', status: 'draft' });
     const result = checkPreDraftRankingsAccess({