From c0227ef231826346440089a9d8c63a988814a566 Mon Sep 17 00:00:00 2001
From: Michiel <michielp1807@gmail.com>
Date: Wed, 21 Jan 2026 19:37:38 +0100
Subject: [PATCH 1/5] Make links and nav buttons proper links

---
 frontend/src/Link.tsx                         | 15 ++--
 frontend/src/components/EditButton.tsx        |  7 +-
 .../admin/OrganizationsOverview.tsx           |  6 +-
 frontend/src/hooks/useRemails.ts              |  9 ++-
 frontend/src/layout/Breadcrumbs.tsx           | 14 ++--
 frontend/src/layout/NavBar.tsx                | 69 ++++++++++++-------
 frontend/src/layout/Tabs.tsx                  | 11 ++-
 frontend/src/router.ts                        |  6 +-
 8 files changed, 97 insertions(+), 40 deletions(-)

diff --git a/frontend/src/Link.tsx b/frontend/src/Link.tsx
index 030422a0..8a1ae304 100644
--- a/frontend/src/Link.tsx
+++ b/frontend/src/Link.tsx
@@ -1,4 +1,4 @@
-import { Anchor } from "@mantine/core";
+import { Anchor, AnchorProps } from "@mantine/core";
 import { useRemails } from "./hooks/useRemails.ts";
 import { RouteParams } from "./router.ts";
 import { RouteName } from "./routes.ts";
@@ -8,18 +8,25 @@ interface LinkProps {
   params?: RouteParams;
   underline?: "always" | "hover" | "never";
   children: React.ReactNode;
+  style?: AnchorProps;
 }
 
