diff --git a/pwa/package-lock.json b/pwa/package-lock.json
index 42ed944a..369cb8fa 100644
--- a/pwa/package-lock.json
+++ b/pwa/package-lock.json
@@ -65,7 +65,7 @@
         "react-dom": "^18.2.0",
         "react-favicon": "^2.0.3",
         "react-helmet": "^6.1.0",
-        "react-hook-form": "7.49.3",
+        "react-hook-form": "7.48.2",
         "react-hot-toast": "^2.4.1",
         "react-i18next": "^13.5.0",
         "react-loading-skeleton": "^3.3.1",
@@ -94,6 +94,37 @@
         "typescript": "^5.3.3"
       }
     },
+    "../../conduction-components": {
+      "name": "@conduction/components",
+      "version": "2.2.44",
+      "license": "ISC",
+      "dependencies": {
+        "@fortawesome/fontawesome-svg-core": "^6.4.2",
+        "@fortawesome/free-solid-svg-icons": "^6.4.2",
+        "@fortawesome/react-fontawesome": "^0.2.0",
+        "@utrecht/component-library-react": "2.0.0",
+        "clsx": "^2.0.0",
+        "gatsby": "^5.12.9",
+        "react": "^18.2.0",
+        "react-datepicker": "^4.23.0",
+        "react-hook-form": "7.48.2",
+        "react-paginate": "^8.2.0",
+        "react-select": "5.8.0",
+        "react-tabs": "^6.0.2",
+        "react-tooltip": "^5.24.0"
+      },
+      "devDependencies": {
+        "@types/node": "^20.9.3",
+        "@types/react": "^18.2.38",
+        "@types/react-datepicker": "^4.19.3",
+        "@types/react-dom": "^18.2.16",
+        "copyfiles": "^2.4.1",
+        "npm-run-all": "^4.1.5",
+        "rimraf": "^5.0.5",
+        "tsc-hooks": "^1.1.2",
+        "typescript": "^5.3.2"
+      }
+    },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
       "license": "MIT",
@@ -2142,39 +2173,8 @@
       }
     },
     "node_modules/@conduction/components": {
-      "version": "2.2.44",
-      "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.44.tgz",
-      "integrity": "sha512-ompsiZ2r2qlgj8nLpgH9oUHO8ZWINT22doQkdzetqm45bmO4rZqE9sUjBU5i2UofebkBGmx6RwKJwfwtYvO//A==",
-      "dependencies": {
-        "@fortawesome/fontawesome-svg-core": "^6.4.2",
-        "@fortawesome/free-solid-svg-icons": "^6.4.2",
-        "@fortawesome/react-fontawesome": "^0.2.0",
-        "@utrecht/component-library-react": "2.0.0",
-        "clsx": "^2.0.0",
-        "gatsby": "^5.12.9",
-        "react": "^18.2.0",
-        "react-datepicker": "^4.23.0",
-        "react-hook-form": "7.48.2",
-        "react-paginate": "^8.2.0",
-        "react-select": "5.8.0",
-        "react-tabs": "^6.0.2",
-        "react-tooltip": "^5.24.0"
-      }
-    },
-    "node_modules/@conduction/components/node_modules/react-hook-form": {
-      "version": "7.48.2",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.48.2.tgz",
-      "integrity": "sha512-H0T2InFQb1hX7qKtDIZmvpU1Xfn/bdahWBN1fH19gSe4bBEqTfmlr7H3XWTaVtiK4/tpPaI1F3355GPMZYge+A==",
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/react-hook-form"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17 || ^18"
-      }
+      "resolved": "../../conduction-components",
+      "link": true
     },
     "node_modules/@conduction/theme": {
       "version": "1.1.12",
@@ -4319,15 +4319,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@popperjs/core": {
-      "version": "2.11.8",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
-      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/@sideway/address": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
@@ -6356,11 +6347,6 @@
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
     },
-    "node_modules/classnames": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
-    },
     "node_modules/cli-boxes": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
@@ -14584,23 +14570,6 @@
         "react-dom": "~15 || ~16 || ~17 || ~18"
       }
     },
