diff --git a/frontend/app/component/form/candidates_votes_form/CandidatesVotesForm.test.tsx b/frontend/app/component/form/candidates_votes_form/CandidatesVotesForm.test.tsx
index 7ea663d7f..1959a5de0 100644
--- a/frontend/app/component/form/candidates_votes_form/CandidatesVotesForm.test.tsx
+++ b/frontend/app/component/form/candidates_votes_form/CandidatesVotesForm.test.tsx
@@ -9,19 +9,19 @@ import {
   POLLING_STATION_DATA_ENTRY_REQUEST_BODY,
   PollingStationFormController,
 } from "@kiesraad/api";
-import { electionDetailMock, politicalGroupMock } from "@kiesraad/api-mocks";
+import { electionMock, politicalGroupMock } from "@kiesraad/api-mocks";
 
 import { CandidatesVotesForm } from "./CandidatesVotesForm";
 
 const Component = (
-  <PollingStationFormController election={electionDetailMock} pollingStationId={1} entryNumber={1}>
+  <PollingStationFormController election={electionMock} pollingStationId={1} entryNumber={1}>
     <CandidatesVotesForm group={politicalGroupMock} />
   </PollingStationFormController>
 );
 
 const rootRequest: POLLING_STATION_DATA_ENTRY_REQUEST_BODY = {
   data: {
-    political_group_votes: electionDetailMock.political_groups.map((group) => ({
+    political_group_votes: electionMock.political_groups.map((group) => ({
       number: group.number,
       total: 0,
       candidate_votes: group.candidates.map((candidate) => ({
@@ -173,7 +173,7 @@ describe("Test CandidatesVotesForm", () => {
 
       const electionMockData: Election = {
         id: 1,
-        name: "Municipal Election",
+        name: "Gemeenteraadsverkiezingen 2026",
         category: "Municipal",
         election_date: "2024-11-30",
         nomination_date: "2024-11-01",
diff --git a/frontend/app/component/form/differences/DifferencesForm.test.tsx b/frontend/app/component/form/differences/DifferencesForm.test.tsx
index d42f58e89..88a78bb81 100644
--- a/frontend/app/component/form/differences/DifferencesForm.test.tsx
+++ b/frontend/app/component/form/differences/DifferencesForm.test.tsx
@@ -10,19 +10,19 @@ import {
   POLLING_STATION_DATA_ENTRY_REQUEST_BODY,
   PollingStationFormController,
 } from "@kiesraad/api";
-import { electionDetailMock } from "@kiesraad/api-mocks";
+import { electionMock } from "@kiesraad/api-mocks";
 
 import { DifferencesForm } from "./DifferencesForm";
 
 const Component = (
-  <PollingStationFormController election={electionDetailMock} pollingStationId={1} entryNumber={1}>
+  <PollingStationFormController election={electionMock} pollingStationId={1} entryNumber={1}>
     <DifferencesForm />
   </PollingStationFormController>
 );
 
 const rootRequest: POLLING_STATION_DATA_ENTRY_REQUEST_BODY = {
   data: {
-    political_group_votes: electionDetailMock.political_groups.map((group) => ({
+    political_group_votes: electionMock.political_groups.map((group) => ({
       number: group.number,
       total: 0,
       candidate_votes: group.candidates.map((candidate) => ({
diff --git a/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.test.tsx b/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.test.tsx
index 49e7e4ad4..abf7b0db1 100644
--- a/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.test.tsx
+++ b/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.test.tsx
@@ -1,21 +1,21 @@
 import { userEvent } from "@testing-library/user-event";
 import { describe, expect, test } from "vitest";
 
-import { PollingStationChoiceForm } from "app/component/form/polling_station_choice/PollingStationChoiceForm.tsx";
+import { PollingStationChoiceForm } from "app/component/form/polling_station_choice/PollingStationChoiceForm";
 import { overrideOnce, render, screen, within } from "app/test/unit";
 
-import { PollingStationProvider } from "@kiesraad/api";
-import { pollingStationMock } from "@kiesraad/api-mocks";
+import { PollingStationListProvider } from "@kiesraad/api";
+import { pollingStationsMockResponse } from "@kiesraad/api-mocks";
 
 describe("Test PollingStationChoiceForm", () => {
   test("Form field entry", async () => {
-    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationMock);
+    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationsMockResponse);
     const user = userEvent.setup();
 
     render(
-      <PollingStationProvider electionId={1}>
+      <PollingStationListProvider electionId={1}>
         <PollingStationChoiceForm />
-      </PollingStationProvider>,
+      </PollingStationListProvider>,
     );
 
     const pollingStation = screen.getByTestId("pollingStation");
@@ -37,12 +37,12 @@ describe("Test PollingStationChoiceForm", () => {
   });
 
   test("Selecting a valid polling station", async () => {
-    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationMock);
+    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationsMockResponse);
     const user = userEvent.setup();
     render(
-      <PollingStationProvider electionId={1}>
+      <PollingStationListProvider electionId={1}>
         <PollingStationChoiceForm />
-      </PollingStationProvider>,
+      </PollingStationListProvider>,
     );
     const pollingStation = screen.getByTestId("pollingStation");
 
@@ -53,12 +53,12 @@ describe("Test PollingStationChoiceForm", () => {
   });
 
   test("Selecting a non-existing polling station", async () => {
-    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationMock);
+    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationsMockResponse);
     const user = userEvent.setup();
     render(
-      <PollingStationProvider electionId={1}>
+      <PollingStationListProvider electionId={1}>
         <PollingStationChoiceForm />
-      </PollingStationProvider>,
+      </PollingStationListProvider>,
     );
     const pollingStation = screen.getByTestId("pollingStation");
 
@@ -71,13 +71,13 @@ describe("Test PollingStationChoiceForm", () => {
   });
 
   test("Polling station list", async () => {
-    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationMock);
+    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationsMockResponse);
     const user = userEvent.setup();
 
     render(
-      <PollingStationProvider electionId={1}>
+      <PollingStationListProvider electionId={1}>
         <PollingStationChoiceForm />
-      </PollingStationProvider>,
+      </PollingStationListProvider>,
     );
 
     expect(screen.getByText("Kies het stembureau")).not.toBeVisible();
@@ -101,9 +101,9 @@ describe("Test PollingStationChoiceForm", () => {
     const user = userEvent.setup();
 
     render(
-      <PollingStationProvider electionId={1}>
+      <PollingStationListProvider electionId={1}>
         <PollingStationChoiceForm />
-      </PollingStationProvider>,
+      </PollingStationListProvider>,
     );
 
     const openPollingStationList = screen.getByTestId("openPollingStationList");
@@ -121,9 +121,9 @@ describe("Test PollingStationChoiceForm", () => {
     const user = userEvent.setup();
 
     render(
-      <PollingStationProvider electionId={1}>
+      <PollingStationListProvider electionId={1}>
         <PollingStationChoiceForm />
-      </PollingStationProvider>,
+      </PollingStationListProvider>,
     );
 
     const openPollingStationList = screen.getByTestId("openPollingStationList");
diff --git a/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.tsx b/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.tsx
index abec7cabb..5c0ce4bf4 100644
--- a/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.tsx
+++ b/frontend/app/component/form/polling_station_choice/PollingStationChoiceForm.tsx
@@ -1,7 +1,7 @@
-import { useContext, useState } from "react";
+import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 
-import { PollingStationsContext } from "@kiesraad/api";
+import { usePollingStationList } from "@kiesraad/api";
 import { Alert, BottomBar, Button, Icon, Spinner } from "@kiesraad/ui";
 
 import { PollingStationSelector } from "./PollingStationSelector";
@@ -10,7 +10,7 @@ import { PollingStationsList } from "./PollingStationsList";
 export function PollingStationChoiceForm() {
   const navigate = useNavigate();
 
-  const { pollingStations, pollingStationsLoading } = useContext(PollingStationsContext);
+  const { pollingStations, pollingStationsLoading } = usePollingStationList();
   const [pollingStationNumber, setPollingStationNumber] = useState<string>("");
 
   const handleSubmit = () => {
@@ -39,7 +39,7 @@ export function PollingStationChoiceForm() {
       <p className="md">
         Klopt de naam van het stembureau met de naam op je papieren proces verbaal?
         <br />
-        Dan kan je beginnen.
+        Dan kan je beginnen. Klopt de naam niet? Overleg met de coördinator.
       </p>
       <BottomBar type="form">
         <Button
diff --git a/frontend/app/component/form/polling_station_choice/PollingStationSelector.module.css b/frontend/app/component/form/polling_station_choice/PollingStationSelector.module.css
index e14ff6ad8..0a1cee48b 100644
--- a/frontend/app/component/form/polling_station_choice/PollingStationSelector.module.css
+++ b/frontend/app/component/form/polling_station_choice/PollingStationSelector.module.css
@@ -3,6 +3,10 @@
   align-items: center;
 }
 
+.input {
+  text-align: right;
+}
+
 .result {
   margin: 0 1em;
   padding: 0 2em;
diff --git a/frontend/app/component/form/polling_station_choice/PollingStationSelector.tsx b/frontend/app/component/form/polling_station_choice/PollingStationSelector.tsx
index 437022cf8..340c86f2c 100644
--- a/frontend/app/component/form/polling_station_choice/PollingStationSelector.tsx
+++ b/frontend/app/component/form/polling_station_choice/PollingStationSelector.tsx
@@ -1,6 +1,6 @@
-import { Dispatch, SetStateAction, useContext, useMemo, useState } from "react";
+import { Dispatch, SetStateAction, useMemo, useState } from "react";
 
-import { PollingStation, PollingStationsContext } from "@kiesraad/api";
+import { PollingStation, usePollingStationList } from "@kiesraad/api";
 import { IconError } from "@kiesraad/icon";
 import { Icon, InputField, Spinner } from "@kiesraad/ui";
 import { cn, useDebouncedCallback } from "@kiesraad/util";
@@ -25,7 +25,7 @@ export function PollingStationSelector({
     undefined,
   );
 
-  const { pollingStations, pollingStationsLoading } = useContext(PollingStationsContext);
+  const { pollingStations, pollingStationsLoading } = usePollingStationList();
 
   const debouncedCallback = useDebouncedCallback((pollingStation: PollingStation | undefined) => {
     setLoading(false);
@@ -44,6 +44,7 @@ export function PollingStationSelector({
     <div className={cls.container}>
       <InputField
         id="pollingStation"
+        className={cls.input}
         name="number"
         value={pollingStationNumber}
         label="Voer het nummer in:"
diff --git a/frontend/app/component/form/voters_and_votes/VotersAndVotesForm.test.tsx b/frontend/app/component/form/voters_and_votes/VotersAndVotesForm.test.tsx
index 549d597b0..6d1508110 100644
--- a/frontend/app/component/form/voters_and_votes/VotersAndVotesForm.test.tsx
+++ b/frontend/app/component/form/voters_and_votes/VotersAndVotesForm.test.tsx
@@ -10,19 +10,19 @@ import {
   POLLING_STATION_DATA_ENTRY_REQUEST_BODY,
   PollingStationFormController,
 } from "@kiesraad/api";
-import { electionDetailMock } from "@kiesraad/api-mocks";
+import { electionMock } from "@kiesraad/api-mocks";
 
 import { VotersAndVotesForm } from "./VotersAndVotesForm";
 
 const Component = (
-  <PollingStationFormController election={electionDetailMock} pollingStationId={1} entryNumber={1}>
+  <PollingStationFormController election={electionMock} pollingStationId={1} entryNumber={1}>
     <VotersAndVotesForm />
   </PollingStationFormController>
 );
 
 const rootRequest: POLLING_STATION_DATA_ENTRY_REQUEST_BODY = {
   data: {
-    political_group_votes: electionDetailMock.political_groups.map((group) => ({
+    political_group_votes: electionMock.political_groups.map((group) => ({
       number: group.number,
       total: 0,
       candidate_votes: group.candidates.map((candidate) => ({
diff --git a/frontend/app/main.tsx b/frontend/app/main.tsx
index 9cd082df0..c59e165f6 100644
--- a/frontend/app/main.tsx
+++ b/frontend/app/main.tsx
@@ -5,8 +5,8 @@ import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import { ApiProvider, ElectionListProvider } from "@kiesraad/api";
 
 // ignore in prod
-import { startMockAPI } from "./msw-mock-api.ts";
-import { routes } from "./routes.tsx";
+import { startMockAPI } from "./msw-mock-api";
+import { routes } from "./routes";
 
 const rootDiv = document.getElementById("root");
 if (!rootDiv) throw new Error("Root div not found");
diff --git a/frontend/app/module/input/InputLayout.tsx b/frontend/app/module/input/InputLayout.tsx
index 2cc7d0a9f..616797159 100644
--- a/frontend/app/module/input/InputLayout.tsx
+++ b/frontend/app/module/input/InputLayout.tsx
@@ -1,20 +1,18 @@
-import { Outlet, useParams } from "react-router-dom";
+import { Outlet } from "react-router-dom";
 
 import { Footer } from "app/component/footer/Footer";
 
-import { PollingStationProvider } from "@kiesraad/api";
+import { PollingStationListProvider, useElection } from "@kiesraad/api";
 
 export function InputLayout() {
-  const { electionId } = useParams();
+  const { election } = useElection();
   return (
-    <PollingStationProvider electionId={parseInt(electionId ?? "", 10)}>
+    <PollingStationListProvider electionId={election.id}>
       <div className="app-layout">
-        <nav>Hello world</nav>
-
+        <nav>{election.name}</nav> {/* TODO: Add Role in front of election name */}
         <Outlet />
-
         <Footer />
       </div>
-    </PollingStationProvider>
+    </PollingStationListProvider>
   );
 }
diff --git a/frontend/app/module/input/PollingStation/PollingStationHomePage.tsx b/frontend/app/module/input/PollingStation/PollingStationHomePage.tsx
new file mode 100644
index 000000000..c81fbc6e6
--- /dev/null
+++ b/frontend/app/module/input/PollingStation/PollingStationHomePage.tsx
@@ -0,0 +1,9 @@
+import { Link } from "react-router-dom";
+
+export function PollingStationHomePage() {
+  return (
+    <span>
+      Klik <Link to={"./recounted"}>hier</Link> om met de invoer te beginnen.
+    </span>
+  );
+}
diff --git a/frontend/app/module/input/PollingStation/PollingStationLayout.test.tsx b/frontend/app/module/input/PollingStation/PollingStationLayout.test.tsx
index fc205101c..ee6b6519a 100644
--- a/frontend/app/module/input/PollingStation/PollingStationLayout.test.tsx
+++ b/frontend/app/module/input/PollingStation/PollingStationLayout.test.tsx
@@ -1,20 +1,47 @@
-import { describe, expect, test } from "vitest";
+import Router from "react-router";
 
-import { render } from "app/test/unit";
+import { describe, expect, test, vi } from "vitest";
 
-import { ElectionListProvider, ElectionProvider } from "@kiesraad/api";
+import { PollingStationLayout } from "app/module/input";
+import { overrideOnce, render, screen } from "app/test/unit";
 
-import { PollingStationLayout } from "./PollingStationLayout";
+import {
+  ElectionListProvider,
+  ElectionProvider,
+  PollingStationFormController,
+  PollingStationListProvider,
+} from "@kiesraad/api";
+import {
+  electionMock,
+  electionMockResponse,
+  pollingStationMock,
+  pollingStationsMockResponse,
+} from "@kiesraad/api-mocks";
 
 describe("PollingStationLayout", () => {
-  test("Enter form field values", () => {
+  overrideOnce("get", "/api/elections/1", 200, electionMockResponse);
+  overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationsMockResponse);
+  vi.spyOn(Router, "useParams").mockReturnValue({
+    electionId: electionMock.id.toString(),
+    pollingStationId: pollingStationMock.id.toString(),
+  });
+  test("Render", async () => {
     render(
       <ElectionListProvider>
-        <ElectionProvider electionId={1}>
-          <PollingStationLayout />
+        <ElectionProvider electionId={electionMock.id}>
+          <PollingStationListProvider electionId={electionMock.id}>
+            <PollingStationFormController
+              election={electionMock}
+              pollingStationId={pollingStationMock.id}
+              entryNumber={1}
+            >
+              <PollingStationLayout />
+            </PollingStationFormController>
+          </PollingStationListProvider>
         </ElectionProvider>
       </ElectionListProvider>,
     );
-    expect(true).toBe(true);
+    expect(await screen.findByText(pollingStationMock.name));
+    expect(await screen.findByText(pollingStationMock.number));
   });
 });
diff --git a/frontend/app/module/input/PollingStation/PollingStationLayout.tsx b/frontend/app/module/input/PollingStation/PollingStationLayout.tsx
index 82e61890e..4d1256a8f 100644
--- a/frontend/app/module/input/PollingStation/PollingStationLayout.tsx
+++ b/frontend/app/module/input/PollingStation/PollingStationLayout.tsx
@@ -1,14 +1,21 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Outlet, useParams } from "react-router-dom";
 
 import { PollingStationProgress } from "app/component/pollingstation/PollingStationProgress";
 
-import { PollingStationFormController, useElection } from "@kiesraad/api";
+import {
+  PollingStation,
+  PollingStationFormController,
+  useElection,
+  usePollingStationList,
+} from "@kiesraad/api";
 import { IconCross } from "@kiesraad/icon";
 import { Badge, Button, Modal, PollingStationNumber, WorkStationNumber } from "@kiesraad/ui";
 
 export function PollingStationLayout() {
   const { pollingStationId } = useParams();
+  const { pollingStations } = usePollingStationList();
+  const [pollingStation, setPollingStation] = useState<PollingStation>();
   const { election } = useElection();
   const [openModal, setOpenModal] = useState(false);
 
@@ -16,51 +23,60 @@ export function PollingStationLayout() {
     setOpenModal(!openModal);
   }
 
+  useEffect(() => {
+    const parsedStationId = parseInt(pollingStationId || "0");
+    setPollingStation(
+      pollingStations.find((pollingStation) => pollingStation.id === parsedStationId),
+    );
+  }, [pollingStationId, pollingStations]);
+
   return (
-    <PollingStationFormController
-      election={election}
-      pollingStationId={parseInt(pollingStationId || "0")}
-      entryNumber={1}
-    >
-      <header>
-        <section>
-          <PollingStationNumber>{pollingStationId}</PollingStationNumber>
-          <h1>Fluisterbosdreef 8</h1>
-          <Badge type="first_entry" />
-        </section>
-        <section>
-          <Button variant="secondary" size="sm" onClick={changeDialog} rightIcon={<IconCross />}>
-            Invoer afbreken
-          </Button>
-          <WorkStationNumber>16</WorkStationNumber>
-        </section>
-      </header>
-      <main>
-        <nav>
-          <PollingStationProgress />
-        </nav>
-        <article>
-          <Outlet />
-        </article>
-      </main>
-      {openModal && (
-        <Modal onClose={changeDialog}>
-          <h2>Wat wil je doen met je invoer?</h2>
-          <p>
-            Ga je op een later moment verder met het invoeren van dit stembureau? Dan kan je de
-            invoer die je al hebt gedaan bewaren.
-            <br />
-            <br />
-            Twijfel je? Overleg dan met de coördinator.
-          </p>
-          <nav>
-            <Button size="lg">Invoer bewaren</Button>
-            <Button size="lg" variant="secondary">
-              Niet bewaren
+    pollingStation && (
+      <PollingStationFormController
+        election={election}
+        pollingStationId={parseInt(pollingStationId || "0")}
+        entryNumber={1}
+      >
+        <header>
+          <section>
+            <PollingStationNumber>{pollingStation.number}</PollingStationNumber>
+            <h1>{pollingStation.name}</h1>
+            <Badge type="first_entry" />
+          </section>
+          <section>
+            <Button variant="secondary" size="sm" onClick={changeDialog} rightIcon={<IconCross />}>
+              Invoer afbreken
             </Button>
+            <WorkStationNumber>16</WorkStationNumber>
+          </section>
+        </header>
+        <main>
+          <nav>
+            <PollingStationProgress />
           </nav>
-        </Modal>
-      )}
-    </PollingStationFormController>
+          <article>
+            <Outlet />
+          </article>
+        </main>
+        {openModal && (
+          <Modal onClose={changeDialog}>
+            <h2>Wat wil je doen met je invoer?</h2>
+            <p>
+              Ga je op een later moment verder met het invoeren van dit stembureau? Dan kan je de
+              invoer die je al hebt gedaan bewaren.
+              <br />
+              <br />
+              Twijfel je? Overleg dan met de coördinator.
+            </p>
+            <nav>
+              <Button size="lg">Invoer bewaren</Button>
+              <Button size="lg" variant="secondary">
+                Niet bewaren
+              </Button>
+            </nav>
+          </Modal>
+        )}
+      </PollingStationFormController>
+    )
   );
 }
diff --git a/frontend/app/module/input/PollingStation/index.ts b/frontend/app/module/input/PollingStation/index.ts
index d847274d7..448254253 100644
--- a/frontend/app/module/input/PollingStation/index.ts
+++ b/frontend/app/module/input/PollingStation/index.ts
@@ -1,4 +1,5 @@
 export * from "./CandidatesVotesPage";
+export * from "./PollingStationHomePage";
 export * from "./DifferencesPage";
 export * from "./PollingStationLayout";
 export * from "./RecountedPage";
diff --git a/frontend/app/module/input/page/InputHomePage.test.tsx b/frontend/app/module/input/page/InputHomePage.test.tsx
index dc956cd13..36b846c4c 100644
--- a/frontend/app/module/input/page/InputHomePage.test.tsx
+++ b/frontend/app/module/input/page/InputHomePage.test.tsx
@@ -3,12 +3,12 @@ import { describe, expect, test } from "vitest";
 import { overrideOnce, render, screen } from "app/test/unit";
 
 import { ElectionProvider } from "@kiesraad/api";
-import { electionDetailMock } from "@kiesraad/api-mocks";
+import { electionMock, electionMockResponse } from "@kiesraad/api-mocks";
 
 import { InputHomePage } from "./InputHomePage";
 
 describe("InputHomePage", () => {
-  overrideOnce("get", "/api/elections/1", 200, { election: electionDetailMock });
+  overrideOnce("get", "/api/elections/1", 200, electionMockResponse);
   test("Election name", async () => {
     render(
       <ElectionProvider electionId={1}>
@@ -16,6 +16,6 @@ describe("InputHomePage", () => {
       </ElectionProvider>,
     );
 
-    expect(await screen.findByText(electionDetailMock.name)).toBeVisible();
+    expect(await screen.findByText(electionMock.name));
   });
 });
diff --git a/frontend/app/module/input/page/InputHomePage.tsx b/frontend/app/module/input/page/InputHomePage.tsx
index 5af118b05..eb2e84d9e 100644
--- a/frontend/app/module/input/page/InputHomePage.tsx
+++ b/frontend/app/module/input/page/InputHomePage.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 
-import { PollingStationChoiceForm } from "app/component/form/polling_station_choice/PollingStationChoiceForm.tsx";
+import { PollingStationChoiceForm } from "app/component/form/polling_station_choice/PollingStationChoiceForm";
 
 import { useElection } from "@kiesraad/api";
 import { Alert, WorkStationNumber } from "@kiesraad/ui";
diff --git a/frontend/app/module/overview/page/index.ts b/frontend/app/module/overview/page/index.ts
index a3cae0002..d8a8fbb9f 100644
--- a/frontend/app/module/overview/page/index.ts
+++ b/frontend/app/module/overview/page/index.ts
@@ -1 +1 @@
-export * from "./OverviewPage.tsx";
+export * from "./OverviewPage";
diff --git a/frontend/app/module/user/page/index.ts b/frontend/app/module/user/page/index.ts
index b339fcc8d..7cd797ce7 100644
--- a/frontend/app/module/user/page/index.ts
+++ b/frontend/app/module/user/page/index.ts
@@ -1,3 +1,3 @@
-export * from "./LoginPage.tsx";
-export * from "./AccountSetupPage.tsx";
-export * from "./UserHomePage.tsx";
+export * from "./LoginPage";
+export * from "./AccountSetupPage";
+export * from "./UserHomePage";
diff --git a/frontend/app/routes.tsx b/frontend/app/routes.tsx
index a98d6e270..abc6c6951 100644
--- a/frontend/app/routes.tsx
+++ b/frontend/app/routes.tsx
@@ -7,6 +7,7 @@ import {
   DifferencesPage,
   InputHomePage,
   InputLayout,
+  PollingStationHomePage,
   PollingStationLayout,
   RecountedPage,
   VotersAndVotesPage,
@@ -30,8 +31,9 @@ export const routes = createRoutesFromElements(
     <Route path=":electionId" element={<ElectionLayout />}>
       <Route path="input" element={<InputLayout />}>
         <Route index element={<InputHomePage />} />
-        <Route path=":pollingStationId/" element={<PollingStationLayout />}>
-          <Route index path="recounted" element={<RecountedPage />} />
+        <Route path=":pollingStationId" element={<PollingStationLayout />}>
+          <Route index element={<PollingStationHomePage />} />
+          <Route path="recounted" element={<RecountedPage />} />
           <Route path="numbers" element={<VotersAndVotesPage />} />
           <Route path="differences" element={<DifferencesPage />} />
           <Route path="list/:listNumber" element={<CandidatesVotesPage />} />
diff --git a/frontend/app/test/e2e/smoketest.e2e.ts b/frontend/app/test/e2e/smoketest.e2e.ts
index 87b857c30..df31bc404 100644
--- a/frontend/app/test/e2e/smoketest.e2e.ts
+++ b/frontend/app/test/e2e/smoketest.e2e.ts
@@ -7,6 +7,6 @@ test("smoke test", async ({ page }) => {
 });
 
 test("input form", async ({ page }) => {
-  await page.goto("/1/input/030/numbers", { waitUntil: "domcontentloaded" });
+  await page.goto("/1/input/1/numbers", { waitUntil: "domcontentloaded" });
   await expect(page.getByTestId("poll_card_count")).toBeVisible();
 });
diff --git a/frontend/lib/api-mocks/ElectionMockData.ts b/frontend/lib/api-mocks/ElectionMockData.ts
index 60c484f79..ab90babea 100644
--- a/frontend/lib/api-mocks/ElectionMockData.ts
+++ b/frontend/lib/api-mocks/ElectionMockData.ts
@@ -1,4 +1,10 @@
-import { Election, ElectionListResponse, PoliticalGroup } from "@kiesraad/api";
+import {
+  Candidate,
+  Election,
+  ElectionDetailsResponse,
+  ElectionListResponse,
+  PoliticalGroup,
+} from "@kiesraad/api";
 
 export const politicalGroupMockData: PoliticalGroup = {
   number: 1,
@@ -210,417 +216,124 @@ export const politicalGroupMockData: PoliticalGroup = {
   ],
 };
 
-export const electionDetailMockData: Election = {
-  id: 1,
-  name: "Gemeenteraadsverkiezingen 2026",
-  category: "Municipal",
-  election_date: "2024-11-30",
-  nomination_date: "2024-11-01",
-  political_groups: [
-    politicalGroupMockData,
-    {
-      number: 2,
-      name: "Lijst 2 - Wijzen van Water en Wind",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 3,
-      name: "Lijst 3 - Eeuwenoude Aarde Unie",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 4,
-      name: "Lijst 4 - Verbond van Licht en Leven",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 5,
-      name: "Lijst 5 - Nieuwe Horizon Beweging",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 6,
-      name: "Lijst 6 - VRG",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 7,
-      name: "Lijst 7 - Harmonie van Hemel en Aarde",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 8,
-      name: "Lijst 8 - Stralende Sterren Alliantie",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 9,
-      name: "Lijst 9 - Tijdloze Toekomst Partij",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 10,
-      name: "Lijst 10 - Kosmische Kracht Coalitie",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 11,
-      name: "Lijst 11 - Magische Melodieën Beweging",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 12,
-      name: "Lijst 12 - Zilveren Zonnestralen Partij",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 13,
-      name: "Lijst 13 - Mystieke Maanlicht Liga",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 14,
-      name: "Lijst 14 - GVR",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 15,
-      name: "Lijst 15 - Partij voor de ontwikkeling",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 16,
-      name: "Lijst 16 - Bond van de kiezers",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 17,
-      name: "Lijst 17 - Omega",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 18,
-      name: "Lijst 18 - Partij van de werkers",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 19,
-      name: "Lijst 19 - Sterrenpartij",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-    {
-      number: 20,
-      name: "Lijst 20 - Partij voor de zon",
-      candidates: [
-        {
-          number: 1,
-          initials: "A.",
-          first_name: "Alice",
-          last_name: "Foo",
-          locality: "Amsterdam",
-          gender: "Female",
-        },
-        {
-          number: 2,
-          initials: "C.",
-          first_name: "Charlie",
-          last_name: "Doe",
-          locality: "Rotterdam",
-        },
-      ],
-    },
-  ],
-};
+const candidates: Candidate[] = [
+  {
+    number: 1,
+    initials: "A.",
+    first_name: "Alice",
+    last_name: "Foo",
+    locality: "Amsterdam",
+    gender: "Female",
+  },
+  {
+    number: 2,
+    initials: "C.",
+    first_name: "Charlie",
+    last_name: "Doe",
+    locality: "Rotterdam",
+  },
+];
+
+const politicalGroupsMockData: PoliticalGroup[] = [
+  politicalGroupMockData,
+  {
+    number: 2,
+    name: "Lijst 2 - Wijzen van Water en Wind",
+    candidates: candidates,
+  },
+  {
+    number: 3,
+    name: "Lijst 3 - Eeuwenoude Aarde Unie",
+    candidates: candidates,
+  },
+  {
+    number: 4,
+    name: "Lijst 4 - Verbond van Licht en Leven",
+    candidates: candidates,
+  },
+  {
+    number: 5,
+    name: "Lijst 5 - Nieuwe Horizon Beweging",
+    candidates: candidates,
+  },
+  {
+    number: 6,
+    name: "Lijst 6 - VRG",
+    candidates: candidates,
+  },
+  {
+    number: 7,
+    name: "Lijst 7 - Harmonie van Hemel en Aarde",
+    candidates: candidates,
+  },
+  {
+    number: 8,
+    name: "Lijst 8 - Stralende Sterren Alliantie",
+    candidates: candidates,
+  },
+  {
+    number: 9,
+    name: "Lijst 9 - Tijdloze Toekomst Partij",
+    candidates: candidates,
+  },
+  {
+    number: 10,
+    name: "Lijst 10 - Kosmische Kracht Coalitie",
+    candidates: candidates,
+  },
+  {
+    number: 11,
+    name: "Lijst 11 - Magische Melodieën Beweging",
+    candidates: candidates,
+  },
+  {
+    number: 12,
+    name: "Lijst 12 - Zilveren Zonnestralen Partij",
+    candidates: candidates,
+  },
+  {
+    number: 13,
+    name: "Lijst 13 - Mystieke Maanlicht Liga",
+    candidates: candidates,
+  },
+  {
+    number: 14,
+    name: "Lijst 14 - GVR",
+    candidates: candidates,
+  },
+  {
+    number: 15,
+    name: "Lijst 15 - Partij voor de ontwikkeling",
+    candidates: candidates,
+  },
+  {
+    number: 16,
+    name: "Lijst 16 - Bond van de kiezers",
+    candidates: candidates,
+  },
+  {
+    number: 17,
+    name: "Lijst 17 - Omega",
+    candidates: candidates,
+  },
+  {
+    number: 18,
+    name: "Lijst 18 - Partij van de werkers",
+    candidates: candidates,
+  },
+  {
+    number: 19,
+    name: "Lijst 19 - Sterrenpartij",
+    candidates: candidates,
+  },
+  {
+    number: 20,
+    name: "Lijst 20 - Partij voor de zon",
+    candidates: candidates,
+  },
+];
 
-export const electionListMockData: ElectionListResponse = {
+export const electionListMockResponse: ElectionListResponse = {
   elections: [
     {
       id: 1,
@@ -638,3 +351,11 @@ export const electionListMockData: ElectionListResponse = {
     },
   ],
 };
+
+const electionMockData = electionListMockResponse.elections[0] as Election;
+electionMockData.political_groups = politicalGroupsMockData;
+export { electionMockData };
+
+export const electionDetailsMockResponse: ElectionDetailsResponse = {
+  election: electionMockData,
+};
diff --git a/frontend/lib/api-mocks/PollingStationMockData.ts b/frontend/lib/api-mocks/PollingStationMockData.ts
index 337ead329..8b6d4ed0f 100644
--- a/frontend/lib/api-mocks/PollingStationMockData.ts
+++ b/frontend/lib/api-mocks/PollingStationMockData.ts
@@ -1,18 +1,20 @@
-import { PollingStationListResponse } from "@kiesraad/api";
+import { PollingStation, PollingStationListResponse } from "@kiesraad/api";
 
-export const pollingStationMockData: PollingStationListResponse = {
+export const pollingStationMockData: PollingStation = {
+  election_id: 1,
+  id: 1,
+  number: 33,
+  name: 'Stembureau "Op Rolletjes"',
+  house_number: "1",
+  locality: "Den Haag",
+  polling_station_type: "Mobiel",
+  postal_code: "1234 YQ",
+  street: "Rijksweg A12",
+};
+
+export const pollingStationListMockResponse: PollingStationListResponse = {
   polling_stations: [
-    {
-      election_id: 1,
-      id: 1,
-      number: 33,
-      name: 'Stembureau "Op Rolletjes"',
-      house_number: "1",
-      locality: "Den Haag",
-      polling_station_type: "Mobiel",
-      postal_code: "1234 YQ",
-      street: "Rijksweg A12",
-    },
+    pollingStationMockData,
     {
       election_id: 1,
       id: 2,
diff --git a/frontend/lib/api-mocks/index.ts b/frontend/lib/api-mocks/index.ts
index af750dad2..9d8353469 100644
--- a/frontend/lib/api-mocks/index.ts
+++ b/frontend/lib/api-mocks/index.ts
@@ -3,25 +3,34 @@ import { http, type HttpHandler, HttpResponse } from "msw";
 import {
   DataEntryResponse,
   Election,
+  ElectionDetailsResponse,
+  ElectionListResponse,
   ErrorResponse,
   PoliticalGroup,
   POLLING_STATION_DATA_ENTRY_REQUEST_BODY,
   POLLING_STATION_DATA_ENTRY_REQUEST_PARAMS,
+  PollingStation,
   PollingStationListResponse,
   VotersCounts,
   VotesCounts,
 } from "@kiesraad/api";
 
 import {
-  electionDetailMockData,
-  electionListMockData,
+  electionDetailsMockResponse,
+  electionListMockResponse,
+  electionMockData,
   politicalGroupMockData,
-} from "./ElectionMockData.ts";
-import { pollingStationMockData } from "./PollingStationMockData.ts";
+} from "./ElectionMockData";
+import { pollingStationListMockResponse, pollingStationMockData } from "./PollingStationMockData";
 
-export const electionDetailMock = electionDetailMockData as Required<Election>;
+export const electionMock = electionMockData as Required<Election>;
 export const politicalGroupMock = politicalGroupMockData as Required<PoliticalGroup>;
-export const pollingStationMock = pollingStationMockData as Required<PollingStationListResponse>;
+export const pollingStationMock = pollingStationMockData as Required<PollingStation>;
+export const pollingStationsMockResponse =
+  pollingStationListMockResponse as Required<PollingStationListResponse>;
+export const electionMockResponse =
+  electionDetailsMockResponse as Required<ElectionDetailsResponse>;
+export const electionsMockResponse = electionListMockResponse as Required<ElectionListResponse>;
 
 type ParamsToString<T> = {
   [P in keyof T]: string;
@@ -48,6 +57,17 @@ const pingHandler = http.post<PingParams, PingRequestBody, PingResponseBody>(
   },
 );
 
+export const ElectionListRequestHandler = http.get("/api/elections", () => {
+  return HttpResponse.json(electionListMockResponse, { status: 200 });
+});
+
+export const ElectionRequestHandler = http.get<ParamsToString<{ election_id: number }>>(
+  "/api/elections/:election_id",
+  () => {
+    return HttpResponse.json(electionDetailsMockResponse, { status: 200 });
+  },
+);
+
 export const pollingStationDataEntryHandler = http.post<
   ParamsToString<POLLING_STATION_DATA_ENTRY_REQUEST_PARAMS>,
   POLLING_STATION_DATA_ENTRY_REQUEST_BODY,
@@ -178,30 +198,19 @@ export const pollingStationDataEntryHandler = http.post<
   }
 });
 
-export const ElectionListRequestHandler = http.get("/api/elections", () => {
-  return HttpResponse.json(electionListMockData, { status: 200 });
-});
-
-export const ElectionRequestHandler = http.get<ParamsToString<{ election_id: number }>>(
-  "/api/elections/:election_id",
-  () => {
-    return HttpResponse.json({ election: electionDetailMock }, { status: 200 });
-  },
-);
-
 export const PollingStationListRequestHandler = http.get<ParamsToString<{ election_id: number }>>(
   "/api/elections/:election_id/polling_stations",
   () => {
-    return HttpResponse.json(pollingStationMockData, { status: 200 });
+    return HttpResponse.json(pollingStationListMockResponse, { status: 200 });
   },
 );
 
 export const handlers: HttpHandler[] = [
   pingHandler,
-  pollingStationDataEntryHandler,
-  PollingStationListRequestHandler,
   ElectionListRequestHandler,
   ElectionRequestHandler,
+  pollingStationDataEntryHandler,
+  PollingStationListRequestHandler,
 ];
 
 function valueOutOfRange(v: number): boolean {
diff --git a/frontend/lib/api/PollingStationProvider.tsx b/frontend/lib/api/PollingStationProvider.tsx
deleted file mode 100644
index 17c575a3e..000000000
--- a/frontend/lib/api/PollingStationProvider.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as React from "react";
-
-import { PollingStation } from "./gen/openapi";
-import { usePollingStationListRequest } from "./usePollingStation";
-
-export interface iPollingStationsContext {
-  pollingStationsLoading: boolean;
-  pollingStations: PollingStation[];
-}
-
-export const PollingStationsContext = React.createContext<iPollingStationsContext>({
-  pollingStationsLoading: true,
-  pollingStations: [],
-});
-
-export interface PollingStationProviderProps {
-  electionId: number | undefined;
-  children: React.ReactNode;
-}
-
-export function PollingStationProvider({ electionId, children }: PollingStationProviderProps) {
-  const { data, loading } = usePollingStationListRequest({ election_id: electionId as number });
-
-  return (
-    <PollingStationsContext.Provider
-      value={{
-        pollingStationsLoading: loading,
-        pollingStations: data?.polling_stations ?? [],
-      }}
-    >
-      {children}
-    </PollingStationsContext.Provider>
-  );
-}
diff --git a/frontend/lib/api/election/ElectionListProvider.tsx b/frontend/lib/api/election/ElectionListProvider.tsx
index 55be60668..1d4bc4ba5 100644
--- a/frontend/lib/api/election/ElectionListProvider.tsx
+++ b/frontend/lib/api/election/ElectionListProvider.tsx
@@ -1,7 +1,6 @@
 import * as React from "react";
 
-import { Election } from "../gen/openapi";
-import { useElectionListRequest } from "../useElectionListRequest";
+import { Election, useElectionListRequest } from "@kiesraad/api";
 
 export interface iElectionListProviderContext {
   electionList: Election[];
diff --git a/frontend/lib/api/election/ElectionProvider.tsx b/frontend/lib/api/election/ElectionProvider.tsx
index 8be17660b..4c5201b2f 100644
--- a/frontend/lib/api/election/ElectionProvider.tsx
+++ b/frontend/lib/api/election/ElectionProvider.tsx
@@ -1,7 +1,6 @@
 import * as React from "react";
 
-import { Election } from "../gen/openapi";
-import { useElectionDataRequest } from "../useElectionDataRequest";
+import { Election, useElectionDataRequest } from "@kiesraad/api";
 
 export interface iElectionProviderContext {
   election: Required<Election>;
diff --git a/frontend/lib/api/form/useErrorsAndWarnings.ts b/frontend/lib/api/form/useErrorsAndWarnings.ts
index 585637324..d8c659158 100644
--- a/frontend/lib/api/form/useErrorsAndWarnings.ts
+++ b/frontend/lib/api/form/useErrorsAndWarnings.ts
@@ -1,16 +1,14 @@
 import * as React from "react";
 
+import { ErrorsAndWarnings, FieldValidationResult, ValidationResult } from "@kiesraad/api";
 import { fieldNameFromPath } from "@kiesraad/util";
 
-import { ErrorsAndWarnings, FieldValidationResult } from "../api";
-import { ValidationResult } from "../gen/openapi";
-
 export function useErrorsAndWarnings(
   errors: ValidationResult[],
   warnings: ValidationResult[],
   clientWarnings: FieldValidationResult[],
 ) {
-  const errorsAndWarnings: Map<string, ErrorsAndWarnings> = React.useMemo(() => {
+  return React.useMemo(() => {
     const result = new Map<string, ErrorsAndWarnings>();
 
     const process = (target: keyof ErrorsAndWarnings, arr: ValidationResult[]) => {
@@ -50,6 +48,4 @@ export function useErrorsAndWarnings(
 
     return result;
   }, [errors, warnings, clientWarnings]);
-
-  return errorsAndWarnings;
 }
diff --git a/frontend/lib/api/index.ts b/frontend/lib/api/index.ts
index a37d9c71b..240b4cf42 100644
--- a/frontend/lib/api/index.ts
+++ b/frontend/lib/api/index.ts
@@ -1,13 +1,13 @@
 export * from "./election";
+export * from "./form";
 export * from "./gen/openapi";
-export type * from "./api.d.ts";
+export * from "./polling_station";
+export type * from "./api.d";
 export * from "./ApiClient";
 export * from "./ApiProvider";
-export * from "./PollingStationProvider";
 export * from "./useApiGetRequest";
 export * from "./useApiPostRequest";
 export * from "./useElectionDataRequest";
 export * from "./useElectionListRequest";
 export * from "./usePollingStationDataEntry";
-export * from "./usePollingStation";
-export * from "./form";
+export * from "./usePollingStationListRequest";
diff --git a/frontend/lib/api/polling_station/PollingStationListProvider.tsx b/frontend/lib/api/polling_station/PollingStationListProvider.tsx
new file mode 100644
index 000000000..7d5fe2d2a
--- /dev/null
+++ b/frontend/lib/api/polling_station/PollingStationListProvider.tsx
@@ -0,0 +1,37 @@
+import * as React from "react";
+
+import { PollingStation, usePollingStationListRequest } from "@kiesraad/api";
+
+export interface iPollingStationListProviderContext {
+  pollingStationsLoading: boolean;
+  pollingStations: PollingStation[];
+}
+
+export const PollingStationListProviderContext =
+  React.createContext<iPollingStationListProviderContext>({
+    pollingStationsLoading: true,
+    pollingStations: [],
+  });
+
+export interface PollingStationListProviderProps {
+  electionId: number | undefined;
+  children: React.ReactNode;
+}
+
+export function PollingStationListProvider({
+  electionId,
+  children,
+}: PollingStationListProviderProps) {
+  const { data, loading } = usePollingStationListRequest({ election_id: electionId as number });
+
+  return (
+    <PollingStationListProviderContext.Provider
+      value={{
+        pollingStationsLoading: loading,
+        pollingStations: data?.polling_stations ?? [],
+      }}
+    >
+      {children}
+    </PollingStationListProviderContext.Provider>
+  );
+}
diff --git a/frontend/lib/api/polling_station/index.ts b/frontend/lib/api/polling_station/index.ts
new file mode 100644
index 000000000..c0d43e7fa
--- /dev/null
+++ b/frontend/lib/api/polling_station/index.ts
@@ -0,0 +1,2 @@
+export * from "./PollingStationListProvider";
+export * from "./usePollingStationList";
diff --git a/frontend/lib/api/polling_station/usePollingStationList.ts b/frontend/lib/api/polling_station/usePollingStationList.ts
new file mode 100644
index 000000000..e006a9e50
--- /dev/null
+++ b/frontend/lib/api/polling_station/usePollingStationList.ts
@@ -0,0 +1,7 @@
+import * as React from "react";
+
+import { PollingStationListProviderContext } from "./PollingStationListProvider";
+
+export function usePollingStationList() {
+  return React.useContext(PollingStationListProviderContext);
+}
diff --git a/frontend/lib/api/useElectionDataRequest.test.ts b/frontend/lib/api/useElectionDataRequest.test.ts
index 095947ea5..0632df5a6 100644
--- a/frontend/lib/api/useElectionDataRequest.test.ts
+++ b/frontend/lib/api/useElectionDataRequest.test.ts
@@ -2,83 +2,13 @@ import { describe, expect, test } from "vitest";
 
 import { overrideOnce, Providers, renderHook, waitFor } from "app/test/unit";
 
+import { electionMockResponse } from "@kiesraad/api-mocks";
+
 import { useElectionDataRequest } from "./useElectionDataRequest";
 
 describe("Test useElectionDataRequest", () => {
   test("doRequest returns expected data", async () => {
-    const election = {
-      id: 1,
-      name: "Municipal Election",
-      category: "Municipal",
-      election_date: "2024-11-30",
-      nomination_date: "2024-11-01",
-      political_groups: [
-        {
-          number: 1,
-          name: "Lijst 1 - Vurige Vleugels Partij",
-          candidates: [
-            {
-              number: 1,
-              initials: "A.",
-              first_name: "Alice",
-              last_name: "Foo",
-              locality: "Amsterdam",
-              gender: "Female",
-            },
-            {
-              number: 2,
-              initials: "C.",
-              first_name: "Charlie",
-              last_name: "Doe",
-              locality: "Rotterdam",
-            },
-          ],
-        },
-        {
-          number: 2,
-          name: "Lijst 2 - Wijzen van Water en Wind",
-          candidates: [
-            {
-              number: 1,
-              initials: "A.",
-              first_name: "Alice",
-              last_name: "Foo",
-              locality: "Amsterdam",
-              gender: "Female",
-            },
-            {
-              number: 2,
-              initials: "C.",
-              first_name: "Charlie",
-              last_name: "Doe",
-              locality: "Rotterdam",
-            },
-          ],
-        },
-        {
-          number: 3,
-          name: "Lijst 3 - Eeuwenoude Aarde Unie",
-          candidates: [
-            {
-              number: 1,
-              initials: "A.",
-              first_name: "Alice",
-              last_name: "Foo",
-              locality: "Amsterdam",
-              gender: "Female",
-            },
-            {
-              number: 2,
-              initials: "C.",
-              first_name: "Charlie",
-              last_name: "Doe",
-              locality: "Rotterdam",
-            },
-          ],
-        },
-      ],
-    };
-    overrideOnce("get", "/api/elections/1", 200, election);
+    overrideOnce("get", "/api/elections/1", 200, electionMockResponse);
     const { result } = renderHook(
       () =>
         useElectionDataRequest({
@@ -92,6 +22,6 @@ describe("Test useElectionDataRequest", () => {
       expect(result.current.loading).toBe(false);
     });
 
-    expect(result.current.data).toEqual(election);
+    expect(result.current.data).toEqual(electionMockResponse);
   });
 });
diff --git a/frontend/lib/api/useElectionListRequest.test.ts b/frontend/lib/api/useElectionListRequest.test.ts
index 4a751a087..3ba88175c 100644
--- a/frontend/lib/api/useElectionListRequest.test.ts
+++ b/frontend/lib/api/useElectionListRequest.test.ts
@@ -2,29 +2,13 @@ import { describe, expect, test } from "vitest";
 
 import { overrideOnce, Providers, renderHook, waitFor } from "app/test/unit";
 
+import { electionsMockResponse } from "@kiesraad/api-mocks";
+
 import { useElectionListRequest } from "./useElectionListRequest";
 
 describe("Test useElectionListRequest", () => {
   test("doRequest returns expected data", async () => {
-    const elections = {
-      elections: [
-        {
-          id: 1,
-          name: "Municipal Election",
-          category: "Municipal",
-          election_date: "2024-11-30",
-          nomination_date: "2024-11-01",
-        },
-        {
-          id: 2,
-          name: "Municipal Election",
-          category: "Municipal",
-          election_date: "2024-01-30",
-          nomination_date: "2024-01-01",
-        },
-      ],
-    };
-    overrideOnce("get", "/api/elections", 200, elections);
+    overrideOnce("get", "/api/elections", 200, electionsMockResponse);
     const { result } = renderHook(() => useElectionListRequest(), { wrapper: Providers });
 
     expect(result.current.loading).toBe(true);
@@ -32,6 +16,6 @@ describe("Test useElectionListRequest", () => {
       expect(result.current.loading).toBe(false);
     });
 
-    expect(result.current.data).toEqual(elections);
+    expect(result.current.data).toEqual(electionsMockResponse);
   });
 });
diff --git a/frontend/lib/api/usePollingStationListRequest.test.ts b/frontend/lib/api/usePollingStationListRequest.test.ts
new file mode 100644
index 000000000..5cbdf240e
--- /dev/null
+++ b/frontend/lib/api/usePollingStationListRequest.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, test } from "vitest";
+
+import { overrideOnce, Providers, renderHook, waitFor } from "app/test/unit";
+
+import { pollingStationsMockResponse } from "@kiesraad/api-mocks";
+
+import { usePollingStationListRequest } from "./usePollingStationListRequest";
+
+describe("Test usePollingStationListRequest", () => {
+  test("doRequest returns expected data", async () => {
+    overrideOnce("get", "/api/elections/1/polling_stations", 200, pollingStationsMockResponse);
+    const { result } = renderHook(() => usePollingStationListRequest({ election_id: 1 }), {
+      wrapper: Providers,
+    });
+
+    expect(result.current.loading).toBe(true);
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+    });
+
+    expect(result.current.data).toEqual(pollingStationsMockResponse);
+  });
+});
diff --git a/frontend/lib/api/usePollingStation.ts b/frontend/lib/api/usePollingStationListRequest.ts
similarity index 58%
rename from frontend/lib/api/usePollingStation.ts
rename to frontend/lib/api/usePollingStationListRequest.ts
index 0fc8adf8c..2780319aa 100644
--- a/frontend/lib/api/usePollingStation.ts
+++ b/frontend/lib/api/usePollingStationListRequest.ts
@@ -1,5 +1,8 @@
-import { POLLING_STATION_LIST_REQUEST_PARAMS, PollingStationListResponse } from "./gen/openapi";
-import { useApiGetRequest } from "./useApiGetRequest";
+import {
+  POLLING_STATION_LIST_REQUEST_PARAMS,
+  PollingStationListResponse,
+  useApiGetRequest,
+} from "@kiesraad/api";
 
 export function usePollingStationListRequest(params: POLLING_STATION_LIST_REQUEST_PARAMS) {
   return useApiGetRequest<PollingStationListResponse>(
diff --git a/frontend/lib/ui/Badge/Badge.test.tsx b/frontend/lib/ui/Badge/Badge.test.tsx
index a400e3d44..8e18cbe36 100644
--- a/frontend/lib/ui/Badge/Badge.test.tsx
+++ b/frontend/lib/ui/Badge/Badge.test.tsx
@@ -2,7 +2,7 @@ import { expect, test } from "vitest";
 
 import { render, screen } from "app/test/unit";
 
-import { Badge } from "./Badge.tsx";
+import { Badge } from "./Badge";
 
 test("The correction badge is visible", () => {
   render(<Badge type="correction" />);
diff --git a/frontend/lib/ui/BottomBar/BottomBar.test.tsx b/frontend/lib/ui/BottomBar/BottomBar.test.tsx
index 03ddad4c3..844c4e550 100644
--- a/frontend/lib/ui/BottomBar/BottomBar.test.tsx
+++ b/frontend/lib/ui/BottomBar/BottomBar.test.tsx
@@ -2,7 +2,7 @@ import { expect, test } from "vitest";
 
 import { render, screen } from "app/test/unit";
 
-import { DefaultBottomBar } from "./BottomBar.stories.tsx";
+import { DefaultBottomBar } from "./BottomBar.stories";
 
 test("The bottom bar is rendered with a button as child", () => {
   render(<DefaultBottomBar></DefaultBottomBar>);
diff --git a/frontend/lib/ui/InputField/InputField.test.tsx b/frontend/lib/ui/InputField/InputField.test.tsx
index cd09d9240..847a8cbfb 100644
--- a/frontend/lib/ui/InputField/InputField.test.tsx
+++ b/frontend/lib/ui/InputField/InputField.test.tsx
@@ -3,7 +3,7 @@ import { expect, test } from "vitest";
 
 import { render, screen } from "app/test/unit";
 
-import { NarrowInputField, TextAreaInputField, WideInputField } from "./InputField.stories.tsx";
+import { NarrowInputField, TextAreaInputField, WideInputField } from "./InputField.stories";
 
 test("The wide input fields are rendered", () => {
   render(<WideInputField />);