diff --git a/src/components/Layout/Navbar.tsx b/src/components/Layout/Navbar.tsx
index feffcc2..0fc8171 100644
--- a/src/components/Layout/Navbar.tsx
+++ b/src/components/Layout/Navbar.tsx
@@ -27,6 +27,7 @@ import {
 } from "~/components/ui/dropdown-menu";
 import Icon from "~/components/ui/icon";
 import { Separator } from "~/components/ui/separator";
+import { Skeleton } from "~/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipTrigger } from "~/components/ui/tooltip";
 
 import { useConfirmDialog } from "~/context/confirmProvider";
@@ -38,8 +39,6 @@ import { ClearSavedPasswords } from "~/actions/password";
 
 import config from "config";
 
-import { Skeleton } from "../ui/skeleton";
-
 export default function Navbar() {
   const pathname = usePathname();
   const { theme, themes, setTheme } = useTheme();
@@ -67,7 +66,7 @@ export default function Navbar() {
   if (NO_LAYOUT_PATHS.some((path) => new RegExp(path).test(pathname))) return null;
 
   return (
-    <div className={cn("sticky left-0 top-0 z-50", "h-12 w-full")}>
+    <div className={cn("sticky left-0 top-0 z-[48]", "h-12 w-full")}>
       <nav
         slot='nav'
         className={cn(
@@ -126,7 +125,6 @@ export default function Navbar() {
                           >
                             <Icon
                               name={item.icon}
-                              className='text-foreground'
                               size={"1.25rem"}
                             />
                           </Link>
@@ -274,7 +272,7 @@ export default function Navbar() {
                         <DropdownMenuItem asChild>
                           <Link
                             prefetch={false}
-                            href={"/_/deploy"}
+                            href={"/ngdi-internal/deploy"}
                             className='flex w-full items-center justify-start gap-2'
                           >
                             <Icon name={"Book"} />
@@ -284,7 +282,7 @@ export default function Navbar() {
                         <DropdownMenuItem asChild>
                           <Link
                             prefetch={false}
-                            href={"/_/configurator"}
+                            href={"/ngdi-internal/configurator"}
                             className='flex w-full items-center justify-start gap-2'
                           >
                             <Icon name={"Wrench"} />
@@ -447,7 +445,7 @@ export default function Navbar() {
                             >
                               <Link
                                 prefetch={false}
-                                href={"/_/deploy"}
+                                href={"/ngdi-internal/deploy"}
                                 className='flex w-full items-center justify-between gap-4'
                                 onClick={() => setOpen(false)}
                               >
@@ -466,7 +464,7 @@ export default function Navbar() {
                             >
                               <Link
                                 prefetch={false}
-                                href={"/_/configurator"}
+                                href={"/ngdi-internal/configurator"}
                                 className='flex w-full items-center justify-between gap-4'
                                 onClick={() => setOpen(false)}
                               >
diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx
index 917c318..8b288e5 100644
--- a/src/components/ui/tooltip.tsx
+++ b/src/components/ui/tooltip.tsx
@@ -20,7 +20,7 @@ const TooltipContent = React.forwardRef<
       ref={ref}
       sideOffset={sideOffset}
       className={cn(
-        "z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        "z-[49] overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
         className,
       )}
       {...props}
@@ -29,4 +29,4 @@ const TooltipContent = React.forwardRef<
 ));
 TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
+export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };