diff --git a/src/games/horde/assets/leaderboard-modal.module.css b/src/games/horde/assets/leaderboard-modal.module.css
index a500833..a7e6b35 100644
--- a/src/games/horde/assets/leaderboard-modal.module.css
+++ b/src/games/horde/assets/leaderboard-modal.module.css
@@ -1,14 +1,5 @@
-.content {
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-    min-width: 380px;
-    max-width: 560px;
-}
-
-.title {
-    font-size: 18px;
-    color: var(--text);
+.modal {
+    width: 480px;
 }
 
 .loading, .error {
@@ -38,6 +29,10 @@
         font-weight: normal;
         font-size: 11px;
         text-transform: uppercase;
+        letter-spacing: 0.5px;
+        position: sticky;
+        top: 0;
+        background: var(--bg);
     }
 
     td {
@@ -62,3 +57,18 @@
 .below {
     color: var(--accent-alt) !important;
 }
+
+.nextPlace {
+    font-size: 13px;
+    color: var(--text-muted);
+
+    strong {
+        color: var(--yellow);
+    }
+}
+
+.nextPlaceMeta {
+    font-size: 12px;
+    color: var(--text-muted);
+    opacity: 0.7;
+}
diff --git a/src/games/horde/assets/manage-workers-modal.module.css b/src/games/horde/assets/manage-workers-modal.module.css
index 69db148..22c385f 100644
--- a/src/games/horde/assets/manage-workers-modal.module.css
+++ b/src/games/horde/assets/manage-workers-modal.module.css
@@ -1,16 +1,5 @@
-.content {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-    min-width: 360px;
-    max-width: 560px;
-    max-height: 80vh;
-    overflow-y: auto;
-}
-
-.title {
-    font-size: 18px;
-    color: var(--text);
+.modal {
+    width: 480px;
 }
 
 .loading {
diff --git a/src/games/horde/assets/modal.module.css b/src/games/horde/assets/modal.module.css
new file mode 100644
index 0000000..a04c66f
--- /dev/null
+++ b/src/games/horde/assets/modal.module.css
@@ -0,0 +1,72 @@
+.overlay {
+    position: fixed;
+    inset: 0;
+    background: rgba(0, 0, 0, 0.6);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+}
+
+.modal {
+    background: var(--bg);
+    border: 1px solid var(--border);
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5);
+    max-height: 80vh;
+}
+
+.header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 14px 16px;
+    border-bottom: 1px solid var(--border);
+    flex-shrink: 0;
+}
+
+.title {
+    font-size: 16px;
+    font-weight: bold;
+    color: var(--text);
+}
+
+.closeButton {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 28px;
+    color: var(--text-muted);
+    background: transparent;
+    border: none;
+    border-radius: var(--radius);
+    cursor: pointer;
+
+    &:hover {
+        color: var(--text);
+        background: var(--bg-hover);
+    }
+}
+
+.body {
+    flex: 1;
+    overflow-y: auto;
+    padding: 16px;
+    display: flex;
+    flex-direction: column;
+    gap: 14px;
+    min-height: 0;
+}
+
+.footer {
+    padding: 12px 16px;
+    border-top: 1px solid var(--border);
+    display: flex;
+    flex-direction: row;
+    gap: 8px;
+    flex-shrink: 0;
+    align-items: center;
+}
diff --git a/src/games/horde/assets/options-modal.module.css b/src/games/horde/assets/options-modal.module.css
index 6a970ad..70c8578 100644
--- a/src/games/horde/assets/options-modal.module.css
+++ b/src/games/horde/assets/options-modal.module.css
@@ -1,13 +1,5 @@
-.content {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-    min-width: 320px;
-}
-
-.title {
-    font-size: 18px;
-    color: var(--text);
+.modal {
+    width: 380px;
 }
 
 .label {
@@ -16,22 +8,12 @@
     gap: 6px;
     font-size: 13px;
     color: var(--text-muted);
-}
 
-.input {
-    width: 100%;
-}
-
-.actions {
-    display: flex;
-    flex-direction: row;
-    gap: 8px;
+    input {
+        width: 100%;
+    }
 }
 
 .saveBtn {
     color: var(--accent-alt) !important;
-
-    &:hover {
-        color: var(--accent-alt) !important;
-    }
 }
diff --git a/src/games/horde/assets/stats-panel.module.css b/src/games/horde/assets/stats-panel.module.css
index f8c855e..d3f369a 100644
--- a/src/games/horde/assets/stats-panel.module.css
+++ b/src/games/horde/assets/stats-panel.module.css
@@ -1,6 +1,6 @@
 .panel {
-    width: 320px;
-    min-width: 260px;
+    width: 420px;
+    min-width: 320px;
     flex-shrink: 0;
     display: flex;
     flex-direction: column;
@@ -73,11 +73,13 @@
 
 .tableWrapper {
     overflow-y: auto;
+    overflow-x: hidden;
     flex: 1;
 }
 
 .table {
     width: 100%;
+    table-layout: fixed;
     border-collapse: collapse;
     font-size: 12px;
 
@@ -103,10 +105,7 @@
 
     td {
         color: var(--text-dim);
-        max-width: 140px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+        overflow-wrap: break-word;
     }
 
     tr:hover td {
@@ -118,3 +117,9 @@
 .ownModel td {
     color: var(--accent-alt) !important;
 }
+
+.colNum {
+    width: 52px;
+    text-align: right;
+    white-space: nowrap;
+}
diff --git a/src/games/horde/components/modals/leaderboard-modal.tsx b/src/games/horde/components/modals/leaderboard-modal.tsx
index aaa2b7c..70a1040 100644
--- a/src/games/horde/components/modals/leaderboard-modal.tsx
+++ b/src/games/horde/components/modals/leaderboard-modal.tsx
@@ -1,8 +1,9 @@
 import { useEffect, useState } from "preact/hooks";
-import { Modal } from "@common/components/modal/Modal";
+import { X } from "lucide-preact";
 import { useHordeState } from "../../contexts/state";
 import { fetchLeaderboard, type LeaderboardEntry } from "../../utils/api";
-import { formatNumber } from "@common/utils";
+import { formatNumber, formatTime } from "@common/utils";
+import modalStyles from "../../assets/modal.module.css";
 import styles from "../../assets/leaderboard-modal.module.css";
 
 interface Props {
@@ -14,7 +15,13 @@ const PAGE_SIZE = 25;
 
 export const LeaderboardModal = ({ open, onClose }: Props) => {
     const { state } = useHordeState();
-    const { user } = state;
+    const { user, workers } = state;
+
+    const ownWorkerIds = new Set(user?.worker_ids ?? []);
+    const ownWorkers = workers.filter(w => ownWorkerIds.has(w.id));
+    const totalUptime = ownWorkers.reduce((s, w) => s + w.uptime, 0);
+    const totalGenerated = ownWorkers.reduce((s, w) => s + (w.kudos_details?.generated ?? 0), 0);
+    const kudosPerHour = totalUptime > 0 ? (totalGenerated / totalUptime) * 3600 : 0;
 
     const [rows, setRows] = useState<(LeaderboardEntry & { rank: number; diff?: number })[]>([]);
     const [loading, setLoading] = useState(false);
@@ -29,13 +36,11 @@ export const LeaderboardModal = ({ open, onClose }: Props) => {
             setError(null);
             try {
                 if (!user) {
-                    // Show top 10
                     const page = await fetchLeaderboard(1);
                     if (!cancelled) {
                         setRows(page.slice(0, 10).map((e, i) => ({ ...e, rank: i + 1 })));
                     }
                 } else {
-                    // Find user's rank via linear page scan, then show up to 10 above
                     let userRank = -1;
                     let page = 1;
                     outer: while (true) {
@@ -48,12 +53,11 @@ export const LeaderboardModal = ({ open, onClose }: Props) => {
                             }
                         }
                         page++;
-                        if (page > 20) break; // safety cap
+                        if (page > 20) break;
                     }
 
                     if (cancelled) return;
 
-                    // Collect rows: up to 10 above the user + user row
                     const startRank = Math.max(1, userRank - 10);
                     const startPage = Math.ceil(startRank / PAGE_SIZE);
                     const endPage = Math.ceil(userRank / PAGE_SIZE);
@@ -89,39 +93,67 @@ export const LeaderboardModal = ({ open, onClose }: Props) => {
         return () => { cancelled = true; };
     }, [open, user?.username]);
 
+    useEffect(() => {
+        if (!open) return;
+        const handler = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
+        window.addEventListener('keydown', handler);
+        return () => window.removeEventListener('keydown', handler);
+    }, [open]);
+
+    if (!open) return null;
+
     return (
-        <Modal open={open} onClose={onClose}>
-            <div class={styles.content}>
-                <h2 class={styles.title}>Leaderboard</h2>
-                {loading && <p class={styles.loading}>Loading…</p>}
-                {error && <p class={styles.error}>{error}</p>}
-                {!loading && !error && rows.length > 0 && (
-                    <table class={styles.table}>
-                        <thead>
-                            <tr>
-                                <th>#</th>
-                                <th>Username</th>
-                                <th>Kudos</th>
-                                {user && <th>Diff</th>}
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {rows.map(r => (
-                                <tr key={r.rank} class={r.username === user?.username ? styles.selfRow : undefined}>
-                                    <td>{r.rank}</td>
-                                    <td>{r.username}</td>
-                                    <td>{formatNumber(r.kudos)}</td>
-                                    {user && (
-                                        <td class={r.diff !== undefined ? (r.diff > 0 ? styles.above : styles.below) : undefined}>
-                                            {r.diff !== undefined ? `+${formatNumber(r.diff)}` : '—'}
-                                        </td>
-                                    )}
+        <div class={modalStyles.overlay} onMouseDown={e => { if (e.target === e.currentTarget) onClose(); }}>
+            <div class={`${modalStyles.modal} ${styles.modal}`}>
+                <div class={modalStyles.header}>
+                    <span class={modalStyles.title}>Leaderboard</span>
+                    <button class={modalStyles.closeButton} onClick={onClose}><X size={16} /></button>
+                </div>
+                <div class={modalStyles.body}>
+                    {loading && <p class={styles.loading}>Loading…</p>}
+                    {error && <p class={styles.error}>{error}</p>}
+                    {!loading && !error && rows.length > 0 && (
+                        <table class={styles.table}>
+                            <thead>
+                                <tr>
+                                    <th>#</th>
+                                    <th>Username</th>
+                                    <th>Kudos</th>
+                                    {user && <th>Diff</th>}
                                 </tr>
-                            ))}
-                        </tbody>
-                    </table>
-                )}
+                            </thead>
+                            <tbody>
+                                {rows.map(r => (
+                                    <tr key={r.rank} class={r.username === user?.username ? styles.selfRow : undefined}>
+                                        <td>{r.rank}</td>
+                                        <td>{r.username}</td>
+                                        <td>{formatNumber(r.kudos)}</td>
+                                        {user && (
+                                            <td class={r.diff !== undefined ? (r.diff > 0 ? styles.above : styles.below) : undefined}>
+                                                {r.diff !== undefined ? `+${formatNumber(r.diff)}` : '—'}
+                                            </td>
+                                        )}
+                                    </tr>
+                                ))}
+                            </tbody>
+                        </table>
+                    )}
+                </div>
+                {(() => {
+                    if (!user || rows.length < 2 || kudosPerHour <= 0) return null;
+                    const nextRow = rows[rows.length - 2];
+                    if (!nextRow.diff || nextRow.diff <= 0) return null;
+                    const secs = Math.ceil((nextRow.diff / kudosPerHour) * 3600);
+                    return (
+                        <div class={modalStyles.footer}>
+                            <span class={styles.nextPlace}>
+                                Time to #{nextRow.rank}: <strong>{formatTime(secs)}</strong>
+                                <span class={styles.nextPlaceMeta}> ({formatNumber(Math.round(kudosPerHour))} kudos/h)</span>
+                            </span>
+                        </div>
+                    );
+                })()}
             </div>
-        </Modal>
+        </div>
     );
 };
diff --git a/src/games/horde/components/modals/manage-workers-modal.tsx b/src/games/horde/components/modals/manage-workers-modal.tsx
index a7f57dc..6183ae9 100644
--- a/src/games/horde/components/modals/manage-workers-modal.tsx
+++ b/src/games/horde/components/modals/manage-workers-modal.tsx
@@ -1,7 +1,8 @@
 import { useEffect, useState } from "preact/hooks";
-import { Modal } from "@common/components/modal/Modal";
+import { X } from "lucide-preact";
 import { useHordeState } from "../../contexts/state";
 import { fetchWorker, updateWorker, deleteWorker, type WorkerData } from "../../utils/api";
+import modalStyles from "../../assets/modal.module.css";
 import styles from "../../assets/manage-workers-modal.module.css";
 
 interface Props {
@@ -36,11 +37,7 @@ export const ManageWorkersModal = ({ open, onClose }: Props) => {
                 setWorkerDetails(details);
                 const initialEdits: Record<string, WorkerEdit> = {};
                 for (const w of details) {
-                    initialEdits[w.id] = {
-                        name: w.name,
-                        info: w.info ?? '',
-                        maintenance_mode: w.maintenance_mode,
-                    };
+                    initialEdits[w.id] = { name: w.name, info: w.info ?? '', maintenance_mode: w.maintenance_mode };
                 }
                 setEdits(initialEdits);
             })
@@ -50,6 +47,15 @@ export const ManageWorkersModal = ({ open, onClose }: Props) => {
         return () => { cancelled = true; };
     }, [open, user?.worker_ids.join(',')]);
 
+    useEffect(() => {
+        if (!open) return;
+        const handler = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
+        window.addEventListener('keydown', handler);
+        return () => window.removeEventListener('keydown', handler);
+    }, [open]);
+
+    if (!open || !user) return null;
+
     const setEdit = (id: string, patch: Partial<WorkerEdit>) => {
         setEdits(prev => ({ ...prev, [id]: { ...prev[id], ...patch } }));
     };
@@ -68,14 +74,12 @@ export const ManageWorkersModal = ({ open, onClose }: Props) => {
     };
 
     const confirmDelete = async (id: string) => {
-        if (!apiKey) return;
-        if (!confirm('Delete this worker? This cannot be undone.')) return;
+        if (!apiKey || !confirm('Delete this worker? This cannot be undone.')) return;
         setDeleting(id);
         try {
             await deleteWorker(id, apiKey);
             setWorkerDetails(prev => prev.filter(w => w.id !== id));
-            // Trigger a re-fetch of the user profile on next poll
-            dispatch({ type: 'SET_USER', user: user ? { ...user, worker_ids: user.worker_ids.filter(i => i !== id) } : null });
+            dispatch({ type: 'SET_USER', user: { ...user, worker_ids: user.worker_ids.filter(i => i !== id) } });
         } catch (e) {
             console.error('[horde] delete worker error:', e);
         } finally {
@@ -83,62 +87,57 @@ export const ManageWorkersModal = ({ open, onClose }: Props) => {
         }
     };
 
-    if (!user) return null;
-
     return (
-        <Modal open={open} onClose={onClose}>
-            <div class={styles.content}>
-                <h2 class={styles.title}>Manage Workers</h2>
-                {loading && <p class={styles.loading}>Loading…</p>}
-                {!loading && workerDetails.map(w => {
-                    const edit = edits[w.id] ?? { name: w.name, info: w.info ?? '', maintenance_mode: w.maintenance_mode };
-                    return (
-                        <div key={w.id} class={styles.workerForm}>
-                            <div class={styles.workerName}>{w.name}</div>
-                            <label class={styles.label}>
-                                <span>Name</span>
-                                <input
-                                    value={edit.name}
-                                    onInput={e => setEdit(w.id, { name: (e.target as HTMLInputElement).value })}
-                                />
-                            </label>
-                            <label class={styles.label}>
-                                <span>Info</span>
-                                <textarea
-                                    class={styles.textarea}
-                                    value={edit.info}
-                                    onInput={e => setEdit(w.id, { info: (e.target as HTMLTextAreaElement).value })}
-                                    rows={3}
-                                />
-                            </label>
-                            <label class={styles.checkboxLabel}>
-                                <input
-                                    type="checkbox"
-                                    checked={edit.maintenance_mode}
-                                    onChange={e => setEdit(w.id, { maintenance_mode: (e.target as HTMLInputElement).checked })}
-                                />
-                                <span>Maintenance mode</span>
-                            </label>
-                            <div class={styles.formActions}>
-                                <button
-                                    class={styles.saveBtn}
-                                    onClick={() => save(w.id)}
-                                    disabled={saving[w.id]}
-                                >
-                                    {saving[w.id] ? 'Saving…' : 'Save'}
-                                </button>
-                                <button
-                                    class={styles.deleteBtn}
-                                    onClick={() => confirmDelete(w.id)}
-                                    disabled={deleting === w.id}
-                                >
-                                    {deleting === w.id ? 'Deleting…' : 'Delete'}
-                                </button>
+        <div class={modalStyles.overlay} onMouseDown={e => { if (e.target === e.currentTarget) onClose(); }}>
+            <div class={`${modalStyles.modal} ${styles.modal}`}>
+                <div class={modalStyles.header}>
+                    <span class={modalStyles.title}>Manage Workers</span>
+                    <button class={modalStyles.closeButton} onClick={onClose}><X size={16} /></button>
+                </div>
+                <div class={modalStyles.body}>
+                    {loading && <p class={styles.loading}>Loading…</p>}
+                    {!loading && workerDetails.map(w => {
+                        const edit = edits[w.id] ?? { name: w.name, info: w.info ?? '', maintenance_mode: w.maintenance_mode };
+                        return (
+                            <div key={w.id} class={styles.workerForm}>
+                                <div class={styles.workerName}>{w.name}</div>
+                                <label class={styles.label}>
+                                    <span>Name</span>
+                                    <input
+                                        value={edit.name}
+                                        onInput={e => setEdit(w.id, { name: (e.target as HTMLInputElement).value })}
+                                    />
+                                </label>
+                                <label class={styles.label}>
+                                    <span>Info</span>
+                                    <textarea
+                                        class={styles.textarea}
+                                        value={edit.info}
+                                        onInput={e => setEdit(w.id, { info: (e.target as HTMLTextAreaElement).value })}
+                                        rows={3}
+                                    />
+                                </label>
+                                <label class={styles.checkboxLabel}>
+                                    <input
+                                        type="checkbox"
+                                        checked={edit.maintenance_mode}
+                                        onChange={e => setEdit(w.id, { maintenance_mode: (e.target as HTMLInputElement).checked })}
+                                    />
+                                    <span>Maintenance mode</span>
+                                </label>
+                                <div class={styles.formActions}>
+                                    <button class={styles.saveBtn} onClick={() => save(w.id)} disabled={saving[w.id]}>
+                                        {saving[w.id] ? 'Saving…' : 'Save'}
+                                    </button>
+                                    <button class={styles.deleteBtn} onClick={() => confirmDelete(w.id)} disabled={deleting === w.id}>
+                                        {deleting === w.id ? 'Deleting…' : 'Delete'}
+                                    </button>
+                                </div>
                             </div>
-                        </div>
-                    );
-                })}
+                        );
+                    })}
+                </div>
             </div>
-        </Modal>
+        </div>
     );
 };
diff --git a/src/games/horde/components/modals/options-modal.tsx b/src/games/horde/components/modals/options-modal.tsx
index 770ebf3..1deab33 100644
--- a/src/games/horde/components/modals/options-modal.tsx
+++ b/src/games/horde/components/modals/options-modal.tsx
@@ -1,6 +1,7 @@
-import { useState } from "preact/hooks";
-import { Modal } from "@common/components/modal/Modal";
+import { useEffect, useState } from "preact/hooks";
+import { X } from "lucide-preact";
 import { useHordeState } from "../../contexts/state";
+import modalStyles from "../../assets/modal.module.css";
 import styles from "../../assets/options-modal.module.css";
 
 interface Props {
@@ -12,34 +13,55 @@ export const OptionsModal = ({ open, onClose }: Props) => {
     const { state, dispatch } = useHordeState();
     const [draft, setDraft] = useState(state.apiKey);
 
+    useEffect(() => {
+        if (open) setDraft(state.apiKey);
+    }, [open]);
+
+    useEffect(() => {
+        if (!open) return;
+        const handler = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
+        window.addEventListener('keydown', handler);
+        return () => window.removeEventListener('keydown', handler);
+    }, [open]);
+
+    if (!open) return null;
+
     const save = () => {
         dispatch({ type: 'SET_API_KEY', apiKey: draft.trim() });
         onClose();
     };
 
+    const clear = () => {
+        dispatch({ type: 'SET_API_KEY', apiKey: '' });
+        setDraft('');
+        onClose();
+    };
+
     return (
-        <Modal open={open} onClose={onClose}>
-            <div class={styles.content}>
-                <h2 class={styles.title}>Options</h2>
-                <label class={styles.label}>
-                    <span>API Key</span>
-                    <input
-                        type="password"
-                        class={styles.input}
-                        value={draft}
-                        onInput={e => setDraft((e.target as HTMLInputElement).value)}
-                        placeholder="Enter your AI Horde API key"
-                    />
-                </label>
-                <div class={styles.actions}>
+        <div class={modalStyles.overlay} onMouseDown={e => { if (e.target === e.currentTarget) onClose(); }}>
+            <div class={`${modalStyles.modal} ${styles.modal}`}>
+                <div class={modalStyles.header}>
+                    <span class={modalStyles.title}>Options</span>
+                    <button class={modalStyles.closeButton} onClick={onClose}><X size={16} /></button>
+                </div>
+                <div class={modalStyles.body}>
+                    <label class={styles.label}>
+                        <span>API Key</span>
+                        <input
+                            type="password"
+                            value={draft}
+                            onInput={e => setDraft((e.target as HTMLInputElement).value)}
+                            onKeyDown={e => { if (e.key === 'Enter') save(); }}
+                            placeholder="Enter your AI Horde API key"
+                            autoFocus
+                        />
+                    </label>
+                </div>
+                <div class={modalStyles.footer}>
                     <button class={styles.saveBtn} onClick={save}>Save</button>
-                    {state.apiKey && (
-                        <button onClick={() => { dispatch({ type: 'SET_API_KEY', apiKey: '' }); setDraft(''); onClose(); }}>
-                            Clear
-                        </button>
-                    )}
+                    {state.apiKey && <button onClick={clear}>Clear</button>}
                 </div>
             </div>
-        </Modal>
+        </div>
     );
 };
diff --git a/src/games/horde/components/stats-panel.tsx b/src/games/horde/components/stats-panel.tsx
index 0de22a3..b41eb09 100644
--- a/src/games/horde/components/stats-panel.tsx
+++ b/src/games/horde/components/stats-panel.tsx
@@ -3,14 +3,14 @@ import { useHordeState } from "../contexts/state";
 import { formatNumber, formatTime } from "@common/utils";
 import styles from "../assets/stats-panel.module.css";
 
-type ModelSortKey = 'name' | 'count' | 'queued' | 'performance';
+type ModelSortKey = 'name' | 'count' | 'queued' | 'jobs' | 'performance';
 type SortDir = 'asc' | 'desc';
 
 export const StatsPanel = () => {
     const { state } = useHordeState();
     const { user, workers, performance, models } = state;
 
-    const [sortKey, setSortKey] = useState<ModelSortKey>('count');
+    const [sortKey, setSortKey] = useState<ModelSortKey>('jobs');
     const [sortDir, setSortDir] = useState<SortDir>('desc');
 
     const ownWorkerIds = new Set(user?.worker_ids ?? []);
@@ -30,6 +30,7 @@ export const StatsPanel = () => {
         if (sortKey === 'name')        cmp = a.name.localeCompare(b.name);
         else if (sortKey === 'count')  cmp = a.count - b.count;
         else if (sortKey === 'queued') cmp = a.queued - b.queued;
+        else if (sortKey === 'jobs')   cmp = a.jobs - b.jobs;
         else                           cmp = a.performance - b.performance;
         return sortDir === 'asc' ? cmp : -cmp;
     });
@@ -105,18 +106,20 @@ export const StatsPanel = () => {
                         <thead>
                             <tr>
                                 <th onClick={() => handleSort('name')}>Name{sortIndicator('name')}</th>
-                                <th onClick={() => handleSort('count')}>Workers{sortIndicator('count')}</th>
-                                <th onClick={() => handleSort('queued')}>Queued{sortIndicator('queued')}</th>
-                                <th onClick={() => handleSort('performance')}>Perf{sortIndicator('performance')}</th>
+                                <th class={styles.colNum} onClick={() => handleSort('count')}>Workers{sortIndicator('count')}</th>
+                                <th class={styles.colNum} onClick={() => handleSort('jobs')}>Jobs{sortIndicator('jobs')}</th>
+                                <th class={styles.colNum} onClick={() => handleSort('queued')}>Queued{sortIndicator('queued')}</th>
+                                <th class={styles.colNum} onClick={() => handleSort('performance')}>Perf{sortIndicator('performance')}</th>
                             </tr>
                         </thead>
                         <tbody>
                             {sortedModels.map(m => (
                                 <tr key={m.name} class={ownModelNames.has(m.name) ? styles.ownModel : undefined}>
-                                    <td title={m.name}>{m.name}</td>
-                                    <td>{m.count}</td>
-                                    <td>{formatNumber(m.queued)}</td>
-                                    <td>{m.performance > 0 ? `${m.performance.toFixed(1)}` : '—'}</td>
+                                    <td>{m.name}</td>
+                                    <td class={styles.colNum}>{m.count}</td>
+                                    <td class={styles.colNum}>{m.jobs}</td>
+                                    <td class={styles.colNum}>{formatNumber(m.queued)}</td>
+                                    <td class={styles.colNum}>{m.performance > 0 ? `${m.performance.toFixed(1)}` : '—'}</td>
                                 </tr>
                             ))}
                         </tbody>
diff --git a/src/games/horde/components/workers-panel.tsx b/src/games/horde/components/workers-panel.tsx
index c579b12..066a70d 100644
--- a/src/games/horde/components/workers-panel.tsx
+++ b/src/games/horde/components/workers-panel.tsx
@@ -35,8 +35,8 @@ export const WorkersPanel = () => {
     const { state } = useHordeState();
     const { workers, user } = state;
 
-    const [sortKey, setSortKey] = useState<WorkerSortKey>('uptime');
-    const [sortDir, setSortDir] = useState<SortDir>('desc');
+    const [sortKey, setSortKey] = useState<WorkerSortKey>('name');
+    const [sortDir, setSortDir] = useState<SortDir>('asc');
 
     const ownWorkerIds = new Set(user?.worker_ids ?? []);
     const sorted = sortWorkers(workers, sortKey, sortDir);
diff --git a/src/games/horde/utils/api.ts b/src/games/horde/utils/api.ts
index 56fd919..00360b4 100644
--- a/src/games/horde/utils/api.ts
+++ b/src/games/horde/utils/api.ts
@@ -43,6 +43,7 @@ export interface ModelData {
     name: string;
     count: number;
     queued: number;
+    jobs: number;
     performance: number;
     eta: number;
     type: string;