-    "node_modules/react-datepicker": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.25.0.tgz",
-      "integrity": "sha512-zB7CSi44SJ0sqo8hUQ3BF1saE/knn7u25qEMTO1CQGofY1VAKahO8k9drZtp0cfW1DMfoYLR3uSY1/uMvbEzbg==",
-      "dependencies": {
-        "@popperjs/core": "^2.11.8",
-        "classnames": "^2.2.6",
-        "date-fns": "^2.30.0",
-        "prop-types": "^15.7.2",
-        "react-onclickoutside": "^6.13.0",
-        "react-popper": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.9.0 || ^17 || ^18",
-        "react-dom": "^16.9.0 || ^17 || ^18"
-      }
-    },
     "node_modules/react-dev-utils": {
       "version": "12.0.1",
       "license": "MIT",
@@ -14702,12 +14671,11 @@
       }
     },
     "node_modules/react-hook-form": {
-      "version": "7.49.3",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.49.3.tgz",
-      "integrity": "sha512-foD6r3juidAT1cOZzpmD/gOKt7fRsDhXXZ0y28+Al1CHgX+AY1qIN9VSIIItXRq1dN68QrRwl1ORFlwjBaAqeQ==",
+      "version": "7.48.2",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.48.2.tgz",
+      "integrity": "sha512-H0T2InFQb1hX7qKtDIZmvpU1Xfn/bdahWBN1fH19gSe4bBEqTfmlr7H3XWTaVtiK4/tpPaI1F3355GPMZYge+A==",
       "engines": {
-        "node": ">=18",
-        "pnpm": "8"
+        "node": ">=12.22.0"
       },
       "funding": {
         "type": "opencollective",
@@ -14762,19 +14730,6 @@
         "react": ">=16.8.0"
       }
     },
-    "node_modules/react-onclickoutside": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz",
-      "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==",
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md"
-      },
-      "peerDependencies": {
-        "react": "^15.5.x || ^16.x || ^17.x || ^18.x",
-        "react-dom": "^15.5.x || ^16.x || ^17.x || ^18.x"
-      }
-    },
     "node_modules/react-paginate": {
       "version": "8.2.0",
       "license": "MIT",
@@ -14785,20 +14740,6 @@
         "react": "^16 || ^17 || ^18"
       }
     },
