diff --git a/src/App.svelte b/src/App.svelte
index 250c903d..7bf3ba22 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -133,14 +133,12 @@
             <RunnerDetail {params} />
           </Route>
         </Route>
-        <Route path="/cardassignment/*">
-          <Route path="/">
-            <CardAssignment />
+        <Route path="/tools/*">
+          <Route path="/cardassignment/">
+              <CardAssignment />
           </Route>
-        </Route>
-        <Route path="/cardreplacement/*">
-          <Route path="/">
-            <CardReplacement />
+          <Route path="/cardreplacement/">
+              <CardReplacement />
           </Route>
         </Route>
         <Route path="/teams/*">
diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte
index c93c4cad..65704f11 100644
--- a/src/components/dashboard/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -46,9 +46,9 @@
       </h2>
       {#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:GET") && store.state.jwtinfo.userdetails.permissions.includes("CARD:GET")}
         <a
-          class:activenav={$router.path.includes("/cardassignment/")}
+          class:activenav={$router.path.includes("/tools/cardassignment/")}
           class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/cardassignment/"
+          href="/tools/cardassignment/"
         >
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -66,9 +66,9 @@
           <span>{$_("card_assignment_menu")}</span>
         </a>
         <a
-          class:activenav={$router.path.includes("/cardreplacement/")}
+          class:activenav={$router.path.includes("/tools/cardreplacement/")}
           class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/cardreplacement/"
+          href="/tools/cardreplacement/"
         >
           <svg
             xmlns="http://www.w3.org/2000/svg"