-export function Link({ to, params, underline, children }: LinkProps) {
-  const { navigate } = useRemails();
+export function Link({ to, params, underline, children, style }: LinkProps) {
+  const { navigate, getRoute } = useRemails();
 
   const onClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
+    if (e.defaultPrevented || e.ctrlKey || e.metaKey) {
+      return;
+    }
+
     e.preventDefault();
     navigate(to, params);
   };
 
+  const route = getRoute(to ?? "default", params);
+
   return (
-    <Anchor onClick={onClick} underline={underline || "always"}>
+    <Anchor href={route.fullPath} onClick={onClick} underline={underline || "always"} {...style}>
       {children}
     </Anchor>
   );
diff --git a/frontend/src/components/EditButton.tsx b/frontend/src/components/EditButton.tsx
index 6f775dcb..772ce242 100644
--- a/frontend/src/components/EditButton.tsx
+++ b/frontend/src/components/EditButton.tsx
@@ -5,12 +5,15 @@ import { RouteName } from "../routes.ts";
 import { RouteParams } from "../router.ts";
 
 export default function EditButton({ route, params }: { route: RouteName; params: RouteParams }) {
-  const { navigate } = useRemails();
+  const { navigate, getRoute } = useRemails();
 
   return (
     <Button
       variant="subtle"
-      onClick={() => {
+      component="a"
+      href={getRoute(route, params).fullPath}
+      onClick={(e) => {
+        e.preventDefault();
         navigate(route, params);
       }}
     >
diff --git a/frontend/src/components/admin/OrganizationsOverview.tsx b/frontend/src/components/admin/OrganizationsOverview.tsx
index 20c2be0b..5df7a3c7 100644
--- a/frontend/src/components/admin/OrganizationsOverview.tsx
+++ b/frontend/src/components/admin/OrganizationsOverview.tsx
@@ -18,6 +18,7 @@ export default function OrganizationsOverview() {
 
   const {
     state: { config },
+    getRoute,
   } = useRemails();
   const { navigate } = useRemails();
 
@@ -66,7 +67,10 @@ export default function OrganizationsOverview() {
         <ActionIcon
           size="30"
           variant="subtle"
-          onClick={() => {
+          component="a"
+          href={getRoute("settings.admin", { org_id: organization.id }).fullPath}
+          onClick={(e) => {
+            e.preventDefault();
             navigate("settings.admin", { org_id: organization.id });
           }}
         >
diff --git a/frontend/src/hooks/useRemails.ts b/frontend/src/hooks/useRemails.ts
index 56608b00..3192ec2f 100644
--- a/frontend/src/hooks/useRemails.ts
+++ b/frontend/src/hooks/useRemails.ts
@@ -1,8 +1,8 @@
 import { ActionDispatch, createContext, useContext, useEffect, useReducer } from "react";
 import { Action, State } from "../types.ts";
 import { useRouter } from "./useRouter.ts";
-import { routes } from "../routes.ts";
-import { Navigate, Router } from "../router.ts";
+import { RouteName, routes } from "../routes.ts";
+import { Navigate, RouteParams, Router } from "../router.ts";
 import { reducer } from "../reducer.ts";
 import apiMiddleware from "../apiMiddleware.ts";
 import { RemailsError } from "../error/error.ts";
@@ -14,6 +14,7 @@ export const RemailsContext = createContext<{
   // Redirect to the page in the `redirect` query param. Used for navigating to the right page after logging in.
   redirect: () => void;
   match: Router["match"];
+  getRoute: Router["navigate"];
 }>({
   state: {
     user: null,
@@ -49,6 +50,9 @@ export const RemailsContext = createContext<{
   redirect: () => {
     throw new Error("RemailsContext must be used within RemailsProvider");
   },
+  getRoute: () => {
+    throw new Error("RemailsContext must be used within RemailsProvider");
+  },
 });
 
 export function useRemails() {
@@ -98,5 +102,6 @@ export function useLoadRemails() {
     navigate,
     redirect,
     match: router.match.bind(router),
+    getRoute: (name: RouteName, params?: RouteParams) => router.navigate(name, params, false),
   };
 }
diff --git a/frontend/src/layout/Breadcrumbs.tsx b/frontend/src/layout/Breadcrumbs.tsx
index bbce55a6..934342a7 100644
--- a/frontend/src/layout/Breadcrumbs.tsx
+++ b/frontend/src/layout/Breadcrumbs.tsx
@@ -1,4 +1,4 @@
-import { Breadcrumbs as MantineBreadcrumbs, Text, Button, Box } from "@mantine/core";
+import { Breadcrumbs as MantineBreadcrumbs, Text } from "@mantine/core";
 import { useCredentials } from "../hooks/useCredentials.ts";
 import { useDomains } from "../hooks/useDomains.ts";
 import { useEmails } from "../hooks/useEmails.ts";
@@ -7,6 +7,7 @@ import { useProjects } from "../hooks/useProjects.ts";
 import { useRemails } from "../hooks/useRemails.ts";
 import { RouteName } from "../routes.ts";
 import { JSX } from "react";
+import { Link } from "../Link.tsx";
 
 interface SegmentProps {
   children: React.ReactNode;
@@ -15,17 +16,20 @@ interface SegmentProps {
 }
 
 function Segment({ children, last, route }: SegmentProps) {
-  const { navigate } = useRemails();
   const props = { fz: "xs", c: "dark.3", px: "xs" };
 
   if (last) {
-    return <Box {...props}>{children}</Box>;
+    return (
+      <Text span {...props}>
+        {children}
+      </Text>
+    );
   }
 
   return (
-    <Button {...props} td="underline" size="xs" h={20} variant="transparent" onClick={() => navigate(route)}>
+    <Link to={route} style={{ size: "xs", fw: "bold", ...props }}>
       {children}
-    </Button>
+    </Link>
   );
 }
 
diff --git a/frontend/src/layout/NavBar.tsx b/frontend/src/layout/NavBar.tsx
index b10b67c7..e8391e35 100644
--- a/frontend/src/layout/NavBar.tsx
+++ b/frontend/src/layout/NavBar.tsx
@@ -1,9 +1,42 @@
-import { NavLink } from "@mantine/core";
+import { BoxProps, NavLink as MantineNavLink } from "@mantine/core";
 import { IconChartBar, IconGavel, IconServer, IconSettings, IconWorldWww } from "@tabler/icons-react";
 import { useRemails } from "../hooks/useRemails.ts";
 import { useDisclosure } from "@mantine/hooks";
 import { NewOrganization } from "../components/organizations/NewOrganization.tsx";
 import OrgDropDown from "./OrgDropDown.tsx";
+import { RouteName } from "../routes.ts";
+
+interface NavLinkProps {
+  label: string;
+  route: RouteName;
+  active: boolean;
+  close: () => void;
+  leftSection?: React.ReactNode;
+  style?: BoxProps;
+}
+
+function NavLink({ label, route, active, close, leftSection, style }: NavLinkProps) {
+  const { navigate, getRoute } = useRemails();
+
+  return (
+    <MantineNavLink
+      label={label}
+      active={active}
+      leftSection={leftSection}
+      href={getRoute(route).fullPath}
+      onClick={(e) => {
+        if (e.defaultPrevented || e.ctrlKey || e.metaKey) {
+          return;
+        }
+
+        e.preventDefault();
+        navigate(route);
+        close();
+      }}
+      {...style}
+    />
+  );
+}
 
 export function NavBar({ close }: { close: () => void }) {
   const {
@@ -20,14 +53,12 @@ export function NavBar({ close }: { close: () => void }) {
     <>
       {user.global_role === "admin" && (
         <NavLink
-          mb="md"
           label="Admin"
           active={routerState.name.startsWith("admin")}
+          route="admin"
+          close={close}
           leftSection={<IconGavel size={20} stroke={1.8} />}
-          onClick={() => {
-            navigate("admin");
-            close();
-          }}
+          style={{ mb: "md" }}
         />
       )}
 
@@ -42,41 +73,33 @@ export function NavBar({ close }: { close: () => void }) {
       <OrgDropDown openNewOrg={openNewOrg} />
 
       <NavLink
-        mt="md"
         label="Projects"
+        route="projects"
+        close={close}
         active={routerState.name.startsWith("projects")}
         leftSection={<IconServer size={20} stroke={1.8} />}
-        onClick={() => {
-          navigate("projects");
-          close();
-        }}
+        style={{ mt: "md" }}
       />
       <NavLink
         label="Domains"
+        route="domains"
+        close={close}
         active={routerState.name.startsWith("domains")}
         leftSection={<IconWorldWww size={20} stroke={1.8} />}
-        onClick={() => {
-          navigate("domains");
-          close();
-        }}
       />
       <NavLink
         label="Statistics"
+        route="statistics"
+        close={close}
         active={routerState.name === "statistics"}
         leftSection={<IconChartBar size={20} stroke={1.8} />}
-        onClick={() => {
-          navigate("statistics");
-          close();
-        }}
       />
       <NavLink
         label="Settings"
+        route="settings"
+        close={close}
         active={routerState.name.startsWith("settings")}
         leftSection={<IconSettings size={20} stroke={1.8} />}
-        onClick={() => {
-          navigate("settings");
-          close();
-        }}
       />
     </>
   );
diff --git a/frontend/src/layout/Tabs.tsx b/frontend/src/layout/Tabs.tsx
index d2f83114..a1b30cca 100644
--- a/frontend/src/layout/Tabs.tsx
+++ b/frontend/src/layout/Tabs.tsx
@@ -16,6 +16,7 @@ export default function Tabs({ tabs, keepMounted }: { tabs: Tab[]; keepMounted?:
   const {
     state: { routerState },
     navigate,
+    getRoute,
   } = useRemails();
 
   const default_route = tabs[0].route;
@@ -30,7 +31,15 @@ export default function Tabs({ tabs, keepMounted }: { tabs: Tab[]; keepMounted?:
     <MTabs value={tab_route} onChange={setActiveTab} keepMounted={keepMounted}>
       <MTabs.List mb="md" mx="-lg" px="lg" className={classes.header}>
         {tabs.map((t) => (
-          <MTabs.Tab size="lg" value={t.route} leftSection={t.icon} key={t.route}>
+          <MTabs.Tab
+            component="a"
+            onClick={(e) => e.preventDefault()}
+            size="lg"
+            value={t.route}
+            leftSection={t.icon}
+            key={t.route}
+            {...{ href: getRoute(t.route).fullPath }}
+          >
             {t.name}
           </MTabs.Tab>
         ))}
diff --git a/frontend/src/router.ts b/frontend/src/router.ts
index 1609d361..ceda0432 100644
--- a/frontend/src/router.ts
+++ b/frontend/src/router.ts
@@ -151,7 +151,7 @@ export class Router {
     return null;
   }
 
-  navigate(name: RouteName, params: RouteParams): FullRouterState {
+  navigate(name: RouteName, params: RouteParams = {}, resetParamCache = true): FullRouterState {
     const route = this.routes.find((route) => route.name === name);
     if (!route) {
       throw new Error(`Route with name ${name} not found`);
@@ -162,7 +162,9 @@ export class Router {
     const query = Object.fromEntries(Object.entries(params).filter(([, v]) => v !== undefined));
     const pathParams = { ...this.pathParamCache, ...query };
 
-    this.pathParamCache = {};
+    if (resetParamCache) {
+      this.pathParamCache = {};
+    }
 
     path = path.replace(/{(\w+)}/g, (_match, key) => {
       const value = pathParams[key];

From 1772392f669801c9539d19645a4ed5a021c95966 Mon Sep 17 00:00:00 2001
From: Michiel <michielp1807@gmail.com>
Date: Fri, 23 Jan 2026 11:51:10 +0100
Subject: [PATCH 2/5] Refactor login page

---
 frontend/src/Login.tsx | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/frontend/src/Login.tsx b/frontend/src/Login.tsx
index 49301527..e5074601 100644
--- a/frontend/src/Login.tsx
+++ b/frontend/src/Login.tsx
@@ -23,6 +23,14 @@ interface LoginProps {
   setUser: (user: User | null) => void;
 }
 
+type LoginType = "login" | "register" | "reset_password";
+
+const BUTTON_NAMES: { [type in LoginType]: string } = {
+  login: "Login",
+  register: "Register",
+  reset_password: "Reset password",
+};
+
 export default function Login({ setUser }: LoginProps) {
   const {
     state: { routerState },
@@ -30,24 +38,11 @@ export default function Login({ setUser }: LoginProps) {
     redirect,
   } = useRemails();
 
-  let type: "login" | "register" | "reset_password" = "login";
-  let buttonName = "Login";
-
-  switch (routerState.params.type) {
-    case "register":
-      type = "register";
-      buttonName = "Register";
-      break;
-    case "reset_password":
-      type = "reset_password";
-      buttonName = "Reset password";
-      break;
-  }
+  const type = routerState.params.type in BUTTON_NAMES ? (routerState.params.type as LoginType) : "login";
+  const buttonName = BUTTON_NAMES[type];
 
   const [globalError, setGlobalError] = useState<string | null>(null);
 
-  const xIcon = <IconX size={20} />;
-
   const form = useForm({
     initialValues: {
       email: "",
@@ -193,7 +188,7 @@ export default function Login({ setUser }: LoginProps) {
               />
             )}
 
-            {globalError && <Alert icon={xIcon}>{globalError}</Alert>}
+            {globalError && <Alert icon={<IconX size={20} />}>{globalError}</Alert>}
           </Stack>
 
           <Group justify="space-between" mt="xl">

From c4f49317312f33ef7016e38d2503948c1b79f99e Mon Sep 17 00:00:00 2001
From: Michiel <michielp1807@gmail.com>
Date: Fri, 23 Jan 2026 11:52:05 +0100
Subject: [PATCH 3/5] Catch route to path errors

---
 frontend/src/Link.tsx                             |  6 ++----
 frontend/src/components/EditButton.tsx            |  4 ++--
 .../components/admin/OrganizationsOverview.tsx    |  4 ++--
 frontend/src/hooks/useRemails.ts                  | 15 ++++++++++++---
 frontend/src/layout/NavBar.tsx                    |  4 ++--
 frontend/src/layout/Tabs.tsx                      |  4 ++--
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/frontend/src/Link.tsx b/frontend/src/Link.tsx
index 8a1ae304..00a36c1e 100644
--- a/frontend/src/Link.tsx
+++ b/frontend/src/Link.tsx
@@ -12,7 +12,7 @@ interface LinkProps {
 }
 
 export function Link({ to, params, underline, children, style }: LinkProps) {
-  const { navigate, getRoute } = useRemails();
+  const { navigate, routeToPath } = useRemails();
 
   const onClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
     if (e.defaultPrevented || e.ctrlKey || e.metaKey) {
@@ -23,10 +23,8 @@ export function Link({ to, params, underline, children, style }: LinkProps) {
     navigate(to, params);
   };
 
-  const route = getRoute(to ?? "default", params);
-
   return (
-    <Anchor href={route.fullPath} onClick={onClick} underline={underline || "always"} {...style}>
+    <Anchor href={routeToPath(to, params)} onClick={onClick} underline={underline || "always"} {...style}>
       {children}
     </Anchor>
   );
diff --git a/frontend/src/components/EditButton.tsx b/frontend/src/components/EditButton.tsx
index 772ce242..90dbcd96 100644
--- a/frontend/src/components/EditButton.tsx
+++ b/frontend/src/components/EditButton.tsx
@@ -5,13 +5,13 @@ import { RouteName } from "../routes.ts";
 import { RouteParams } from "../router.ts";
 
 export default function EditButton({ route, params }: { route: RouteName; params: RouteParams }) {
-  const { navigate, getRoute } = useRemails();
+  const { navigate, routeToPath } = useRemails();
 
   return (
     <Button
       variant="subtle"
       component="a"
-      href={getRoute(route, params).fullPath}
+      href={routeToPath(route, params)}
       onClick={(e) => {
         e.preventDefault();
         navigate(route, params);
diff --git a/frontend/src/components/admin/OrganizationsOverview.tsx b/frontend/src/components/admin/OrganizationsOverview.tsx
index 5df7a3c7..0ce040eb 100644
--- a/frontend/src/components/admin/OrganizationsOverview.tsx
+++ b/frontend/src/components/admin/OrganizationsOverview.tsx
@@ -18,7 +18,7 @@ export default function OrganizationsOverview() {
 
   const {
     state: { config },
-    getRoute,
+    routeToPath,
   } = useRemails();
   const { navigate } = useRemails();
 
@@ -68,7 +68,7 @@ export default function OrganizationsOverview() {
           size="30"
           variant="subtle"
           component="a"
-          href={getRoute("settings.admin", { org_id: organization.id }).fullPath}
+          href={routeToPath("settings.admin", { org_id: organization.id })}
           onClick={(e) => {
             e.preventDefault();
             navigate("settings.admin", { org_id: organization.id });
diff --git a/frontend/src/hooks/useRemails.ts b/frontend/src/hooks/useRemails.ts
index 3192ec2f..46a1aee1 100644
--- a/frontend/src/hooks/useRemails.ts
+++ b/frontend/src/hooks/useRemails.ts
@@ -14,7 +14,7 @@ export const RemailsContext = createContext<{
   // Redirect to the page in the `redirect` query param. Used for navigating to the right page after logging in.
   redirect: () => void;
   match: Router["match"];
-  getRoute: Router["navigate"];
+  routeToPath: (name: RouteName, params?: RouteParams) => string | undefined;
 }>({
   state: {
     user: null,
@@ -50,7 +50,7 @@ export const RemailsContext = createContext<{
   redirect: () => {
     throw new Error("RemailsContext must be used within RemailsProvider");
   },
-  getRoute: () => {
+  routeToPath: () => {
     throw new Error("RemailsContext must be used within RemailsProvider");
   },
 });
@@ -96,12 +96,21 @@ export function useLoadRemails() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const routeToPath = (name: RouteName, params?: RouteParams) => {
+    try {
+      return router.navigate(name, params, false).fullPath;
+    } catch (e) {
+      console.error("could not resolve route:", name, params, e);
+      return undefined;
+    }
+  };
+
   return {
     state,
     dispatch,
     navigate,
     redirect,
     match: router.match.bind(router),
-    getRoute: (name: RouteName, params?: RouteParams) => router.navigate(name, params, false),
+    routeToPath,
   };
 }
diff --git a/frontend/src/layout/NavBar.tsx b/frontend/src/layout/NavBar.tsx
index e8391e35..68d3cae8 100644
--- a/frontend/src/layout/NavBar.tsx
+++ b/frontend/src/layout/NavBar.tsx
@@ -16,14 +16,14 @@ interface NavLinkProps {
 }
 
 function NavLink({ label, route, active, close, leftSection, style }: NavLinkProps) {
-  const { navigate, getRoute } = useRemails();
+  const { navigate, routeToPath } = useRemails();
 
   return (
     <MantineNavLink
       label={label}
       active={active}
       leftSection={leftSection}
-      href={getRoute(route).fullPath}
+      href={routeToPath(route)}
       onClick={(e) => {
         if (e.defaultPrevented || e.ctrlKey || e.metaKey) {
           return;
diff --git a/frontend/src/layout/Tabs.tsx b/frontend/src/layout/Tabs.tsx
index a1b30cca..0be522d9 100644
--- a/frontend/src/layout/Tabs.tsx
+++ b/frontend/src/layout/Tabs.tsx
@@ -16,7 +16,7 @@ export default function Tabs({ tabs, keepMounted }: { tabs: Tab[]; keepMounted?:
   const {
     state: { routerState },
     navigate,
-    getRoute,
+    routeToPath,
   } = useRemails();
 
   const default_route = tabs[0].route;
@@ -38,7 +38,7 @@ export default function Tabs({ tabs, keepMounted }: { tabs: Tab[]; keepMounted?:
             value={t.route}
             leftSection={t.icon}
             key={t.route}
-            {...{ href: getRoute(t.route).fullPath }}
+            {...{ href: routeToPath(t.route) }}
           >
             {t.name}
           </MTabs.Tab>

From 0120953c974ac6de247d52ef63ff8c974fc4bb65 Mon Sep 17 00:00:00 2001
From: Michiel <michielp1807@gmail.com>
Date: Fri, 23 Jan 2026 12:36:19 +0100
Subject: [PATCH 4/5] Fix setup.sh

---
 setup.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/setup.sh b/setup.sh
index aa1c2272..b17b5dff 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,5 +18,11 @@ popd
 cargo sqlx database reset -y
 cargo sqlx migrate run
 
-# run  the full application
-cargo run --bin app --features load-fixtures
+# load fixtures
+psql -h localhost -U remails -w remails < src/fixtures/organizations.sql
+psql -h localhost -U remails -w remails < src/fixtures/api_users.sql
+psql -h localhost -U remails -w remails < src/fixtures/projects.sql
+psql -h localhost -U remails -w remails < src/fixtures/runtime_config.sql
+
+# run the application
+cargo run --bin app

From 676b2c48dbe0e3fb09364edabd53e65ae8296b39 Mon Sep 17 00:00:00 2001
From: Michiel <michielp1807@gmail.com>
Date: Fri, 23 Jan 2026 12:36:58 +0100
Subject: [PATCH 5/5] Fix Playwright tests to use new links

---
 frontend/tests/domains.spec.ts              | 22 ++++++++++++++++-----
 frontend/{playwright => tests}/fixtures.ts  |  2 +-
 frontend/tests/organizationSettings.spec.ts |  4 ++--
 frontend/tests/projects.spec.ts             | 20 ++++++++-----------
 frontend/tests/util.ts                      |  2 +-
 5 files changed, 29 insertions(+), 21 deletions(-)
 rename frontend/{playwright => tests}/fixtures.ts (96%)

diff --git a/frontend/tests/domains.spec.ts b/frontend/tests/domains.spec.ts
index 5ffc833c..6c9498fe 100644
--- a/frontend/tests/domains.spec.ts
+++ b/frontend/tests/domains.spec.ts
@@ -1,11 +1,11 @@
-import { expect, test } from "../playwright/fixtures.ts";
+import { expect, test } from "./fixtures.ts";
 import { createProject, deleteProject, uuidRegex } from "./util.ts";
 import { Page } from "@playwright/test";
 import { v4 as uuid } from "uuid";
 
 async function toDomains(page: Page) {
   // Navigate to domains page
-  await page.locator("a").filter({ hasText: "Domains" }).click();
+  await page.getByRole("link", { name: "Domains", exact: true }).click();
 
   // Check we are on the user domains page
   {
@@ -48,7 +48,13 @@ test("basic domain lifecycle", async ({ page }) => {
   const domain = await createDomain(page);
 
   // go to settings
-  await page.getByRole("table").getByRole("row").filter({ hasText: domain }).getByRole("button").click();
+  await page
+    .getByRole("table")
+    .getByRole("row")
+    .filter({ hasText: domain })
+    .getByRole("link")
+    .locator(".tabler-icon.tabler-icon-edit")
+    .click();
 
   // delete domain
   await page.getByRole("button", { name: "Delete" }).click();
@@ -75,7 +81,13 @@ test("attach project afterward", async ({ page }) => {
   const domain = await createDomain(page);
 
   // go to settings
-  await page.getByRole("table").getByRole("row").filter({ hasText: domain }).getByRole("button").click();
+  await page
+    .getByRole("table")
+    .getByRole("row")
+    .filter({ hasText: domain })
+    .getByRole("link")
+    .locator(".tabler-icon.tabler-icon-edit")
+    .click();
 
   // Click dropdown
   await page.getByRole("textbox", { name: "Usable by" }).click();
@@ -88,7 +100,7 @@ test("attach project afterward", async ({ page }) => {
   await expect(page.getByText("Domain updated")).toBeVisible();
 
   // go back using the breadcrumbs
-  await page.getByRole("button", { name: "domains" }).click();
+  await page.getByRole("link", { name: "domains", exact: true }).click();
 
   // check table row
   await expect(
diff --git a/frontend/playwright/fixtures.ts b/frontend/tests/fixtures.ts
similarity index 96%
rename from frontend/playwright/fixtures.ts
rename to frontend/tests/fixtures.ts
index 53feaa12..32d2da9b 100644
--- a/frontend/playwright/fixtures.ts
+++ b/frontend/tests/fixtures.ts
@@ -3,7 +3,7 @@
 import { test as baseTest } from "@playwright/test";
 import fs from "fs";
 import path from "path";
-import { createAccount } from "../tests/util.ts";
+import { createAccount } from "./util.ts";
 
 export * from "@playwright/test";
 export const test = baseTest.extend<object, { workerStorageState: string }>({
diff --git a/frontend/tests/organizationSettings.spec.ts b/frontend/tests/organizationSettings.spec.ts
index 0754fc7f..97dd45fb 100644
--- a/frontend/tests/organizationSettings.spec.ts
+++ b/frontend/tests/organizationSettings.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from "../playwright/fixtures";
+import { test, expect } from "./fixtures.ts";
 import { test as baseTest } from "@playwright/test";
 import { createAccount, uuidRegex } from "./util.ts";
 import { Page } from "@playwright/test";
@@ -150,7 +150,7 @@ test("organization API key", async ({ page }) => {
   await expect(row.getByRole("cell", { name: "Playwright test API key", exact: true })).toBeVisible();
 
   // Open API key details
-  await row.getByRole("button").locator(".tabler-icon.tabler-icon-edit").click();
+  await row.getByRole("link").locator(".tabler-icon.tabler-icon-edit").click();
 
   // Check we are put on the API key details page
   {
diff --git a/frontend/tests/projects.spec.ts b/frontend/tests/projects.spec.ts
index 52cbdd0a..d3dae52c 100644
--- a/frontend/tests/projects.spec.ts
+++ b/frontend/tests/projects.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from "../playwright/fixtures.ts";
+import { expect, test } from "./fixtures.ts";
 import { createProject, deleteProject, uuidRegex } from "./util.ts";
 
 test("Project lifecycle", async ({ page }) => {
@@ -17,17 +17,13 @@ test("Project lifecycle", async ({ page }) => {
   }
 
   // Back to projects list
-  await page.locator("a").filter({ hasText: "Projects" }).click();
+  await page.getByRole("link", { name: "Projects", exact: true }).click();
 
   // Check the new project is listed
   await expect(page.getByRole("cell", { name: projectUuid })).toBeVisible();
 
   // click edit button
-  await page
-    .getByRole("row", { name: projectUuid })
-    .getByRole("button")
-    .locator(".tabler-icon.tabler-icon-edit")
-    .click();
+  await page.getByRole("row", { name: projectUuid }).getByRole("link").locator(".tabler-icon.tabler-icon-edit").click();
 
   // Check we are on the edit project page
   {
@@ -49,7 +45,7 @@ test("Project lifecycle", async ({ page }) => {
   await expect(page.getByRole("heading", { name: "renamed project" })).toBeVisible();
 
   // Use breadcrumb to go back to projects list
-  await page.getByRole("button", { name: "projects" }).click();
+  await page.getByRole("link", { name: "projects", exact: true }).click();
 
   // Check the renamed project is listed
   await expect(page.getByRole("cell", { name: "renamed project" })).toBeVisible();
@@ -57,7 +53,7 @@ test("Project lifecycle", async ({ page }) => {
   // Back to edit project page
   await page
     .getByRole("row", { name: "renamed project" })
-    .getByRole("button")
+    .getByRole("link")
     .locator(".tabler-icon.tabler-icon-edit")
     .click();
 
@@ -109,7 +105,7 @@ test("Credentials lifecycle", async ({ page }) => {
   await expect(page.getByLabel("Credentials")).toContainText("This is created by Playwright");
 
   // Go to credential edit page
-  await page.getByRole("table").getByRole("button").locator(".tabler-icon.tabler-icon-edit").click();
+  await page.getByRole("table").getByRole("link").locator(".tabler-icon.tabler-icon-edit").click();
 
   // Check we are on the credentials edit page
   {
@@ -125,13 +121,13 @@ test("Credentials lifecycle", async ({ page }) => {
   await expect(page.getByText("SMTP credential updated")).toBeVisible({ timeout: 10_000 });
 
   // Use breadcrumb to go back to the credentials list
-  await page.getByRole("button", { name: "credentials" }).click();
+  await page.getByRole("link", { name: "credentials", exact: true }).click();
 
   // Ensure updated description is visible
   await expect(page.getByLabel("Credentials")).toContainText("This is made by Playwright");
 
   // Back to credential edit page
-  await page.getByRole("table").getByRole("button").locator(".tabler-icon.tabler-icon-edit").click();
+  await page.getByRole("table").getByRole("link").locator(".tabler-icon.tabler-icon-edit").click();
 
   // Delete the credential
   await page.getByRole("button", { name: "Delete" }).click();
diff --git a/frontend/tests/util.ts b/frontend/tests/util.ts
index 605469fd..86185684 100644
--- a/frontend/tests/util.ts
+++ b/frontend/tests/util.ts
@@ -18,7 +18,7 @@ export async function createProject(page: Page): Promise<string> {
 
 export async function deleteProject(page: Page) {
   await page.goto("/");
-  await page.getByRole("row").getByRole("button").locator(".tabler-icon.tabler-icon-edit").click();
+  await page.getByRole("row").getByRole("link").locator(".tabler-icon.tabler-icon-edit").click();
   await page.getByRole("button", { name: "Delete" }).click();
   await page.getByRole("button", { name: "Confirm" }).click();
 }