diff --git a/core/onboarding-review.test.ts b/core/onboarding-review.test.ts
index 952e3ce..8d63acd 100644
--- a/core/onboarding-review.test.ts
+++ b/core/onboarding-review.test.ts
@@ -66,6 +66,7 @@ function resume(): ExtractedResume {
       startDate: "2021-05-01",
       endDate: "2021-08-01",
       description: "",
+      site: null,
     },
   ];
   return data;
@@ -164,6 +165,9 @@ describe("keptOnboardingHistory", () => {
       org: "State",
       title: "AS",
       field: "Math",
+      place: "Philadelphia, PA",
+      lat: 39.95,
+      lng: -75.16,
     };
     expect(isBlankOnboardingCheckItem(blankOnboardingCheckItem("Job", -1))).toBe(true);
     expect(isBlankOnboardingCheckItem(job)).toBe(false);
@@ -186,6 +190,13 @@ describe("keptOnboardingHistory", () => {
       institution: "State",
       degree: "AS",
       field: "Math",
+      location: "Philadelphia, PA",
+    });
+    expect(kept.education[0]?.site).toEqual({
+      label: "Philadelphia, PA",
+      address: "Philadelphia, PA",
+      latitude: 39.95,
+      longitude: -75.16,
     });
     expect(kept.skills).toEqual(["PLC"]);
   });
diff --git a/core/onboarding-review.ts b/core/onboarding-review.ts
index 5e395b9..240bdb0 100644
--- a/core/onboarding-review.ts
+++ b/core/onboarding-review.ts
@@ -67,14 +67,14 @@ export function onboardingCheckItems(data: ExtractedResume): OnboardingCheckItem
       org: school.institution || "Untitled school",
       title: school.degree,
       field: school.field,
-      place: school.location || ONBOARDING_NO_PLACE,
+      place: school.site?.label || school.location || ONBOARDING_NO_PLACE,
       startDate: school.startDate,
       endDate: school.endDate,
       isCurrent: false,
       description: school.description,
       achievements: [],
-      lat: null,
-      lng: null,
+      lat: school.site?.latitude ?? null,
+      lng: school.site?.longitude ?? null,
     }),
   );
   return [...jobs, ...schools];
