diff --git a/frontend/src/components/Common/UserMenu.tsx b/frontend/src/components/Common/UserMenu.tsx
index 5f2b26ad44..9db1df944f 100644
--- a/frontend/src/components/Common/UserMenu.tsx
+++ b/frontend/src/components/Common/UserMenu.tsx
@@ -26,7 +26,7 @@ const UserMenu = () => {
           </MenuTrigger>
 
           <MenuContent>
-            <Link to="settings">
+            <Link to="/settings">
               <MenuItem
                 closeOnSelect
                 value="user-settings"
diff --git a/frontend/src/components/ui/provider.tsx b/frontend/src/components/ui/provider.tsx
index 4d80b8e66a..6725536909 100644
--- a/frontend/src/components/ui/provider.tsx
+++ b/frontend/src/components/ui/provider.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import { ChakraProvider } from "@chakra-ui/react"
-import React, { type PropsWithChildren } from "react"
+import { type PropsWithChildren } from "react"
 import { system } from "../../theme"
 import { ColorModeProvider } from "./color-mode"
 import { Toaster } from "./toaster"
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 0d80ea6f8d..05307729f8 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -5,7 +5,7 @@ import {
   QueryClientProvider,
 } from "@tanstack/react-query"
 import { RouterProvider, createRouter } from "@tanstack/react-router"
-import React, { StrictMode } from "react"
+import { StrictMode } from "react"
 import ReactDOM from "react-dom/client"
 import { routeTree } from "./routeTree.gen"
 
diff --git a/frontend/src/routes/_layout/admin.tsx b/frontend/src/routes/_layout/admin.tsx
index a78d19974b..706fd58dc9 100644
--- a/frontend/src/routes/_layout/admin.tsx
+++ b/frontend/src/routes/_layout/admin.tsx
@@ -46,8 +46,8 @@ function UsersTable() {
 
   const setPage = (page: number) => {
     navigate({
-      to: "/_layout/admin",
-      search: { page: page },
+      to: "/admin",
+      search: (prev) => ({ ...prev, page }),
     })
   }
 
diff --git a/frontend/src/routes/_layout/items.tsx b/frontend/src/routes/_layout/items.tsx
index 5780b4e99f..487ede9138 100644
--- a/frontend/src/routes/_layout/items.tsx
+++ b/frontend/src/routes/_layout/items.tsx
@@ -52,8 +52,8 @@ function ItemsTable() {
 
   const setPage = (page: number) => {
     navigate({
-      to: "/_layout/items",
-      search: { page: page },
+      to: "/items",
+      search: (prev) => ({ ...prev, page }),
     })
   }
 
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 43ca81753d..bb73d7ef9f 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -21,7 +21,7 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src/**/*.ts", "tests/**/*.ts", "playwright.config.ts"],
+  "include": ["src", "tests", "playwright.config.ts"],
   "references": [
     {
       "path": "./tsconfig.node.json"