diff --git a/site/frontend/package.json b/site/frontend/package.json
index 133a3928d..9e0b58b40 100644
--- a/site/frontend/package.json
+++ b/site/frontend/package.json
@@ -39,8 +39,8 @@
       "source": "src/pages/status.ts",
       "distDir": "dist/scripts"
     },
-    "status_new": {
-      "source": "src/pages/status_new.ts",
+    "status_old": {
+      "source": "src/pages/status_old.ts",
       "distDir": "dist/scripts"
     },
     "bootstrap": {
diff --git a/site/frontend/src/pages/status_new/collector.vue b/site/frontend/src/pages/status/collector.vue
similarity index 100%
rename from site/frontend/src/pages/status_new/collector.vue
rename to site/frontend/src/pages/status/collector.vue
diff --git a/site/frontend/src/pages/status_new/commit-sha.vue b/site/frontend/src/pages/status/commit-sha.vue
similarity index 100%
rename from site/frontend/src/pages/status_new/commit-sha.vue
rename to site/frontend/src/pages/status/commit-sha.vue
diff --git a/site/frontend/src/pages/status/data.ts b/site/frontend/src/pages/status/data.ts
index 48371985e..6bee47353 100644
--- a/site/frontend/src/pages/status/data.ts
+++ b/site/frontend/src/pages/status/data.ts
@@ -1,66 +1,50 @@
-export interface Commit {
-  sha: string;
-  date: string;
-  type: "Try" | "Master";
-}
+export type BenchmarkRequestType = "Release" | "Master" | "Try";
+export type BenchmarkRequestStatus = "Queued" | "InProgress" | "Completed";
 
-export interface BenchmarkError {
-  name: string;
-  error: string;
-}
-
-interface Step {
-  step: string;
-  is_done: boolean;
-  expected_duration: number;
-  current_progress: number;
-}
+export type BenchmarkRequest = {
+  tag: string;
+  pr: number | null;
+  status: BenchmarkRequestStatus;
+  requestType: BenchmarkRequestType;
+  createdAt: string;
+  completedAt: string | null;
+  endEstimated: boolean;
+  durationS: number | null;
+  errors: Dict<string>;
+};
 
-export type Artifact =
-  | {
-      Commit: Commit;
-    }
-  | {
-      Tag: string;
-    };
+export type BenchmarkJobStatus = "Queued" | "InProgress" | "Success" | "Failed";
+export type BenchmarkJobKind = "compiletime" | "runtimeInProgress" | "rustc";
 
-export type MissingReason =
-  | {
-      Master: {
-        pr: number;
-        parent_sha: string;
-        is_try_parent: boolean;
-      };
-    }
-  | {
-      Try: {
-        pr: number;
-        parent_sha: string;
-        include: string | null;
-        exclude: string | null;
-        runs: number | null;
-        backends: string | null;
-      };
-    }
-  | {
-      InProgress: MissingReason;
-    };
+export type BenchmarkJob = {
+  requestTag: string;
+  kind: BenchmarkJobKind;
+  target: string;
+  backend: string;
+  profile: string;
+  benchmarkSet: number;
+  createdAt: string;
+  startedAt: string | null;
+  completedAt: string | null;
+  status: BenchmarkJobStatus;
+  dequeCounter: number;
+};
 
-interface CurrentState {
-  artifact: Artifact;
-  progress: Step[];
-}
+export type CollectorConfig = {
+  name: string;
+  target: string;
+  benchmarkSet: number;
+  isActive: boolean;
+  lastHeartbeatAt: string;
+  dateAdded: string;
+  jobs: BenchmarkJob[];
+};
 
-export interface FinishedRun {
-  artifact: Artifact;
-  pr: number | null;
-  errors: BenchmarkError[];
-  duration: number;
-  finished_at: number;
-}
+export type StatusResponse = {
+  requests: BenchmarkRequest[];
+  collectors: CollectorConfig[];
+};
 
-export interface StatusResponse {
-  finished_runs: FinishedRun[];
-  current: CurrentState | null;
-  missing: Array<[Commit, MissingReason]>;
+export function isJobComplete(job: BenchmarkJob): boolean {
+  return job.status === "Failed" || job.status === "Success";
 }
diff --git a/site/frontend/src/pages/status/page.vue b/site/frontend/src/pages/status/page.vue
index 06a8a4a4f..1ec7f765a 100644
--- a/site/frontend/src/pages/status/page.vue
+++ b/site/frontend/src/pages/status/page.vue
@@ -1,463 +1,302 @@
-<script setup lang="ts">
+<script setup lang="tsx">
+import {h, ref, Ref} from "vue";
+
 import {getJson} from "../../utils/requests";
 import {STATUS_DATA_URL} from "../../urls";
 import {withLoading} from "../../utils/loading";
-import {formatSecondsAsDuration} from "../../utils/formatting";
-import {computed, ref, Ref} from "vue";
+import {formatISODate, formatSecondsAsDuration} from "../../utils/formatting";
+import {useExpandedStore} from "../../utils/expansion";
 import {
-  Artifact,
-  BenchmarkError,
-  Commit,
-  FinishedRun,
-  MissingReason,
+  BenchmarkRequest,
+  BenchmarkRequestStatus,
+  CollectorConfig,
+  isJobComplete,
   StatusResponse,
 } from "./data";
-import {
-  addSeconds,
-  differenceInSeconds,
-  format,
-  fromUnixTime,
-  subSeconds,
-} from "date-fns";
-import {useExpandedStore} from "./expansion";
-
-async function loadStatus(loading: Ref<boolean>) {
-  data.value = await withLoading(loading, () =>
-    getJson<StatusResponse>(STATUS_DATA_URL)
-  );
-}
+import Collector from "./collector.vue";
+import CommitSha from "./commit-sha.vue";
 
-function getArtifactPr(reason: MissingReason): number {
-  if (reason.hasOwnProperty("InProgress")) {
-    return getArtifactPr(reason["InProgress"]);
-  } else if (reason.hasOwnProperty("Master")) {
-    return reason["Master"].pr;
-  } else if (reason.hasOwnProperty("Try")) {
-    return reason["Try"].pr;
-  } else {
-    throw new Error(`Unknown missing reason ${reason}`);
-  }
-}
+const loading = ref(true);
 
-function getArtifactSha(artifact: Artifact): string {
-  if (artifact.hasOwnProperty("Commit")) {
-    return artifact["Commit"].sha;
-  } else if (artifact.hasOwnProperty("Tag")) {
-    return artifact["Tag"];
-  } else {
-    throw new Error(`Unknown artifact ${artifact}`);
-  }
-}
+const data: Ref<{
+  timeline: BenchmarkRequestRow[];
+  queueLength: number;
+  collectors: CollectorConfig[];
+} | null> = ref(null);
 
-function commitUrlAsHtml(sha: string): string {
-  return `<a href="https://github.com/rust-lang/rust/commit/${sha}">${sha.substring(
-    0,
-    13
-  )}</a>`;
-}
+type BenchmarkRequestRow = BenchmarkRequest & {
+  isLastInProgress: boolean;
+  hasPendingJobs: boolean;
+};
 
-function pullRequestUrlAsHtml(pr: number | null): string {
-  if (pr === null) {
-    return "";
+function getRequestRowClassName(req: BenchmarkRequestRow) {
+  if (req.status === "InProgress") {
+    return "timeline-row-bold";
   }
-  return `<a href="https://github.com/rust-lang/rust/pull/${pr}">#${pr}</a>`;
+  return "";
 }
 
-function formatCommitAsHtml(commit: Commit, reason: MissingReason): string {
-  const url = commitUrlAsHtml(commit.sha);
-  const type = commit.type === "Try" ? "Try" : "Master";
-  const pr = getArtifactPr(reason);
+async function loadStatusData(loading: Ref<boolean>) {
+  data.value = await withLoading(loading, async () => {
+    let resp: StatusResponse = await getJson<StatusResponse>(STATUS_DATA_URL);
+    let timeline: BenchmarkRequestRow[] = [];
 
-  return `${type} commit ${url} (${pullRequestUrlAsHtml(pr)})`;
-}
-
-interface CurrentRun {
-  commit: Commit;
-  missing_reason: MissingReason;
-  start: Date;
-  expected_end: Date;
-  expected_total: number;
-  progress: number;
-}
+    let queueLength = 0;
 
-interface TimelineEntry {
-  pr: number | null;
-  kind: string;
-  sha: string;
-  status: string;
-  end_time: Date;
-  end_estimated: boolean;
-  duration: number | null;
-  errors: BenchmarkError[];
-  warning: string | null;
-  current: boolean;
-}
+    let requests_with_pending_jobs = new Set();
+    for (const job of resp.collectors.flatMap((c) => c.jobs)) {
+      if (job.status === "Queued" || job.status === "InProgress") {
+        requests_with_pending_jobs.add(job.requestTag);
+      }
+    }
 
-const timeLeft = computed(() => {
-  const steps = data.value?.current?.progress ?? [];
-  let left = 0;
-  for (const step of steps) {
-    if (!step.is_done) {
-      left += Math.max(0, step.expected_duration - step.current_progress);
+    // Figure out where to draw the line.
+    for (let i = 0; i < resp.requests.length; i++) {
+      let request = resp.requests[i];
+      let isLastInProgress =
+        request.status === "InProgress" &&
+        (i == resp.requests.length - 1 ||
+          resp.requests[i + 1].status !== "InProgress");
+      timeline.push({
+        ...request,
+        isLastInProgress,
+        hasPendingJobs: requests_with_pending_jobs.has(request.tag),
+      });
+
+      if (request.status !== "Completed") {
+        queueLength += 1;
+      }
     }
-  }
-  return left;
-});
 
-const currentRun: Ref<CurrentRun | null> = computed(() => {
-  const current = data.value?.current ?? null;
-  if (current === null) return null;
-  const sha = getArtifactSha(current.artifact);
+    return {
+      timeline,
+      collectors: resp.collectors,
+      queueLength,
+    };
+  });
+}
 
-  const elapsed = current.progress.reduce(
-    (prev, current) => prev + current.current_progress,
-    0
-  );
-  const start = subSeconds(new Date(), elapsed);
-  const expected_total = current.progress.reduce(
-    (prev, current) => prev + current.expected_duration,
-    0
-  );
-  const progress = Math.min(1, elapsed / Math.max(1, expected_total));
-
-  for (const [commit, reason] of data.value.missing) {
-    if (commit.sha === sha && reason.hasOwnProperty("InProgress")) {
-      return {
-        commit,
-        missing_reason: reason["InProgress"],
-        start,
-        expected_end: addSeconds(new Date(), timeLeft.value),
-        expected_total,
-        progress,
-      };
-    }
+function getDuration(request: BenchmarkRequest): string {
+  if (request.status === "Completed") {
+    return formatSecondsAsDuration(request.durationS);
   }
-  return null;
-});
-const lastFinishedRun: Ref<FinishedRun | null> = computed(() => {
-  const finished = data.value?.finished_runs;
-  if (finished.length === 0) return null;
-  return finished[0];
-});
-const expectedDuration: Ref<number | null> = computed(() => {
-  if (data.value === null) return null;
-  const current = currentRun.value;
-  if (current !== null) {
-    return current.expected_total;
+  return "";
+}
+
+function formatStatus(status: BenchmarkRequestStatus): string {
+  if (status === "Completed") {
+    return "Finished";
+  } else if (status === "InProgress") {
+    return "In progress";
+  } else if (status === "Queued") {
+    return "Queued";
   } else {
-    return lastFinishedRun.value?.duration;
+    return "Unknown";
   }
-});
-
-// Timeline of past, current and future runs.
-// Ordered from future to past - at the beginning is the item with the least
-// priority in the queue, and at the end is the oldest finished run.
-const timeline: Ref<TimelineEntry[]> = computed(() => {
-  if (data.value === null) return [];
-  const timeline: TimelineEntry[] = [];
-
-  const current = currentRun.value;
-  const currentTimeLeft = timeLeft.value ?? 0;
-  const expectedRunDuration = expectedDuration.value;
-
-  // The next commit to be benchmarked will be at last position of `queued`
-  const queued = data.value.missing
-    .filter(([_, reason]) => !reason.hasOwnProperty("InProgress"))
-    .reverse();
-  let queued_before = queued.length - 1;
-  const currentRunEnd =
-    current?.expected_end ?? addSeconds(new Date(), currentTimeLeft);
-  for (const [commit, reason] of queued) {
-    const expected_end = addSeconds(
-      currentRunEnd,
-      queued_before * expectedRunDuration + expectedRunDuration
-    );
+}
 
-    let kind = commit.type;
-    if (reason.hasOwnProperty("Master") && reason["Master"].is_try_parent) {
-      kind += " (try parent)";
-    }
+function hasErrors(errors: Dict<string>) {
+  return Object.keys(errors).length !== 0;
+}
 
-    timeline.push({
-      pr: getArtifactPr(reason),
-      kind,
-      sha: commit.sha,
-      status: `Queued (#${queued_before + 1})`,
-      end_time: expected_end,
-      end_estimated: true,
-      errors: [],
-      duration: null,
-      warning: null,
-      current: false,
-    });
-    queued_before -= 1;
-  }
+function getErrorsLength(errors: Dict<string>) {
+  const errorsLen = Object.keys(errors).length;
+  return `${errorsLen} ${errorsLen > 1 ? "s" : ""}`;
+}
 
-  if (current !== null) {
-    timeline.push({
-      pr: getArtifactPr(current.missing_reason),
-      kind: current.commit.type,
-      sha: current.commit.sha,
-      status: "In progress",
-      end_time: current.expected_end,
-      end_estimated: true,
-      errors: [],
-      duration: null,
-      warning: null,
-      current: true,
-    });
+function PullRequestLink({request}: {request: BenchmarkRequest}) {
+  if (request.requestType === "Release") {
+    return "";
   }
+  return (
+    <a href={`https://github.com/rust-lang/rust/pull/${request.pr}`}>
+      #{request.pr}
+    </a>
+  );
+}
 
-  for (const run of data.value.finished_runs) {
-    const kind = run.artifact.hasOwnProperty("Tag")
-      ? run.artifact["Tag"]
-      : run.artifact["Commit"].type;
-
-    let warning = null;
-    if (kind !== "Try" && run.errors.length > 0) {
-      warning = "Master commit with errors";
+function RequestProgress({
+  request,
+  collectors,
+}: {
+  request: BenchmarkRequest;
+  collectors: CollectorConfig[];
+}): string {
+  const jobs = collectors
+    .flatMap((c) => c.jobs)
+    .filter((j) => j.requestTag === request.tag);
+  const completed = jobs.reduce((acc, job) => {
+    if (isJobComplete(job)) {
+      acc += 1;
     }
-    timeline.push({
-      pr: run.pr,
-      kind,
-      sha: getArtifactSha(run.artifact),
-      status: "Finished",
-      end_time: fromUnixTime(run.finished_at),
-      end_estimated: false,
-      errors: run.errors,
-      duration: run.duration,
-      warning,
-      current: false,
-    });
-  }
+    return acc;
+  }, 0);
 
-  return timeline;
-});
+  if (request.status === "Completed") {
+    return "✅";
+  } else if (request.status === "Queued") {
+    return "";
+  } else {
+    return (
+      <progress
+        title={`${completed} out of ${jobs.length} job(s) completed`}
+        max={jobs.length}
+        value={completed}
+      ></progress>
+    );
+  }
+}
 
 const {toggleExpanded: toggleExpandedErrors, isExpanded: hasExpandedErrors} =
   useExpandedStore();
 
-const loading = ref(true);
+const tableWidth = 8;
 
-const data: Ref<StatusResponse | null> = ref(null);
-loadStatus(loading);
+loadStatusData(loading);
 </script>
 
 <template>
-  <div class="wrapper" v-if="data !== null">
-    <div class="current column-centered">
-      <h3><b>Current collection</b></h3>
-      <div class="column-centered" v-if="currentRun !== null">
-        <div
-          class="benchmark"
-          v-html="
-            formatCommitAsHtml(currentRun.commit, currentRun.missing_reason)
-          "
-        ></div>
-        <table class="current-table">
-          <thead>
-            <tr>
-              <th>Start</th>
-              <th>Progress</th>
-              <th>Expected end</th>
-              <th>Time left</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>{{ format(currentRun.start, "HH:mm") }}</td>
-              <td>
-                <progress
-                  max="100"
-                  :value="currentRun.progress * 100"
-                ></progress>
-              </td>
-              <td>
-                {{ format(currentRun.expected_end, "HH:mm") }}
-              </td>
-              <td>
-                {{ timeLeft <= 0 ? "?" : formatSecondsAsDuration(timeLeft) }}
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <h4 style="margin-top: 20px">Detailed progress</h4>
+  <div v-if="data !== null">
+    <div class="status-page-wrapper">
+      <div class="timeline-wrapper">
+        <h1>Timeline</h1>
+        <div style="margin-bottom: 10px">
+          Queue length: {{ data.queueLength }}
+        </div>
         <table>
           <thead>
             <tr>
-              <th>Step</th>
-              <th></th>
-              <th>Took</th>
-              <th>Expected</th>
+              <th>PR</th>
+              <th>Kind</th>
+              <th>Tag</th>
+              <th>Status</th>
+              <th>Progress</th>
+              <th>Complete at</th>
+              <th>Duration</th>
+              <th>Errors</th>
             </tr>
           </thead>
           <tbody>
-            <tr v-for="step in data.current.progress">
-              <td>{{ step.step }}</td>
-              <td>
-                <progress
-                  :max="step.expected_duration.toString()"
-                  :value="
-                    (step.is_done
-                      ? step.expected_duration
-                      : step.current_progress
-                    ).toString()
-                  "
-                ></progress>
-              </td>
-              <td class="aligned">
-                {{
-                  step.current_progress == 0
-                    ? ""
-                    : formatSecondsAsDuration(step.current_progress)
-                }}
-              </td>
-              <td class="aligned">
-                {{ formatSecondsAsDuration(step.expected_duration) }}
-              </td>
-            </tr>
+            <template v-for="req in data.timeline">
+              <tr v-if="req.isLastInProgress">
+                <td :colspan="tableWidth"><hr /></td>
+              </tr>
+              <tr :class="getRequestRowClassName(req)">
+                <td><PullRequestLink :request="req" /></td>
+                <td>{{ req.requestType }}</td>
+                <td><CommitSha :tag="req.tag"></CommitSha></td>
+                <td>
+                  {{ formatStatus(req.status)
+                  }}{{
+                    req.status === "Completed" && req.hasPendingJobs ? "*" : ""
+                  }}
+                </td>
+                <td>
+                  <RequestProgress
+                    :request="req"
+                    :collectors="data.collectors"
+                  />
+                </td>
+                <td>
+                  {{ formatISODate(req.completedAt) }}
+                  <span v-if="req.endEstimated">(est.)</span>
+                </td>
+                <td style="text-align: right">
+                  {{ getDuration(req) }}
+                </td>
+
+                <td>
+                  <template v-if="hasErrors(req.errors)">
+                    <button @click="toggleExpandedErrors(req.tag)">
+                      {{ getErrorsLength(req.errors) }}
+                      {{ hasExpandedErrors(req.tag) ? "(hide)" : "(show)" }}
+                    </button>
+                  </template>
+                </td>
+              </tr>
+
+              <tr v-if="hasExpandedErrors(req.tag)">
+                <td :colspan="tableWidth" style="padding: 10px 0">
+                  <div v-for="[context, error] in Object.entries(req.errors)">
+                    <div>
+                      <details>
+                        <summary>{{ context }}</summary>
+                        <pre class="error">{{ error }}</pre>
+                      </details>
+                    </div>
+                  </div>
+                </td>
+              </tr>
+              <tr v-if="req.isLastInProgress">
+                <td :colspan="tableWidth"><hr /></td>
+              </tr>
+            </template>
           </tbody>
         </table>
       </div>
-      <div class="column-centered" v-else>
-        <div>No benchmark in progress.</div>
-        <div>
-          Last collection finished at
-          {{ fromUnixTime(lastFinishedRun.finished_at).toLocaleString() }} ({{
-            formatSecondsAsDuration(
-              differenceInSeconds(
-                new Date(),
-                fromUnixTime(lastFinishedRun.finished_at)
-              )
-            )
-          }}
-          ago)
+      <div class="collector-wrapper">
+        <h1>Collectors</h1>
+        <div class="collectors-grid">
+          <div v-for="collector in data.collectors" :key="collector.name">
+            <Collector :collector="collector" />
+          </div>
         </div>
       </div>
     </div>
-    <div class="column-centered timeline">
-      <h3><b>Timeline</b></h3>
-      <div style="margin-bottom: 10px">
-        Queue length: {{ data.missing.length }}
-      </div>
-      <table>
-        <thead>
-          <tr>
-            <th>PR</th>
-            <th>Kind</th>
-            <th>SHA</th>
-            <th>Status</th>
-            <th>Run end</th>
-            <th>Duration</th>
-            <th>Errors</th>
-          </tr>
-        </thead>
-        <tbody>
-          <template v-for="item in timeline">
-            <tr v-if="item.current">
-              <td colspan="7"><hr /></td>
-            </tr>
-            <tr :class="{active: item.sha === currentRun?.commit?.sha}">
-              <td
-                class="right-align"
-                v-html="pullRequestUrlAsHtml(item.pr)"
-              ></td>
-              <td class="centered">
-                {{ item.kind
-                }}<span v-if="item.warning !== null" :title="item.warning"
-                  >❗</span
-                >
-              </td>
-              <td class="right-align" v-html="commitUrlAsHtml(item.sha)"></td>
-              <td class="centered">{{ item.status }}</td>
-              <td>
-                {{ item.end_time.toLocaleString()
-                }}<template v-if="item.end_estimated"> (est.)</template>
-              </td>
-              <td v-if="item.duration !== null">
-                {{ formatSecondsAsDuration(item.duration) }}
-              </td>
-              <td v-else class="centered">-</td>
-              <td v-if="item.errors.length > 0">
-                <button @click="toggleExpandedErrors(item.sha)">
-                  {{ hasExpandedErrors(item.sha) ? "Hide" : "Show" }}
-                  {{ item.errors.length }} error{{
-                    item.errors.length !== 1 ? "s" : ""
-                  }}
-                </button>
-              </td>
-              <td v-else></td>
-            </tr>
-            <tr v-if="hasExpandedErrors(item.sha)">
-              <td colspan="7" style="padding: 10px 0">
-                <div v-for="benchmark in item.errors">
-                  <div>
-                    <details open>
-                      <summary>{{ benchmark.name }}</summary>
-                      <pre class="error">{{ benchmark.error }}</pre>
-                    </details>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr v-if="item.current">
-              <td colspan="7"><hr /></td>
-            </tr>
-          </template>
-        </tbody>
-      </table>
-    </div>
   </div>
   <div v-else>Loading status…</div>
-  <div style="margin-top: 10px">Times are local.</div>
 </template>
 
 <style scoped lang="scss">
-.timeline {
-  max-width: 100%;
-  width: fit-content;
+.status-page-wrapper {
+  display: flex;
+  flex-direction: column;
+}
+
+.collector-wrapper {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  padding-left: 8px;
+}
+
+.timeline-row-bold {
+  font-weight: bold;
+}
+
+.timeline-wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 50px;
 
   table {
     border-collapse: collapse;
     font-size: 1.1em;
 
+    @media screen and (max-width: 850px) {
+      align-self: start;
+    }
+
     th,
     td {
-      padding: 0.2em;
+      text-align: center;
     }
 
     th {
-      text-align: center;
+      padding: 1em 0.5em;
     }
-    td {
-      text-align: left;
-      padding: 0 0.5em;
 
-      &.centered {
-        text-align: center;
-      }
-      &.right-align {
-        text-align: right;
-      }
+    td {
+      padding: 1px 0.5em;
     }
+
     tr.active {
       font-weight: bold;
     }
   }
-
-  @media screen and (min-width: 1440px) {
-    width: 100%;
-  }
 }
-.wrapper {
-  display: grid;
-  column-gap: 100px;
-  grid-template-columns: 1fr;
 
-  @media screen and (min-width: 1440px) {
-    grid-template-columns: 4fr 6fr;
-  }
-}
 .current {
   max-width: 100%;
   width: fit-content;
@@ -497,4 +336,11 @@ loadStatus(loading);
   white-space: pre-wrap;
   word-break: break-word;
 }
+
+.collectors-grid {
+  width: 100%;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(800px, 1fr));
+  grid-gap: 20px;
+}
 </style>
diff --git a/site/frontend/src/pages/status_new/data.ts b/site/frontend/src/pages/status_new/data.ts
deleted file mode 100644
index 6bee47353..000000000
--- a/site/frontend/src/pages/status_new/data.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-export type BenchmarkRequestType = "Release" | "Master" | "Try";
-export type BenchmarkRequestStatus = "Queued" | "InProgress" | "Completed";
-
-export type BenchmarkRequest = {
-  tag: string;
-  pr: number | null;
-  status: BenchmarkRequestStatus;
-  requestType: BenchmarkRequestType;
-  createdAt: string;
-  completedAt: string | null;
-  endEstimated: boolean;
-  durationS: number | null;
-  errors: Dict<string>;
-};
-
-export type BenchmarkJobStatus = "Queued" | "InProgress" | "Success" | "Failed";
-export type BenchmarkJobKind = "compiletime" | "runtimeInProgress" | "rustc";
-
-export type BenchmarkJob = {
-  requestTag: string;
-  kind: BenchmarkJobKind;
-  target: string;
-  backend: string;
-  profile: string;
-  benchmarkSet: number;
-  createdAt: string;
-  startedAt: string | null;
-  completedAt: string | null;
-  status: BenchmarkJobStatus;
-  dequeCounter: number;
-};
-
-export type CollectorConfig = {
-  name: string;
-  target: string;
-  benchmarkSet: number;
-  isActive: boolean;
-  lastHeartbeatAt: string;
-  dateAdded: string;
-  jobs: BenchmarkJob[];
-};
-
-export type StatusResponse = {
-  requests: BenchmarkRequest[];
-  collectors: CollectorConfig[];
-};
-
-export function isJobComplete(job: BenchmarkJob): boolean {
-  return job.status === "Failed" || job.status === "Success";
-}
diff --git a/site/frontend/src/pages/status_new/page.vue b/site/frontend/src/pages/status_new/page.vue
deleted file mode 100644
index 249c35369..000000000
--- a/site/frontend/src/pages/status_new/page.vue
+++ /dev/null
@@ -1,348 +0,0 @@
-<script setup lang="tsx">
-import {h, ref, Ref} from "vue";
-
-import {getJson} from "../../utils/requests";
-import {STATUS_DATA_NEW_URL} from "../../urls";
-import {withLoading} from "../../utils/loading";
-import {formatISODate, formatSecondsAsDuration} from "../../utils/formatting";
-import {useExpandedStore} from "../../utils/expansion";
-import {
-  BenchmarkRequest,
-  BenchmarkRequestStatus,
-  CollectorConfig,
-  isJobComplete,
-  StatusResponse,
-} from "./data";
-import Collector from "./collector.vue";
-import CommitSha from "./commit-sha.vue";
-
-const loading = ref(true);
-
-const data: Ref<{
-  timeline: BenchmarkRequestRow[];
-  queueLength: number;
-  collectors: CollectorConfig[];
-} | null> = ref(null);
-
-type BenchmarkRequestRow = BenchmarkRequest & {
-  isLastInProgress: boolean;
-  hasPendingJobs: boolean;
-};
-
-function getRequestRowClassName(req: BenchmarkRequestRow) {
-  if (req.status === "InProgress") {
-    return "timeline-row-bold";
-  }
-  return "";
-}
-
-async function loadStatusData(loading: Ref<boolean>) {
-  data.value = await withLoading(loading, async () => {
-    let resp: StatusResponse = await getJson<StatusResponse>(
-      STATUS_DATA_NEW_URL
-    );
-    let timeline: BenchmarkRequestRow[] = [];
-
-    let queueLength = 0;
-
-    let requests_with_pending_jobs = new Set();
-    for (const job of resp.collectors.flatMap((c) => c.jobs)) {
-      if (job.status === "Queued" || job.status === "InProgress") {
-        requests_with_pending_jobs.add(job.requestTag);
-      }
-    }
-
-    // Figure out where to draw the line.
-    for (let i = 0; i < resp.requests.length; i++) {
-      let request = resp.requests[i];
-      let isLastInProgress =
-        request.status === "InProgress" &&
-        (i == resp.requests.length - 1 ||
-          resp.requests[i + 1].status !== "InProgress");
-      timeline.push({
-        ...request,
-        isLastInProgress,
-        hasPendingJobs: requests_with_pending_jobs.has(request.tag),
-      });
-
-      if (request.status !== "Completed") {
-        queueLength += 1;
-      }
-    }
-
-    return {
-      timeline,
-      collectors: resp.collectors,
-      queueLength,
-    };
-  });
-}
-
-function getDuration(request: BenchmarkRequest): string {
-  if (request.status === "Completed") {
-    return formatSecondsAsDuration(request.durationS);
-  }
-  return "";
-}
-
-function formatStatus(status: BenchmarkRequestStatus): string {
-  if (status === "Completed") {
-    return "Finished";
-  } else if (status === "InProgress") {
-    return "In progress";
-  } else if (status === "Queued") {
-    return "Queued";
-  } else {
-    return "Unknown";
-  }
-}
-
-function hasErrors(errors: Dict<string>) {
-  return Object.keys(errors).length !== 0;
-}
-
-function getErrorsLength(errors: Dict<string>) {
-  const errorsLen = Object.keys(errors).length;
-  return `${errorsLen} ${errorsLen > 1 ? "s" : ""}`;
-}
-
-function PullRequestLink({request}: {request: BenchmarkRequest}) {
-  if (request.requestType === "Release") {
-    return "";
-  }
-  return (
-    <a href={`https://github.com/rust-lang/rust/pull/${request.pr}`}>
-      #{request.pr}
-    </a>
-  );
-}
-
-function RequestProgress({
-  request,
-  collectors,
-}: {
-  request: BenchmarkRequest;
-  collectors: CollectorConfig[];
-}): string {
-  const jobs = collectors
-    .flatMap((c) => c.jobs)
-    .filter((j) => j.requestTag === request.tag);
-  const completed = jobs.reduce((acc, job) => {
-    if (isJobComplete(job)) {
-      acc += 1;
-    }
-    return acc;
-  }, 0);
-
-  if (request.status === "Completed") {
-    return "✅";
-  } else if (request.status === "Queued") {
-    return "";
-  } else {
-    return (
-      <progress
-        title={`${completed} out of ${jobs.length} job(s) completed`}
-        max={jobs.length}
-        value={completed}
-      ></progress>
-    );
-  }
-}
-
-const {toggleExpanded: toggleExpandedErrors, isExpanded: hasExpandedErrors} =
-  useExpandedStore();
-
-const tableWidth = 8;
-
-loadStatusData(loading);
-</script>
-
-<template>
-  <div v-if="data !== null">
-    <div class="status-page-wrapper">
-      <div class="timeline-wrapper">
-        <h1>Timeline</h1>
-        <div style="margin-bottom: 10px">
-          Queue length: {{ data.queueLength }}
-        </div>
-        <table>
-          <thead>
-            <tr>
-              <th>PR</th>
-              <th>Kind</th>
-              <th>Tag</th>
-              <th>Status</th>
-              <th>Progress</th>
-              <th>Complete at</th>
-              <th>Duration</th>
-              <th>Errors</th>
-            </tr>
-          </thead>
-          <tbody>
-            <template v-for="req in data.timeline">
-              <tr v-if="req.isLastInProgress">
-                <td :colspan="tableWidth"><hr /></td>
-              </tr>
-              <tr :class="getRequestRowClassName(req)">
-                <td><PullRequestLink :request="req" /></td>
-                <td>{{ req.requestType }}</td>
-                <td><CommitSha :tag="req.tag"></CommitSha></td>
-                <td>
-                  {{ formatStatus(req.status)
-                  }}{{
-                    req.status === "Completed" && req.hasPendingJobs ? "*" : ""
-                  }}
-                </td>
-                <td>
-                  <RequestProgress
-                    :request="req"
-                    :collectors="data.collectors"
-                  />
-                </td>
-                <td>
-                  {{ formatISODate(req.completedAt) }}
-                  <span v-if="req.endEstimated">(est.)</span>
-                </td>
-                <td style="text-align: right">
-                  {{ getDuration(req) }}
-                </td>
-
-                <td>
-                  <template v-if="hasErrors(req.errors)">
-                    <button @click="toggleExpandedErrors(req.tag)">
-                      {{ getErrorsLength(req.errors) }}
-                      {{ hasExpandedErrors(req.tag) ? "(hide)" : "(show)" }}
-                    </button>
-                  </template>
-                </td>
-              </tr>
-
-              <tr v-if="hasExpandedErrors(req.tag)">
-                <td :colspan="tableWidth" style="padding: 10px 0">
-                  <div v-for="[context, error] in Object.entries(req.errors)">
-                    <div>
-                      <details>
-                        <summary>{{ context }}</summary>
-                        <pre class="error">{{ error }}</pre>
-                      </details>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr v-if="req.isLastInProgress">
-                <td :colspan="tableWidth"><hr /></td>
-              </tr>
-            </template>
-          </tbody>
-        </table>
-      </div>
-      <div class="collector-wrapper">
-        <h1>Collectors</h1>
-        <div class="collectors-grid">
-          <div v-for="collector in data.collectors" :key="collector.name">
-            <Collector :collector="collector" />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div v-else>Loading status…</div>
-</template>
-
-<style scoped lang="scss">
-.status-page-wrapper {
-  display: flex;
-  flex-direction: column;
-}
-
-.collector-wrapper {
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  padding-left: 8px;
-}
-
-.timeline-row-bold {
-  font-weight: bold;
-}
-
-.timeline-wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 50px;
-
-  table {
-    border-collapse: collapse;
-    font-size: 1.1em;
-
-    @media screen and (max-width: 850px) {
-      align-self: start;
-    }
-
-    th,
-    td {
-      text-align: center;
-    }
-
-    th {
-      padding: 1em 0.5em;
-    }
-
-    td {
-      padding: 1px 0.5em;
-    }
-
-    tr.active {
-      font-weight: bold;
-    }
-  }
-}
-
-.current {
-  max-width: 100%;
-  width: fit-content;
-
-  .benchmark {
-    margin-bottom: 10px;
-    font-size: 1.2em;
-  }
-}
-.column-centered {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.current-table {
-  border-collapse: collapse;
-  font-size: 1.1em;
-
-  td,
-  th {
-    padding: 0 10px;
-  }
-  tbody > tr {
-    td {
-      padding-top: 5px;
-      text-align: center;
-    }
-  }
-}
-.aligned {
-  text-align: right;
-}
-.error {
-  padding: 10px;
-  background-color: #f7f7f7;
-  max-width: 100%;
-  white-space: pre-wrap;
-  word-break: break-word;
-}
-
-.collectors-grid {
-  width: 100%;
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(800px, 1fr));
-  grid-gap: 20px;
-}
-</style>
diff --git a/site/frontend/src/pages/status_new.ts b/site/frontend/src/pages/status_old.ts
similarity index 79%
rename from site/frontend/src/pages/status_new.ts
rename to site/frontend/src/pages/status_old.ts
index 1af392fa8..8e8c5caa3 100644
--- a/site/frontend/src/pages/status_new.ts
+++ b/site/frontend/src/pages/status_old.ts
@@ -1,4 +1,4 @@
-import Status from "./status_new/page.vue";
+import Status from "./status_old/page.vue";
 import {createApp} from "vue";
 import WithSuspense from "../components/with-suspense.vue";
 
diff --git a/site/frontend/src/pages/status_old/data.ts b/site/frontend/src/pages/status_old/data.ts
new file mode 100644
index 000000000..48371985e
--- /dev/null
+++ b/site/frontend/src/pages/status_old/data.ts
@@ -0,0 +1,66 @@
+export interface Commit {
+  sha: string;
+  date: string;
+  type: "Try" | "Master";
+}
+
+export interface BenchmarkError {
+  name: string;
+  error: string;
+}
+
+interface Step {
+  step: string;
+  is_done: boolean;
+  expected_duration: number;
+  current_progress: number;
+}
+
+export type Artifact =
+  | {
+      Commit: Commit;
+    }
+  | {
+      Tag: string;
+    };
+
+export type MissingReason =
+  | {
+      Master: {
+        pr: number;
+        parent_sha: string;
+        is_try_parent: boolean;
+      };
+    }
+  | {
+      Try: {
+        pr: number;
+        parent_sha: string;
+        include: string | null;
+        exclude: string | null;
+        runs: number | null;
+        backends: string | null;
+      };
+    }
+  | {
+      InProgress: MissingReason;
+    };
+
+interface CurrentState {
+  artifact: Artifact;
+  progress: Step[];
+}
+
+export interface FinishedRun {
+  artifact: Artifact;
+  pr: number | null;
+  errors: BenchmarkError[];
+  duration: number;
+  finished_at: number;
+}
+
+export interface StatusResponse {
+  finished_runs: FinishedRun[];
+  current: CurrentState | null;
+  missing: Array<[Commit, MissingReason]>;
+}
diff --git a/site/frontend/src/pages/status/expansion.ts b/site/frontend/src/pages/status_old/expansion.ts
similarity index 100%
rename from site/frontend/src/pages/status/expansion.ts
rename to site/frontend/src/pages/status_old/expansion.ts
diff --git a/site/frontend/src/pages/status_old/page.vue b/site/frontend/src/pages/status_old/page.vue
new file mode 100644
index 000000000..19c96e3c3
--- /dev/null
+++ b/site/frontend/src/pages/status_old/page.vue
@@ -0,0 +1,500 @@
+<script setup lang="ts">
+import {getJson} from "../../utils/requests";
+import {STATUS_DATA_OLD_URL} from "../../urls";
+import {withLoading} from "../../utils/loading";
+import {formatSecondsAsDuration} from "../../utils/formatting";
+import {computed, ref, Ref} from "vue";
+import {
+  Artifact,
+  BenchmarkError,
+  Commit,
+  FinishedRun,
+  MissingReason,
+  StatusResponse,
+} from "./data";
+import {
+  addSeconds,
+  differenceInSeconds,
+  format,
+  fromUnixTime,
+  subSeconds,
+} from "date-fns";
+import {useExpandedStore} from "./expansion";
+
+async function loadStatus(loading: Ref<boolean>) {
+  data.value = await withLoading(loading, () =>
+    getJson<StatusResponse>(STATUS_DATA_OLD_URL)
+  );
+}
+
+function getArtifactPr(reason: MissingReason): number {
+  if (reason.hasOwnProperty("InProgress")) {
+    return getArtifactPr(reason["InProgress"]);
+  } else if (reason.hasOwnProperty("Master")) {
+    return reason["Master"].pr;
+  } else if (reason.hasOwnProperty("Try")) {
+    return reason["Try"].pr;
+  } else {
+    throw new Error(`Unknown missing reason ${reason}`);
+  }
+}
+
+function getArtifactSha(artifact: Artifact): string {
+  if (artifact.hasOwnProperty("Commit")) {
+    return artifact["Commit"].sha;
+  } else if (artifact.hasOwnProperty("Tag")) {
+    return artifact["Tag"];
+  } else {
+    throw new Error(`Unknown artifact ${artifact}`);
+  }
+}
+
+function commitUrlAsHtml(sha: string): string {
+  return `<a href="https://github.com/rust-lang/rust/commit/${sha}">${sha.substring(
+    0,
+    13
+  )}</a>`;
+}
+
+function pullRequestUrlAsHtml(pr: number | null): string {
+  if (pr === null) {
+    return "";
+  }
+  return `<a href="https://github.com/rust-lang/rust/pull/${pr}">#${pr}</a>`;
+}
+
+function formatCommitAsHtml(commit: Commit, reason: MissingReason): string {
+  const url = commitUrlAsHtml(commit.sha);
+  const type = commit.type === "Try" ? "Try" : "Master";
+  const pr = getArtifactPr(reason);
+
+  return `${type} commit ${url} (${pullRequestUrlAsHtml(pr)})`;
+}
+
+interface CurrentRun {
+  commit: Commit;
+  missing_reason: MissingReason;
+  start: Date;
+  expected_end: Date;
+  expected_total: number;
+  progress: number;
+}
+
+interface TimelineEntry {
+  pr: number | null;
+  kind: string;
+  sha: string;
+  status: string;
+  end_time: Date;
+  end_estimated: boolean;
+  duration: number | null;
+  errors: BenchmarkError[];
+  warning: string | null;
+  current: boolean;
+}
+
+const timeLeft = computed(() => {
+  const steps = data.value?.current?.progress ?? [];
+  let left = 0;
+  for (const step of steps) {
+    if (!step.is_done) {
+      left += Math.max(0, step.expected_duration - step.current_progress);
+    }
+  }
+  return left;
+});
+
+const currentRun: Ref<CurrentRun | null> = computed(() => {
+  const current = data.value?.current ?? null;
+  if (current === null) return null;
+  const sha = getArtifactSha(current.artifact);
+
+  const elapsed = current.progress.reduce(
+    (prev, current) => prev + current.current_progress,
+    0
+  );
+  const start = subSeconds(new Date(), elapsed);
+  const expected_total = current.progress.reduce(
+    (prev, current) => prev + current.expected_duration,
+    0
+  );
+  const progress = Math.min(1, elapsed / Math.max(1, expected_total));
+
+  for (const [commit, reason] of data.value.missing) {
+    if (commit.sha === sha && reason.hasOwnProperty("InProgress")) {
+      return {
+        commit,
+        missing_reason: reason["InProgress"],
+        start,
+        expected_end: addSeconds(new Date(), timeLeft.value),
+        expected_total,
+        progress,
+      };
+    }
+  }
+  return null;
+});
+const lastFinishedRun: Ref<FinishedRun | null> = computed(() => {
+  const finished = data.value?.finished_runs;
+  if (finished.length === 0) return null;
+  return finished[0];
+});
+const expectedDuration: Ref<number | null> = computed(() => {
+  if (data.value === null) return null;
+  const current = currentRun.value;
+  if (current !== null) {
+    return current.expected_total;
+  } else {
+    return lastFinishedRun.value?.duration;
+  }
+});
+
+// Timeline of past, current and future runs.
+// Ordered from future to past - at the beginning is the item with the least
+// priority in the queue, and at the end is the oldest finished run.
+const timeline: Ref<TimelineEntry[]> = computed(() => {
+  if (data.value === null) return [];
+  const timeline: TimelineEntry[] = [];
+
+  const current = currentRun.value;
+  const currentTimeLeft = timeLeft.value ?? 0;
+  const expectedRunDuration = expectedDuration.value;
+
+  // The next commit to be benchmarked will be at last position of `queued`
+  const queued = data.value.missing
+    .filter(([_, reason]) => !reason.hasOwnProperty("InProgress"))
+    .reverse();
+  let queued_before = queued.length - 1;
+  const currentRunEnd =
+    current?.expected_end ?? addSeconds(new Date(), currentTimeLeft);
+  for (const [commit, reason] of queued) {
+    const expected_end = addSeconds(
+      currentRunEnd,
+      queued_before * expectedRunDuration + expectedRunDuration
+    );
+
+    let kind = commit.type;
+    if (reason.hasOwnProperty("Master") && reason["Master"].is_try_parent) {
+      kind += " (try parent)";
+    }
+
+    timeline.push({
+      pr: getArtifactPr(reason),
+      kind,
+      sha: commit.sha,
+      status: `Queued (#${queued_before + 1})`,
+      end_time: expected_end,
+      end_estimated: true,
+      errors: [],
+      duration: null,
+      warning: null,
+      current: false,
+    });
+    queued_before -= 1;
+  }
+
+  if (current !== null) {
+    timeline.push({
+      pr: getArtifactPr(current.missing_reason),
+      kind: current.commit.type,
+      sha: current.commit.sha,
+      status: "In progress",
+      end_time: current.expected_end,
+      end_estimated: true,
+      errors: [],
+      duration: null,
+      warning: null,
+      current: true,
+    });
+  }
+
+  for (const run of data.value.finished_runs) {
+    const kind = run.artifact.hasOwnProperty("Tag")
+      ? run.artifact["Tag"]
+      : run.artifact["Commit"].type;
+
+    let warning = null;
+    if (kind !== "Try" && run.errors.length > 0) {
+      warning = "Master commit with errors";
+    }
+    timeline.push({
+      pr: run.pr,
+      kind,
+      sha: getArtifactSha(run.artifact),
+      status: "Finished",
+      end_time: fromUnixTime(run.finished_at),
+      end_estimated: false,
+      errors: run.errors,
+      duration: run.duration,
+      warning,
+      current: false,
+    });
+  }
+
+  return timeline;
+});
+
+const {toggleExpanded: toggleExpandedErrors, isExpanded: hasExpandedErrors} =
+  useExpandedStore();
+
+const loading = ref(true);
+
+const data: Ref<StatusResponse | null> = ref(null);
+loadStatus(loading);
+</script>
+
+<template>
+  <div class="wrapper" v-if="data !== null">
+    <div class="current column-centered">
+      <h3><b>Current collection</b></h3>
+      <div class="column-centered" v-if="currentRun !== null">
+        <div
+          class="benchmark"
+          v-html="
+            formatCommitAsHtml(currentRun.commit, currentRun.missing_reason)
+          "
+        ></div>
+        <table class="current-table">
+          <thead>
+            <tr>
+              <th>Start</th>
+              <th>Progress</th>
+              <th>Expected end</th>
+              <th>Time left</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>{{ format(currentRun.start, "HH:mm") }}</td>
+              <td>
+                <progress
+                  max="100"
+                  :value="currentRun.progress * 100"
+                ></progress>
+              </td>
+              <td>
+                {{ format(currentRun.expected_end, "HH:mm") }}
+              </td>
+              <td>
+                {{ timeLeft <= 0 ? "?" : formatSecondsAsDuration(timeLeft) }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <h4 style="margin-top: 20px">Detailed progress</h4>
+        <table>
+          <thead>
+            <tr>
+              <th>Step</th>
+              <th></th>
+              <th>Took</th>
+              <th>Expected</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="step in data.current.progress">
+              <td>{{ step.step }}</td>
+              <td>
+                <progress
+                  :max="step.expected_duration.toString()"
+                  :value="
+                    (step.is_done
+                      ? step.expected_duration
+                      : step.current_progress
+                    ).toString()
+                  "
+                ></progress>
+              </td>
+              <td class="aligned">
+                {{
+                  step.current_progress == 0
+                    ? ""
+                    : formatSecondsAsDuration(step.current_progress)
+                }}
+              </td>
+              <td class="aligned">
+                {{ formatSecondsAsDuration(step.expected_duration) }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="column-centered" v-else>
+        <div>No benchmark in progress.</div>
+        <div>
+          Last collection finished at
+          {{ fromUnixTime(lastFinishedRun.finished_at).toLocaleString() }} ({{
+            formatSecondsAsDuration(
+              differenceInSeconds(
+                new Date(),
+                fromUnixTime(lastFinishedRun.finished_at)
+              )
+            )
+          }}
+          ago)
+        </div>
+      </div>
+    </div>
+    <div class="column-centered timeline">
+      <h3><b>Timeline</b></h3>
+      <div style="margin-bottom: 10px">
+        Queue length: {{ data.missing.length }}
+      </div>
+      <table>
+        <thead>
+          <tr>
+            <th>PR</th>
+            <th>Kind</th>
+            <th>SHA</th>
+            <th>Status</th>
+            <th>Run end</th>
+            <th>Duration</th>
+            <th>Errors</th>
+          </tr>
+        </thead>
+        <tbody>
+          <template v-for="item in timeline">
+            <tr v-if="item.current">
+              <td colspan="7"><hr /></td>
+            </tr>
+            <tr :class="{active: item.sha === currentRun?.commit?.sha}">
+              <td
+                class="right-align"
+                v-html="pullRequestUrlAsHtml(item.pr)"
+              ></td>
+              <td class="centered">
+                {{ item.kind
+                }}<span v-if="item.warning !== null" :title="item.warning"
+                  >❗</span
+                >
+              </td>
+              <td class="right-align" v-html="commitUrlAsHtml(item.sha)"></td>
+              <td class="centered">{{ item.status }}</td>
+              <td>
+                {{ item.end_time.toLocaleString()
+                }}<template v-if="item.end_estimated"> (est.)</template>
+              </td>
+              <td v-if="item.duration !== null">
+                {{ formatSecondsAsDuration(item.duration) }}
+              </td>
+              <td v-else class="centered">-</td>
+              <td v-if="item.errors.length > 0">
+                <button @click="toggleExpandedErrors(item.sha)">
+                  {{ hasExpandedErrors(item.sha) ? "Hide" : "Show" }}
+                  {{ item.errors.length }} error{{
+                    item.errors.length !== 1 ? "s" : ""
+                  }}
+                </button>
+              </td>
+              <td v-else></td>
+            </tr>
+            <tr v-if="hasExpandedErrors(item.sha)">
+              <td colspan="7" style="padding: 10px 0">
+                <div v-for="benchmark in item.errors">
+                  <div>
+                    <details open>
+                      <summary>{{ benchmark.name }}</summary>
+                      <pre class="error">{{ benchmark.error }}</pre>
+                    </details>
+                  </div>
+                </div>
+              </td>
+            </tr>
+            <tr v-if="item.current">
+              <td colspan="7"><hr /></td>
+            </tr>
+          </template>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div v-else>Loading status…</div>
+  <div style="margin-top: 10px">Times are local.</div>
+</template>
+
+<style scoped lang="scss">
+.timeline {
+  max-width: 100%;
+  width: fit-content;
+
+  table {
+    border-collapse: collapse;
+    font-size: 1.1em;
+
+    th,
+    td {
+      padding: 0.2em;
+    }
+
+    th {
+      text-align: center;
+    }
+    td {
+      text-align: left;
+      padding: 0 0.5em;
+
+      &.centered {
+        text-align: center;
+      }
+      &.right-align {
+        text-align: right;
+      }
+    }
+    tr.active {
+      font-weight: bold;
+    }
+  }
+
+  @media screen and (min-width: 1440px) {
+    width: 100%;
+  }
+}
+.wrapper {
+  display: grid;
+  column-gap: 100px;
+  grid-template-columns: 1fr;
+
+  @media screen and (min-width: 1440px) {
+    grid-template-columns: 4fr 6fr;
+  }
+}
+.current {
+  max-width: 100%;
+  width: fit-content;
+
+  .benchmark {
+    margin-bottom: 10px;
+    font-size: 1.2em;
+  }
+}
+.column-centered {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.current-table {
+  border-collapse: collapse;
+  font-size: 1.1em;
+
+  td,
+  th {
+    padding: 0 10px;
+  }
+  tbody > tr {
+    td {
+      padding-top: 5px;
+      text-align: center;
+    }
+  }
+}
+.aligned {
+  text-align: right;
+}
+.error {
+  padding: 10px;
+  background-color: #f7f7f7;
+  max-width: 100%;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+</style>
diff --git a/site/frontend/src/urls.ts b/site/frontend/src/urls.ts
index 37c97cb54..c653f34e6 100644
--- a/site/frontend/src/urls.ts
+++ b/site/frontend/src/urls.ts
@@ -4,7 +4,7 @@ export const INFO_URL = `${BASE_URL}/info`;
 
 export const DASHBOARD_DATA_URL = `${BASE_URL}/dashboard`;
 export const STATUS_DATA_URL = `${BASE_URL}/status_page`;
-export const STATUS_DATA_NEW_URL = `${BASE_URL}/status_page_new`;
+export const STATUS_DATA_OLD_URL = `${BASE_URL}/status_page_old`;
 export const BOOTSTRAP_DATA_URL = `${BASE_URL}/bootstrap`;
 export const GRAPH_DATA_URL = `${BASE_URL}/graphs`;
 export const COMPARE_DATA_URL = `${BASE_URL}/get`;
diff --git a/site/frontend/templates/layout.html b/site/frontend/templates/layout.html
index 1c5b1562f..585fd6f11 100644
--- a/site/frontend/templates/layout.html
+++ b/site/frontend/templates/layout.html
@@ -10,14 +10,14 @@
   {% block head %}{% endblock %}
 </head>
 <body class="container">
-  <div>&gt; <a href="index.html">graphs</a>, <a href="compare.html">compare</a>,
-    <a href="dashboard.html">dashboard</a>, <a href="bootstrap.html">bootstrap</a>,
-    <a href="status.html">status</a>, <a href="status_new.html">status new</a>, <a href="help.html">help</a>.
-  </div>
-  {% block content %}{% endblock %}
-  <div style="text-align: center;">
-    <a href="https://github.com/rust-lang/rustc-perf">Contribute on GitHub</a>
-  </div>
-  {% block script %}{% endblock %}
+<div>&gt; <a href="index.html">graphs</a>, <a href="compare.html">compare</a>,
+  <a href="dashboard.html">dashboard</a>, <a href="bootstrap.html">bootstrap</a>,
+  <a href="status.html">status</a>, <a href="status_old.html">status (old)</a>, <a href="help.html">help</a>.
+</div>
+{% block content %}{% endblock %}
+<div style="text-align: center;">
+  <a href="https://github.com/rust-lang/rustc-perf">Contribute on GitHub</a>
+</div>
+{% block script %}{% endblock %}
 </body>
 </html>
diff --git a/site/frontend/templates/pages/status_new.html b/site/frontend/templates/pages/status_old.html
similarity index 58%
rename from site/frontend/templates/pages/status_new.html
rename to site/frontend/templates/pages/status_old.html
index fb95a81fb..1715f6cd9 100644
--- a/site/frontend/templates/pages/status_new.html
+++ b/site/frontend/templates/pages/status_old.html
@@ -1,10 +1,10 @@
 {% extends "layout.html" %}
 {% block head %}
-<link rel="stylesheet" type="text/css" href="scripts/status_new.css">
+<link rel="stylesheet" type="text/css" href="scripts/status_old.css">
 {% endblock %}
 {% block content %}
 <div id="app"></div>
 {% endblock %}
 {% block script %}
-<script src="scripts/status_new.js"></script>
+<script src="scripts/status_old.js"></script>
 {% endblock %}
diff --git a/site/src/request_handlers.rs b/site/src/request_handlers.rs
index 3efea3894..d96ca8213 100644
--- a/site/src/request_handlers.rs
+++ b/site/src/request_handlers.rs
@@ -19,8 +19,8 @@ pub use self_profile::{
     handle_self_profile, handle_self_profile_processed_download, handle_self_profile_raw,
     handle_self_profile_raw_download,
 };
-pub use status_page::handle_status_page;
-pub use status_page_new::handle_status_page_new;
+pub use status_page::handle_status_page_old;
+pub use status_page_new::handle_status_page;
 
 use crate::api::{info, ServerResult};
 use crate::load::SiteCtxt;
diff --git a/site/src/request_handlers/status_page.rs b/site/src/request_handlers/status_page.rs
index 70a80a222..e5f6035f0 100644
--- a/site/src/request_handlers/status_page.rs
+++ b/site/src/request_handlers/status_page.rs
@@ -10,7 +10,7 @@ use database::{ArtifactId, Lookup};
 // How many historical (finished) runs should be returned from the status API.
 const FINISHED_RUN_COUNT: u64 = 5;
 
-pub async fn handle_status_page(ctxt: Arc<SiteCtxt>) -> status::Response {
+pub async fn handle_status_page_old(ctxt: Arc<SiteCtxt>) -> status::Response {
     let missing = ctxt.missing_commits().await;
 
     // FIXME: no current builds
diff --git a/site/src/request_handlers/status_page_new.rs b/site/src/request_handlers/status_page_new.rs
index 3bd785bf2..8c6988015 100644
--- a/site/src/request_handlers/status_page_new.rs
+++ b/site/src/request_handlers/status_page_new.rs
@@ -10,7 +10,7 @@ use hashbrown::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
 
-pub async fn handle_status_page_new(ctxt: Arc<SiteCtxt>) -> anyhow::Result<status_new::Response> {
+pub async fn handle_status_page(ctxt: Arc<SiteCtxt>) -> anyhow::Result<status_new::Response> {
     let conn = ctxt.conn().await;
 
     // The queue contains any in-progress request(s) and then the following requests in queue order
diff --git a/site/src/server.rs b/site/src/server.rs
index d494c9240..c1b52b886 100644
--- a/site/src/server.rs
+++ b/site/src/server.rs
@@ -378,13 +378,8 @@ async fn serve_req(server: Server, req: Request) -> Result<Response, ServerError
                 .await;
         }
         "/perf/status_page" => {
-            return server
-                .handle_get_async(&req, request_handlers::handle_status_page)
-                .await;
-        }
-        "/perf/status_page_new" => {
             let ctxt: Arc<SiteCtxt> = server.ctxt.read().as_ref().unwrap().clone();
-            let result = request_handlers::handle_status_page_new(ctxt).await;
+            let result = request_handlers::handle_status_page(ctxt).await;
             return match result {
                 Ok(result) => Ok(http::Response::builder()
                     .header_typed(ContentType::json())
@@ -398,6 +393,11 @@ async fn serve_req(server: Server, req: Request) -> Result<Response, ServerError
                     .unwrap()),
             };
         }
+        "/perf/status_page_old" => {
+            return server
+                .handle_get_async(&req, request_handlers::handle_status_page_old)
+                .await;
+        }
         "/perf/next_artifact" => {
             return server
                 .handle_get_async(&req, request_handlers::handle_next_artifact)
@@ -658,7 +658,7 @@ async fn handle_fs_path(
         | "/dashboard.html"
         | "/detailed-query.html"
         | "/help.html"
-        | "/status_new.html"
+        | "/status_old.html"
         | "/status.html" => resolve_template(relative_path).await,
         _ => match TEMPLATES.get_static_asset(relative_path, use_compression)? {
             Payload::Compressed(data) => {