-    "node_modules/react-popper": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
-      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
-      "dependencies": {
-        "react-fast-compare": "^3.0.1",
-        "warning": "^4.0.2"
-      },
-      "peerDependencies": {
-        "@popperjs/core": "^2.0.0",
-        "react": "^16.8.0 || ^17 || ^18",
-        "react-dom": "^16.8.0 || ^17 || ^18"
-      }
-    },
     "node_modules/react-property": {
       "version": "2.0.2",
       "license": "MIT"
@@ -14886,31 +14827,6 @@
         "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/react-tabs": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz",
-      "integrity": "sha512-aQXTKolnM28k3KguGDBSAbJvcowOQr23A+CUJdzJtOSDOtTwzEaJA+1U4KwhNL9+Obe+jFS7geuvA7ICQPXOnQ==",
-      "dependencies": {
-        "clsx": "^2.0.0",
-        "prop-types": "^15.5.0"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0"
-      }
-    },
-    "node_modules/react-tooltip": {
-      "version": "5.25.0",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.25.0.tgz",
-      "integrity": "sha512-/eGhmlwbHlJrVoUe75fb58rJfAy9aZnTvQAK9ZUPM0n9mmBGpEk13vDPiQVCeUuax+fBej+7JPsUXlhzaySc7w==",
-      "dependencies": {
-        "@floating-ui/dom": "^1.0.0",
-        "classnames": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.14.0",
-        "react-dom": ">=16.14.0"
-      }
-    },
     "node_modules/react-transition-group": {
       "version": "4.4.5",
       "license": "BSD-3-Clause",
@@ -17108,14 +17024,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "license": "MIT",
diff --git a/pwa/package.json b/pwa/package.json
index 4ebc2f05..f1cce364 100644
--- a/pwa/package.json
+++ b/pwa/package.json
@@ -82,7 +82,7 @@
     "react-dom": "^18.2.0",
     "react-favicon": "^2.0.3",
     "react-helmet": "^6.1.0",
-    "react-hook-form": "7.49.3",
+    "react-hook-form": "7.48.2",
     "react-hot-toast": "^2.4.1",
     "react-i18next": "^13.5.0",
     "react-loading-skeleton": "^3.3.1",
diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx
index f30b3af7..9b41fa2e 100644
--- a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx
+++ b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx
@@ -17,7 +17,11 @@ const ResultsDisplaySwitch: React.FC<ResultsDisplaySwitchProps> = ({ layoutClass
   const { t } = useTranslation();
 
   return (
-    <ButtonGroup className={clsx(styles.container, layoutClassName && layoutClassName)}>
+    <ButtonGroup
+      role="region"
+      aria-label={t("View")}
+      className={clsx(styles.container, layoutClassName && layoutClassName)}
+    >
       <Button
         appearance={isActive(displayKey, "cards") ? "primary-action-button" : "secondary-action-button"}
         className={styles.button}
diff --git a/pwa/src/templates/landing/LandingTemplate.tsx b/pwa/src/templates/landing/LandingTemplate.tsx
index ebb60f28..90042276 100644
--- a/pwa/src/templates/landing/LandingTemplate.tsx
+++ b/pwa/src/templates/landing/LandingTemplate.tsx
@@ -42,7 +42,7 @@ export const LandingTemplate: React.FC = () => {
           {getItems.data?.results && getItems.data?.results?.length > 0 && (
             <div id="mainContent">
               <ResultsDisplayTemplate displayKey="landing-results" requests={getItems.data.results} />
-              <div className={styles.pagination}>
+              <div role="region" aria-label={t("Pagination")} className={styles.pagination}>
                 <Pagination
                   ariaLabels={{ previousPage: t("Previous page"), nextPage: t("Next page"), page: t("Page") }}
                   totalPages={getItems.data.pages}
diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
index b691ce4d..193de271 100644
--- a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
+++ b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
@@ -16,9 +16,10 @@ export const CardsResultsTemplate: React.FC<CardsResultsTemplateProps> = ({ requ
 
   return (
     <>
-      <div className={styles.componentsGrid}>
+      <div className={styles.componentsGrid} role="region" aria-label={t("Woo Request")}>
         {requests.map((request) => (
           <CardWrapper
+            role="region"
             key={request._id}
             className={styles.cardContainer}
             onClick={() => navigate(request._id)}
diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
index be8cb147..195dcfb5 100644
--- a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
+++ b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
@@ -124,7 +124,7 @@ export const FiltersTemplate: React.FC<FiltersTemplateProps> = ({ isLoading }) =
 
   return (
     <div id="filters" className={styles.container}>
-      <form onSubmit={handleSubmit(onSubmit)} className={styles.form}>
+      <form role="region" aria-label={t("Filters")} onSubmit={handleSubmit(onSubmit)} className={styles.form}>
         <InputText
           name="_search"
           placeholder={`${t("Search")}..`}
diff --git a/pwa/src/templates/templateParts/header/HeaderTemplate.module.css b/pwa/src/templates/templateParts/header/HeaderTemplate.module.css
index ad1b7ebe..f5706bb3 100644
--- a/pwa/src/templates/templateParts/header/HeaderTemplate.module.css
+++ b/pwa/src/templates/templateParts/header/HeaderTemplate.module.css
@@ -35,3 +35,7 @@
 .languageSelectDisabled {
   opacity: 50%;
 }
+
+.languageSeperator {
+  user-select: none;
+}
diff --git a/pwa/src/templates/templateParts/header/HeaderTemplate.tsx b/pwa/src/templates/templateParts/header/HeaderTemplate.tsx
index aa08b350..8f554962 100644
--- a/pwa/src/templates/templateParts/header/HeaderTemplate.tsx
+++ b/pwa/src/templates/templateParts/header/HeaderTemplate.tsx
@@ -17,7 +17,7 @@ export const HeaderTemplate: React.FC<HeaderTemplateProps> = ({ layoutClassName
 
   return (
     <PageHeader className={clsx(layoutClassName && layoutClassName)}>
-      <div className={styles.container}>
+      <div role="navigation" aria-label="skip" className={styles.container}>
         <div className={styles.skipLinkContainer}>
           <SkipLink href="#filters" tabIndex={gatsbyContext.location.pathname === "/" ? 0 : -1}>
             {t("Skip to filters")}
@@ -28,26 +28,34 @@ export const HeaderTemplate: React.FC<HeaderTemplateProps> = ({ layoutClassName
         </div>
         <div className={styles.navContainer}>
           <Logo onClick={() => navigate("/")} />
-
-          <div className={styles.languageSelectContainer}>
+          <nav role="navigation" aria-label={t("Language select")} className={styles.languageSelectContainer}>
             <span
               className={clsx(styles.languageSelect, i18n.language === "nl" && styles.languageSelectDisabled)}
               onClick={() => i18n.changeLanguage("nl")}
               tabIndex={0}
               aria-label="Vertaal pagina naar het Nederlands"
+              role="button"
+              aria-pressed={i18n.language === "nl" ? true : false}
+              aria-disabled={i18n.language === "nl" ? true : false}
             >
               NL
-            </span>{" "}
-            /{" "}
+            </span>
+            <span className={styles.languageSeperator} aria-hidden="true">
+              {" "}
+              /{" "}
+            </span>
             <span
               className={clsx(styles.languageSelect, i18n.language === "en" && styles.languageSelectDisabled)}
               onClick={() => i18n.changeLanguage("en")}
               tabIndex={0}
               aria-label="Translate page to English"
+              role="button"
+              aria-pressed={i18n.language === "en" ? true : false}
+              aria-disabled={i18n.language === "en" ? true : false}
             >
               EN
             </span>
-          </div>
+          </nav>
         </div>
       </div>
     </PageHeader>
diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx
index 760b15d6..fc3eb421 100644
--- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx
+++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx
@@ -28,7 +28,7 @@ export const TableResultsTemplate: React.FC<TableResultsTemplateProps> = ({ requ
         scrollRightButton: t("Scroll table to the right"),
       }}
     >
-      <Table className={styles.table}>
+      <Table className={styles.table} role="region" aria-label={t("Woo Request")}>
         <TableHeader className={styles.tableHeader}>
           <TableRow>
             <TableHeaderCell>{t("Subject")}</TableHeaderCell>
diff --git a/pwa/src/translations/en.ts b/pwa/src/translations/en.ts
index fd2eaf55..33f9ef2f 100644
--- a/pwa/src/translations/en.ts
+++ b/pwa/src/translations/en.ts
@@ -16,6 +16,9 @@ export const en = {
   Jumbotron: "Jumbotron",
   Limit: "Limit",
   Municipality: "Municipality",
+  Filters: "Filters",
+  View: "View",
+  Pagination: "Pagination",
   "Jumbotron card": "Jumbotron card",
   "N/A": "N/A",
   "Details page": "Details page",
@@ -59,4 +62,6 @@ export const en = {
   "Scroll table to the right": "Scroll table to the right",
   "No category available": "No category available",
   "No municipality available": "No municipality available",
+  "Woo Request": "Woo Request",
+  "Language select": "Language select",
 };
diff --git a/pwa/src/translations/nl.ts b/pwa/src/translations/nl.ts
index 6ffe3212..8a93e512 100644
--- a/pwa/src/translations/nl.ts
+++ b/pwa/src/translations/nl.ts
@@ -16,6 +16,9 @@ export const nl = {
   Jumbotron: "Jumbotron",
   Limit: "Limiet",
   Municipality: "Gemeente",
+  Filters: "Filters",
+  View: "Weergave",
+  Pagination: "Paginering",
   "Jumbotron card": "Jumbotron tegel",
   "N/A": "N.v.t",
   "Details page": "Detailpagina",
@@ -59,4 +62,6 @@ export const nl = {
   "Scroll table to the right": "Scroll tabel naar rechts",
   "No category available": "Geen categorie beschikbaar",
   "No municipality available": "Geen gemeente beschikbaar",
+  "Woo Request": "Woo Verzoek",
+  "Language select": "Taal kiezen",
 };