diff --git a/components/admin/stygian-editor.tsx b/components/admin/stygian-editor.tsx
index 405d8dd..701269c 100644
--- a/components/admin/stygian-editor.tsx
+++ b/components/admin/stygian-editor.tsx
@@ -3,7 +3,7 @@
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { useEffect, useState, useTransition, type ReactNode } from "react";
+import { useEffect, useMemo, useState, useTransition, type ReactNode } from "react";
 import {
   GripVerticalIcon,
   PlusIcon,
@@ -25,7 +25,6 @@ import {
   SortableContext,
   sortableKeyboardCoordinates,
   useSortable,
-  verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { toast } from "sonner";
@@ -747,14 +746,14 @@ function SortableTeam({
     transform,
     transition,
     isDragging,
-  } = useSortable({ id });
+  } = useSortable({ id, animateLayoutChanges: () => false });
   return (
     <div
       ref={setNodeRef}
       style={{ transform: CSS.Transform.toString(transform), transition }}
-      className={cn(isDragging && "relative z-10 opacity-60")}
+      className={cn("min-w-0", isDragging && "relative z-10 opacity-60")}
     >
-      <div className="flex flex-col gap-2 rounded-lg border bg-muted/20 p-2">
+      <div className="flex h-full flex-col gap-2 rounded-lg border bg-muted/20 p-2">
         <div className="flex items-center justify-between gap-2">
           <span className="text-sm font-medium">Team {position + 1}</span>
           <Button
@@ -799,10 +798,10 @@ function BossRecommendationEditor({
   const groups = recommendations.filter(
     (group) => group.level === level && group.bossPosition === boss.position,
   );
-  const [teams, setTeams] = useState<StygianRecommendationItemInput[][]>(() =>
+  const [teams, setTeams] = useState<{ id: string; items: StygianRecommendationItemInput[] }[]>(() =>
     groups
       .filter((group) => group.kind === "team")
-      .map((group) => group.items.flatMap((item) => toInput(item) ?? [])),
+      .map((group) => ({ id: group.id, items: group.items.flatMap((item) => toInput(item) ?? []) })),
   );
   const [units, setUnits] = useState<StygianRecommendationItemInput[]>(() =>
     groups
@@ -815,13 +814,13 @@ function BossRecommendationEditor({
       coordinateGetter: sortableKeyboardCoordinates,
     }),
   );
-  const teamIds = teams.map((_, index) => `team-${index}`);
-  const fingerprint = JSON.stringify({ teams, units });
+  const teamIds = useMemo(() => teams.map((team) => team.id), [teams]);
+  const fingerprint = JSON.stringify({ teams: teams.map((team) => team.items), units });
   const valid = teams.every(
     (team) =>
-      team.length >= 1 &&
-      team.length <= 4 &&
-      team.every((item) => item.kind === "character"),
+      team.items.length >= 1 &&
+      team.items.length <= 4 &&
+      team.items.every((item) => item.kind === "character"),
   );
   const [savedFingerprint, setSavedFingerprint] = useState(fingerprint);
   const [failedFingerprint, setFailedFingerprint] = useState<string | null>(
@@ -896,37 +895,36 @@ function BossRecommendationEditor({
           collisionDetection={closestCenter}
           onDragEnd={({ active, over }) => {
             if (!over || active.id === over.id) return;
-            const from = teamIds.indexOf(String(active.id));
-            const to = teamIds.indexOf(String(over.id));
-            if (from >= 0 && to >= 0)
-              setTeams((current) => arrayMove(current, from, to));
+            setTeams((current) => {
+              const from = current.findIndex((team) => team.id === active.id);
+              const to = current.findIndex((team) => team.id === over.id);
+              return from === -1 || to === -1 ? current : arrayMove(current, from, to);
+            });
           }}
         >
           <SortableContext
             items={teamIds}
-            strategy={verticalListSortingStrategy}
+            strategy={rectSortingStrategy}
           >
-            <div className="flex flex-col gap-3">
+            <div className="grid grid-cols-1 gap-3 xl:grid-cols-2">
               {teams.map((team, teamIndex) => (
                 <SortableTeam
-                  key={teamIds[teamIndex]}
-                  id={teamIds[teamIndex]}
+                  key={team.id}
+                  id={team.id}
                   position={teamIndex}
                 >
                   <VisualRecommendationGrid
-                    items={team}
+                    items={team.items}
                     limit={4}
                     teamLayout
                     characters={characters}
                     weapons={weapons}
                     artifacts={artifacts}
                     onChange={(items) =>
-                      setTeams(
-                        teams
-                          .map((entry, index) =>
-                            index === teamIndex ? items : entry,
-                          )
-                          .filter((entry) => entry.length),
+                      setTeams((current) =>
+                        current
+                          .map((entry) => entry.id === team.id ? { ...entry, items } : entry)
+                          .filter((entry) => entry.items.length),
                       )
                     }
                   />
@@ -944,9 +942,7 @@ function BossRecommendationEditor({
                     description="This team and all of its character recommendations will be removed."
                     confirmLabel="Remove team"
                     onConfirm={() =>
-                      setTeams(
-                        teams.filter((_, index) => index !== teamIndex),
-                      )
+                      setTeams((current) => current.filter((entry) => entry.id !== team.id))
                     }
                   >
                     <Trash2Icon data-icon="inline-start" />
@@ -961,7 +957,7 @@ function BossRecommendationEditor({
           variant="outline"
           size="sm"
           className="self-start"
-          onClick={() => setTeams([...teams, []])}
+          onClick={() => setTeams((current) => [...current, { id: crypto.randomUUID(), items: [] }])}
         >
           <PlusIcon data-icon="inline-start" />
           Add team
diff --git a/components/public/stygian-guide.tsx b/components/public/stygian-guide.tsx
index c56d687..238b9a6 100644
--- a/components/public/stygian-guide.tsx
+++ b/components/public/stygian-guide.tsx
@@ -45,12 +45,12 @@ function RecommendationIcon({ item, catalog, teamLayout = false }: { item: Item;
   if (item.kind === "character") {
     const hasEquipment = Boolean(value.weapon || value.artifact);
     return (
-      <div className={cn("flex min-w-0 flex-col gap-1 rounded-lg border bg-card p-1", teamLayout && "w-full sm:p-2", teamLayout && hasEquipment && "sm:w-[164px]", teamLayout && !hasEquipment && "sm:w-[116px]", teamLayout && !hasEquipment && item.constellationLevel === null && "aspect-square justify-center")}>
-        <div className={teamLayout && hasEquipment ? "flex flex-col gap-1 sm:grid sm:grid-cols-[100px_40px] sm:gap-2" : "flex flex-col gap-1"}>
-          <div className={cn("relative aspect-square overflow-hidden rounded-lg", teamLayout && "sm:size-[100px]", teamLayout && hasEquipment && "sm:row-span-2", characterRarityGradientClass(item.catalogKey, value.rarity))}>
+      <div className={cn("flex min-w-0 flex-col gap-1 rounded-lg border bg-card p-1", teamLayout && "w-full sm:p-2 xl:p-1", teamLayout && hasEquipment && "sm:w-[164px] xl:w-full", teamLayout && !hasEquipment && "sm:w-[116px] xl:w-full", teamLayout && !hasEquipment && item.constellationLevel === null && "aspect-square justify-center")}>
+        <div className={teamLayout && hasEquipment ? "flex flex-col gap-1 sm:grid sm:grid-cols-[100px_40px] sm:gap-2 xl:grid-cols-1 xl:gap-1" : "flex flex-col gap-1"}>
+          <div className={cn("relative aspect-square overflow-hidden rounded-lg", teamLayout && "sm:size-[100px] xl:size-auto", teamLayout && hasEquipment && "sm:row-span-2 xl:row-auto", characterRarityGradientClass(item.catalogKey, value.rarity))}>
             {value.imageUrl ? <Image src={value.imageUrl} alt={value.name} fill sizes={teamLayout ? "(min-width: 640px) 128px, 25vw" : "128px"} className="object-contain" /> : null}
           </div>
-          {hasEquipment ? <div className={teamLayout ? "grid grid-cols-2 gap-1 sm:row-span-2 sm:grid-cols-1 sm:gap-2 sm:self-center" : "grid grid-cols-2 gap-1"}>
+          {hasEquipment ? <div className={teamLayout ? "grid grid-cols-2 gap-1 sm:row-span-2 sm:grid-cols-1 sm:gap-2 sm:self-center xl:row-auto xl:grid-cols-2 xl:gap-1 xl:self-auto" : "grid grid-cols-2 gap-1"}>
             {value.weapon ? <div className={cn("relative aspect-square overflow-hidden rounded-md border", rarityGradientClass(value.weapon.rarity))}><Image src={value.weapon.imageUrl} alt={value.weapon.name} fill sizes="64px" className="object-contain p-1" /></div> : null}
             {value.artifact ? <div className={cn("relative aspect-square overflow-hidden rounded-md border", rarityGradientClass(value.artifact.rarity))}><Image src={value.artifact.imageUrl} alt={value.artifact.name} fill sizes="64px" className="object-contain p-1" /></div> : null}
           </div> : null}
@@ -82,12 +82,14 @@ function BossCard({ schedule, level, position, catalog }: { schedule: Schedule;
     <StygianBossCard boss={boss} level={level}>
       <section className="flex flex-col gap-3" aria-label={`Recommended teams for ${boss.name}`}>
         <h3 className="font-heading text-lg font-semibold">Recommended team</h3>
-        {teams.length ? teams.map((team) => (
-          <div key={team.id} className="grid w-full grid-cols-4 items-start gap-1 rounded-lg border bg-muted/20 p-2 sm:flex sm:w-fit sm:flex-wrap sm:gap-3">
-            {team.items.slice(0, 4).map((item) => <RecommendationIcon key={`${item.groupId}-${item.position}`} item={item} catalog={catalog} teamLayout />)}
-            {Array.from({ length: Math.max(0, 4 - team.items.length) }, (_, index) => <div key={`empty-${index}`} className="aspect-square w-full rounded-lg border border-dashed bg-muted/30 sm:w-[116px]" aria-hidden="true" />)}
-          </div>
-        )) : <p className="text-sm text-muted-foreground">No team recommendations yet.</p>}
+        {teams.length ? <div className="grid grid-cols-1 items-start gap-3 xl:grid-cols-2">
+          {teams.map((team) => (
+            <div key={team.id} className="grid w-full min-w-0 grid-cols-4 items-start gap-1 rounded-lg border bg-muted/20 p-2 sm:flex sm:w-fit sm:flex-wrap sm:gap-3 xl:grid xl:grid-cols-4 xl:gap-1">
+              {team.items.slice(0, 4).map((item) => <RecommendationIcon key={`${item.groupId}-${item.position}`} item={item} catalog={catalog} teamLayout />)}
+              {Array.from({ length: Math.max(0, 4 - team.items.length) }, (_, index) => <div key={`empty-${index}`} className="aspect-square w-full rounded-lg border border-dashed bg-muted/30 sm:w-[116px] xl:w-full" aria-hidden="true" />)}
+            </div>
+          ))}
+        </div> : <p className="text-sm text-muted-foreground">No team recommendations yet.</p>}
       </section>
       <section className="flex flex-col gap-3" aria-label={`Recommended units for ${boss.name}`}>
         <h3 className="font-heading text-lg font-semibold">Recommended unit</h3>