diff --git a/frontend/app/(routes)/data-pipeline/create/page.tsx b/frontend/app/(topbar)/data-pipeline/create/page.tsx
similarity index 100%
rename from frontend/app/(routes)/data-pipeline/create/page.tsx
rename to frontend/app/(topbar)/data-pipeline/create/page.tsx
diff --git a/frontend/app/(routes)/data-pipeline/page.tsx b/frontend/app/(topbar)/data-pipeline/page.tsx
similarity index 100%
rename from frontend/app/(routes)/data-pipeline/page.tsx
rename to frontend/app/(topbar)/data-pipeline/page.tsx
diff --git a/frontend/app/(routes)/data-pipeline/property-listings/page.tsx b/frontend/app/(topbar)/data-pipeline/property-listings/page.tsx
similarity index 100%
rename from frontend/app/(routes)/data-pipeline/property-listings/page.tsx
rename to frontend/app/(topbar)/data-pipeline/property-listings/page.tsx
diff --git a/frontend/app/(routes)/documentation/loading.tsx b/frontend/app/(topbar)/documentation/loading.tsx
similarity index 100%
rename from frontend/app/(routes)/documentation/loading.tsx
rename to frontend/app/(topbar)/documentation/loading.tsx
diff --git a/frontend/app/(routes)/documentation/models/page.tsx b/frontend/app/(topbar)/documentation/models/page.tsx
similarity index 100%
rename from frontend/app/(routes)/documentation/models/page.tsx
rename to frontend/app/(topbar)/documentation/models/page.tsx
diff --git a/frontend/app/(routes)/documentation/page.tsx b/frontend/app/(topbar)/documentation/page.tsx
similarity index 100%
rename from frontend/app/(routes)/documentation/page.tsx
rename to frontend/app/(topbar)/documentation/page.tsx
diff --git a/frontend/app/(routes)/maps/page.tsx b/frontend/app/(topbar)/maps/page.tsx
similarity index 100%
rename from frontend/app/(routes)/maps/page.tsx
rename to frontend/app/(topbar)/maps/page.tsx
diff --git a/frontend/app/(routes)/models/page.tsx b/frontend/app/(topbar)/models/page.tsx
similarity index 100%
rename from frontend/app/(routes)/models/page.tsx
rename to frontend/app/(topbar)/models/page.tsx
diff --git a/frontend/app/(routes)/price-prediction/page.tsx b/frontend/app/(topbar)/price-prediction/page.tsx
similarity index 100%
rename from frontend/app/(routes)/price-prediction/page.tsx
rename to frontend/app/(topbar)/price-prediction/page.tsx
diff --git a/frontend/app/(routes)/properties/[id]/page.tsx b/frontend/app/(topbar)/properties/[id]/page.tsx
similarity index 100%
rename from frontend/app/(routes)/properties/[id]/page.tsx
rename to frontend/app/(topbar)/properties/[id]/page.tsx
diff --git a/frontend/app/(routes)/properties/loading.tsx b/frontend/app/(topbar)/properties/loading.tsx
similarity index 100%
rename from frontend/app/(routes)/properties/loading.tsx
rename to frontend/app/(topbar)/properties/loading.tsx
diff --git a/frontend/app/(routes)/properties/page.tsx b/frontend/app/(topbar)/properties/page.tsx
similarity index 100%
rename from frontend/app/(routes)/properties/page.tsx
rename to frontend/app/(topbar)/properties/page.tsx
diff --git a/frontend/components/navigation/top-navigation.tsx b/frontend/components/navigation/top-navigation.tsx
index 3b6548d..553d21c 100644
--- a/frontend/components/navigation/top-navigation.tsx
+++ b/frontend/components/navigation/top-navigation.tsx
@@ -16,6 +16,7 @@ import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import { useTopNavigationStore } from "@/store/top-navgation-store";
 import { useShallow } from "zustand/react/shallow";
+import { Input } from "../ui/input";
 
 export function TopNavigation() {
   const { selectedModel, setSelectedModel, models } = useTopNavigationStore(
@@ -35,7 +36,7 @@ export function TopNavigation() {
       </Link>
       <div className="flex-1 max-w-md mx-4">
         <div className="relative">
-          <input
+          <Input
             type="text"
             placeholder="Search locations..."
             className="w-full h-10 px-4 rounded-md border border-input bg-background"