@@ -223,6 +223,10 @@ function keptSchool(
   const base = item.sourceIndex >= 0 ? extracted.education[item.sourceIndex] : undefined;
   if (item.sourceIndex >= 0 && !base) return null;
   const place = item.place === ONBOARDING_NO_PLACE ? (base?.location ?? "") : item.place;
+  const site =
+    item.lat != null && item.lng != null
+      ? { label: place, address: place, latitude: item.lat, longitude: item.lng }
+      : (base?.site ?? null);
   return {
     institution: "",
     degree: "",
@@ -231,6 +235,7 @@ function keptSchool(
     startDate: "",
     endDate: "",
     description: "",
+    site: null,
     ...base,
     institution: item.org.trim() || "Untitled school",
     degree: item.title.trim(),
@@ -239,6 +244,7 @@ function keptSchool(
     startDate: item.startDate,
     endDate: item.endDate,
     description: item.description.trim(),
+    site,
   };
 }
 
diff --git a/core/resume-extract.ts b/core/resume-extract.ts
index d856d6c..feb9d09 100644
--- a/core/resume-extract.ts
+++ b/core/resume-extract.ts
@@ -83,6 +83,7 @@ export type ExtractedSchool = {
   startDate: string;
   endDate: string;
   description: string;
+  site: ExtractedSite | null;
 };
 
 export type ExtractedResume = {
@@ -378,5 +379,6 @@ function asSchool(value: unknown): ExtractedSchool | null {
     startDate: asText(row.startDate),
     endDate: asText(row.endDate),
     description: asText(row.description),
+    site: parseSite(row.site),
   };
 }
diff --git a/server/history.test.ts b/server/history.test.ts
index dc3ec31..9b467d3 100644
--- a/server/history.test.ts
+++ b/server/history.test.ts
@@ -101,6 +101,47 @@ describe("GET /api/history", () => {
     }
   });
 
+  it("pins a validated school site onto the Work Map", async () => {
+    const ctx = setup();
+    try {
+      await ctx.app.request("/api/history", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          experience: [],
+          education: [
+            {
+              institution: "City College",
+              degree: "AAS",
+              location: "Philadelphia, PA",
+              site: {
+                label: "City College",
+                address: "Philadelphia, Pennsylvania, United States",
+                latitude: 39.9526,
+                longitude: -75.1652,
+              },
+            },
+          ],
+          skills: [],
+        }),
+      });
+      const map = await ctx.app.request("/api/work-map");
+      const body = (await map.json()) as {
+        roles: Array<{
+          kind: string;
+          locations: Array<{ label: string; latitude: number }>;
+        }>;
+      };
+      expect(body.roles[0]).toMatchObject({ kind: "school" });
+      expect(body.roles[0]?.locations[0]).toMatchObject({
+        label: "City College",
+        latitude: 39.9526,
+      });
+    } finally {
+      ctx.close();
+    }
+  });
+
   it("pins a validated job site onto the Work Map", async () => {
     const ctx = setup();
     try {
diff --git a/server/history.ts b/server/history.ts
index e2a9167..524ad63 100644
--- a/server/history.ts
+++ b/server/history.ts
@@ -89,6 +89,9 @@ export async function saveExtractedResume(
       school.field,
       now,
     );
+    if (school.site) {
+      persistExtractedSite(db, occupantId, schoolId, school.site);
+    }
     roles.push({
       id: schoolId,
       kind: "school",
diff --git a/web/src/Onboarding.tsx b/web/src/Onboarding.tsx
index 2f2b119..232b67a 100644
--- a/web/src/Onboarding.tsx
+++ b/web/src/Onboarding.tsx
@@ -89,6 +89,7 @@ export function Onboarding({
   const abortRef = useRef<AbortController | null>(null);
   const scanAbort = useRef<AbortController | null>(null);
   const fileInputRef = useRef<HTMLInputElement | null>(null);
+  const previewDialogRef = useRef<HTMLDialogElement>(null);
 
   useEffect(() => {
     if (!photo) return;
@@ -97,6 +98,16 @@ export function Onboarding({
     return () => URL.revokeObjectURL(url);
   }, [photo]);
 
+  useEffect(() => {
+    const node = previewDialogRef.current;
+    if (!node) return;
+    if (previewOpen) {
+      if (!node.open) node.showModal();
+      return;
+    }
+    if (node.open) node.close();
+  }, [previewOpen, file]);
+
   useEffect(() => {
     let cancel = false;
     void (async () => {
@@ -644,9 +655,9 @@ export function Onboarding({
                         <button
                           type="button"
                           className="onboarding-btn onboarding-btn-ghost onboarding-file-preview"
-                          onClick={() => setPreviewOpen((open) => !open)}
+                          onClick={() => setPreviewOpen(true)}
                         >
-                          {previewOpen ? "Hide preview" : "Preview"}
+                          Preview
                         </button>
                       </span>
                     </div>
@@ -664,7 +675,31 @@ export function Onboarding({
                       />
                     </label>
                   )}
-                  {file && previewOpen ? <ResumePreview file={file} /> : null}
+                  {file ? (
+                    <dialog
+                      ref={previewDialogRef}
+                      className="onboarding-review onboarding-file-dialog"
+                      aria-labelledby="onboarding-file-preview-title"
+                      onClose={() => setPreviewOpen(false)}
+                    >
+                      <div className="onboarding-review-head">
+                        <p className="onboarding-kicker">Resume</p>
+                        <button
+                          type="button"
+                          className="onboarding-btn onboarding-btn-ghost"
+                          onClick={() => setPreviewOpen(false)}
+                        >
+                          Close
+                        </button>
+                      </div>
+                      <h2 id="onboarding-file-preview-title">
+                        <em>{file.name}</em>
+                      </h2>
+                      <div className="onboarding-file-dialog-body">
+                        {previewOpen ? <ResumePreview file={file} /> : null}
+                      </div>
+                    </dialog>
+                  ) : null}
                   {file ? (
                     <input
                       ref={fileInputRef}
diff --git a/web/src/OnboardingCheck.tsx b/web/src/OnboardingCheck.tsx
index 5a6ba6c..755aaa6 100644
--- a/web/src/OnboardingCheck.tsx
+++ b/web/src/OnboardingCheck.tsx
@@ -84,14 +84,23 @@ export function CheckOverview({
       </h1>
       {summary ? <p className="onboarding-meta">{summary}</p> : null}
       <ul className="onboarding-roster">
-        {items.map((item) => (
+        {items.map((item, index) => (
           <li key={`${item.source}-${item.sourceIndex}`}>
-            <div className="onboarding-place">
+            <button
+              type="button"
+              className="onboarding-place"
+              onClick={() => {
+                setReviewIndex(index);
+                setReviewOpen(true);
+              }}
+            >
+              <span className="onboarding-pin" data-set={item.lat != null && item.lng != null ? "true" : "false"} aria-hidden="true" />
               <div>
                 <strong>{headerTitle(item)}</strong>
                 <span>{headerDetail(item)}</span>
+                <span>{placeLine(item)}</span>
               </div>
-            </div>
+            </button>
           </li>
         ))}
       </ul>
@@ -102,7 +111,15 @@ export function CheckOverview({
         <button type="button" className="onboarding-verify-btn" onClick={() => add("School")}>
           Add a school
         </button>
-        <button type="button" className="onboarding-verify-btn" onClick={() => setReviewOpen(true)}>
+        <button
+          type="button"
+          className="onboarding-verify-btn"
+          disabled={items.length === 0}
+          onClick={() => {
+            setReviewIndex(0);
+            setReviewOpen(true);
+          }}
+        >
           Review each one
         </button>
       </div>
@@ -217,6 +234,7 @@ function ReviewSlide({
     setStreetOpen(false);
   }, [index, item.org]);
   const placed = item.lat != null && item.lng != null;
+  const prompt = placePrompt(item.kind);
   const last = index + 1 >= total;
   return (
     <>
@@ -286,44 +304,33 @@ function ReviewSlide({
             Current role
           </label>
         ) : null}
-        {item.kind === "Job" ? (
-          <>
-            <div className="onboarding-place">
-              <span className="onboarding-pin" data-set={placed ? "true" : "false"} aria-hidden="true" />
-              <div>
-                <strong>{item.place}</strong>
-                <span>{placed ? "On the map" : "No pin yet"}</span>
-              </div>
-              <button
-                type="button"
-                className="onboarding-place-action"
-                onClick={() => setStreetOpen((open) => !open)}
-              >
-                {streetOpen ? "Close" : placed ? "Change" : "Add a street"}
-              </button>
-            </div>
-            {streetOpen || placed ? (
-              <RolePlacePicker
-                key={`${index}-${item.sourceIndex}`}
-                seed={item.place}
-                searching={streetOpen || !placed}
-                pinned={placed ? [item.lat as number, item.lng as number] : null}
-                onChoose={(place, lat, lng) => {
-                  onChange({ ...item, place, lat, lng });
-                  setStreetOpen(false);
-                }}
-              />
-            ) : null}
-          </>
-        ) : (
-          <label className="onboarding-field">
-            <span>Place</span>
-            <input
-              value={item.place === ONBOARDING_NO_PLACE ? "" : item.place}
-              onChange={(event) => onChange({ ...item, place: event.target.value })}
-            />
-          </label>
-        )}
+        <div className="onboarding-place">
+          <span className="onboarding-pin" data-set={placed ? "true" : "false"} aria-hidden="true" />
+          <div>
+            <strong>{item.place}</strong>
+            <span>{placed ? "On the map" : "No pin yet"}</span>
+          </div>
+          <button
+            type="button"
+            className="onboarding-place-action"
+            onClick={() => setStreetOpen((open) => !open)}
+          >
+            {streetOpen ? "Close" : placed ? "Change" : prompt.add}
+          </button>
+        </div>
+        {streetOpen ? (
+          <RolePlacePicker
+            key={`${index}-${item.source}-${item.sourceIndex}`}
+            seed={item.place}
+            searching={streetOpen}
+            pinned={placed ? [item.lat as number, item.lng as number] : null}
+            prompt={prompt}
+            onChoose={(place, lat, lng) => {
+              onChange({ ...item, place, lat, lng });
+              setStreetOpen(false);
+            }}
+          />
+        ) : null}
         <label className="onboarding-field">
           <span>Description</span>
           <textarea
@@ -382,6 +389,34 @@ function headerDetail(item: OnboardingCheckItem): string {
   return [item.kind, item.org.trim(), item.span.trim()].filter(Boolean).join(" · ");
 }
 
+function placeLine(item: OnboardingCheckItem): string {
+  const place = item.place === ONBOARDING_NO_PLACE ? "No place yet" : item.place;
+  const pin = item.lat != null && item.lng != null ? "On the map" : "No pin yet";
+  return `${place} · ${pin}`;
+}
+
+function placePrompt(kind: OnboardingCheckItem["kind"]): {
+  add: string;
+  label: string;
+  empty: string;
+  hint: string;
+} {
+  if (kind === "School") {
+    return {
+      add: "Add a place",
+      label: "Campus or city",
+      empty: "Campus or city",
+      hint: "Type a campus or city, or click the map.",
+    };
+  }
+  return {
+    add: "Add a street",
+    label: "Street or place",
+    empty: "Street, city",
+    hint: "Type a street, or click the map.",
+  };
+}
+
 function stamped(item: OnboardingCheckItem): OnboardingCheckItem {
   return {
     ...item,
@@ -438,11 +473,13 @@ function RolePlacePicker({
   seed,
   searching,
   pinned,
+  prompt,
   onChoose,
 }: {
   seed: string;
   searching: boolean;
   pinned: [number, number] | null;
+  prompt: { label: string; empty: string; hint: string };
   onChoose: (place: string, lat: number, lng: number) => void;
 }) {
   const [query, setQuery] = useState("");
@@ -485,11 +522,11 @@ function RolePlacePicker({
       {searching ? (
         <>
           <label className="onboarding-field">
-            <span>Street or place</span>
+            <span>{prompt.label}</span>
             <input
               value={query}
               autoComplete="off"
-              placeholder={seed === ONBOARDING_NO_PLACE ? "Street, city" : seed}
+              placeholder={seed === ONBOARDING_NO_PLACE ? prompt.empty : seed}
               role="combobox"
               aria-expanded={hits.length > 0}
               aria-autocomplete="list"
@@ -507,19 +544,19 @@ function RolePlacePicker({
               ))}
             </ul>
           ) : null}
-          <p className="onboarding-quiet">Type a street, or click the map.</p>
+          <p className="onboarding-quiet">{prompt.hint}</p>
         </>
       ) : (
-        <p className="onboarding-quiet">Click the map to move it.</p>
+        <p className="onboarding-quiet">{pinned ? "Click the map to move it." : "Click the map to pin it."}</p>
       )}
       <div className="onboarding-role-map">
         <MapContainer center={center ?? [39.8283, -98.5795]} zoom={center ? 12 : 4} scrollWheelZoom={false}>
           <TileLayer attribution="&copy; OpenStreetMap" url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" />
           <MapFrame center={center} />
           <MapDrop onDrop={(lat, lng) => void drop(lat, lng)} />
-          {center ? (
+          {pinned ? (
             <CircleMarker
-              center={center}
+              center={pinned}
               radius={8}
               pathOptions={{ color: "#f2d19b", fillColor: "#c4a574", fillOpacity: 1, weight: 2 }}
             />
diff --git a/web/src/onboarding.css b/web/src/onboarding.css
index fff7dc2..0c55e19 100644
--- a/web/src/onboarding.css
+++ b/web/src/onboarding.css
@@ -1269,7 +1269,22 @@
 }
 
 .onboarding-roster .onboarding-place {
+  width: 100%;
   margin-top: 0;
+  border: 0;
+  color: inherit;
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+
+.onboarding-roster .onboarding-place:hover,
+.onboarding-roster .onboarding-place:focus-visible {
+  background: rgba(255, 255, 255, 0.06);
+}
+
+.onboarding-roster .onboarding-place > div span {
+  display: block;
 }
 
 .onboarding-place {
@@ -1352,6 +1367,33 @@
   height: min(85vh, 44rem);
 }
 
+.onboarding-file-dialog {
+  box-sizing: border-box;
+  width: min(80rem, calc(100% - 2rem));
+  max-width: calc(100% - 2rem);
+  height: min(92vh, 52rem);
+  max-height: min(92vh, calc(100% - 2rem));
+}
+
+.onboarding-file-dialog-body {
+  display: flex;
+  flex: 1;
+  min-height: 0;
+  margin-top: 0.85rem;
+}
+
+.onboarding-file-dialog-body .onboarding-preview {
+  flex: 1;
+  min-height: 0;
+  margin: 0;
+}
+
+.onboarding-file-dialog-body .onboarding-preview-frame,
+.onboarding-file-dialog-body .onboarding-preview-text {
+  height: 100%;
+  max-height: none;
+}
+
 .onboarding-review[open] {
   display: flex;
   flex-direction: column;