diff --git a/public/images/map/map-desktop.jpg b/public/images/map/map-desktop-old.jpg
similarity index 100%
rename from public/images/map/map-desktop.jpg
rename to public/images/map/map-desktop-old.jpg
diff --git a/public/images/map/map-mobile.jpg b/public/images/map/map-mobile-old.jpg
similarity index 100%
rename from public/images/map/map-mobile.jpg
rename to public/images/map/map-mobile-old.jpg
diff --git a/public/images/map/map-new-desktop.jpg b/public/images/map/map-new-desktop.jpg
new file mode 100644
index 0000000..75a9696
Binary files /dev/null and b/public/images/map/map-new-desktop.jpg differ
diff --git a/public/images/map/map-new-mobile.jpg b/public/images/map/map-new-mobile.jpg
new file mode 100644
index 0000000..e872bb9
Binary files /dev/null and b/public/images/map/map-new-mobile.jpg differ
diff --git a/public/images/map/map-original.jpg b/public/images/map/map-original-old.jpg
similarity index 100%
rename from public/images/map/map-original.jpg
rename to public/images/map/map-original-old.jpg
diff --git a/src/components/Map.tsx b/src/components/Map.tsx
index 17fe102..1dc1300 100644
--- a/src/components/Map.tsx
+++ b/src/components/Map.tsx
@@ -575,7 +575,7 @@ function Map({ maxZoom = 1 }: MapProps) {
       {containerRef.current?.clientWidth && (
         <img
           ref={mapRef}
-          src={`/images/map/map-${
+          src={`/images/map/map-new-${
             containerRef.current.clientWidth < 768 ? "mobile" : "desktop"
           }.jpg`}
           alt="map"
diff --git a/src/components/SelectedComplexCard.tsx b/src/components/SelectedComplexCard.tsx
index 4c0ec46..4312c33 100644
--- a/src/components/SelectedComplexCard.tsx
+++ b/src/components/SelectedComplexCard.tsx
@@ -5,14 +5,20 @@ import { motion } from "motion/react";
 import IMarker from "../types/IMarker";
 import { useEffect, useState } from "react";
 import clsx from "clsx";
+import { useQuery } from "@tanstack/react-query";
+import { api } from "../api/ky";
 
 export default function SelectedComplexCard({ marker }: { marker: IMarker }) {
   const navigate = useNavigate();
   const [isImageLoaded, setIsImageLoaded] = useState(false);
 
-  useEffect(() => {
-    setIsImageLoaded(false);
-  }, [marker]);
+  useEffect(() => setIsImageLoaded(false), [marker]);
+
+  const { data: count } = useQuery({
+    queryKey: ["units", "count", `Rove Home ${marker.title}`],
+    queryFn: () =>
+      api.get(`units/count?project=Rove Home ${marker.title}`).json<number>(),
+  });
 
   return (
     <motion.div
@@ -51,7 +57,7 @@ export default function SelectedComplexCard({ marker }: { marker: IMarker }) {
               {marker.title}
             </p>
             <p className="text-[#00BED7] text-[10px] leading-[135%]">
-              {marker.unitsCount} units
+              {count} units
             </p>
           </div>
           <Button
diff --git a/src/components/UnitTypesFilter.tsx b/src/components/UnitTypesFilter.tsx
index 6475539..22c413d 100644
--- a/src/components/UnitTypesFilter.tsx
+++ b/src/components/UnitTypesFilter.tsx
@@ -1,29 +1,29 @@
-import clsx from "clsx";
-import { useSearchParams } from "react-router";
+// import clsx from "clsx";
+// import { useSearchParams } from "react-router";
 
-function UnitTypesFilter({ title }: { title: string }) {
-  const [searchParams, setSearchParams] = useSearchParams();
+// function UnitTypesFilter({ title }: { title: string }) {
+//   const [searchParams, setSearchParams] = useSearchParams();
 
-  return (
-    <div
-      onClick={() => {
-        setSearchParams((prev) => {
-          if (prev.getAll("unitTypes").includes(title))
-            prev.delete("unitTypes", title);
-          else prev.append("unitTypes", title);
-          return prev;
-        });
-      }}
-      className={clsx(
-        "2xl:px-[1.389vw] 2xl:py-[0.833vw] px-5 py-3 2xl:rounded-[2.778vw] rounded-[40px] outline transition-colors duration-300 cursor-pointer",
-        searchParams.getAll("unitTypes").includes(title)
-          ? "outline-[#00BED7]"
-          : "outline-[#E2E2DC]"
-      )}
-    >
-      {title}
-    </div>
-  );
-}
+//   return (
+//     <div
+//       onClick={() => {
+//         setSearchParams((prev) => {
+//           if (prev.getAll("unitTypes").includes(title))
+//             prev.delete("unitTypes", title);
+//           else prev.append("unitTypes", title);
+//           return prev;
+//         });
+//       }}
+//       className={clsx(
+//         "2xl:px-[1.389vw] 2xl:py-[0.833vw] px-5 py-3 2xl:rounded-[2.778vw] rounded-[40px] outline transition-colors duration-300 cursor-pointer",
+//         searchParams.getAll("unitTypes").includes(title)
+//           ? "outline-[#00BED7]"
+//           : "outline-[#E2E2DC]"
+//       )}
+//     >
+//       {title}
+//     </div>
+//   );
+// }
 
-export default UnitTypesFilter;
+// export default UnitTypesFilter;
diff --git a/src/components/ui/Select.tsx b/src/components/ui/Select.tsx
index 333a04c..2a1aeaf 100644
--- a/src/components/ui/Select.tsx
+++ b/src/components/ui/Select.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { motion } from "motion/react";
 import { AnimatePresence } from "motion/react";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useClickAway } from "@uidotdev/usehooks";
 import clsx from "clsx";
 import ChevronDownIcon from "../icons/ChevronDownIcon";
@@ -25,10 +25,26 @@ function Select({
 
   const ref = useClickAway<HTMLDivElement>(() => setIsShow(false));
 
+  const dropDownRef = useRef<HTMLDivElement>(null);
+
   useEffect(() => setSelectedOption(defaultOption), [defaultOption]);
 
   useEffect(() => onSelect(selectedOption), [selectedOption]);
 
+  function handleScroll() {
+    if (!dropDownRef.current) return;
+    dropDownRef.current.style.maxHeight = `calc(100vh - ${
+      dropDownRef.current?.getBoundingClientRect().y
+    }px - 0.278vw)`;
+  }
+
+  useEffect(() => {
+    handleScroll();
+    document.addEventListener("scroll", handleScroll);
+
+    return () => document.removeEventListener("scroll", handleScroll);
+  }, [isShow]);
+
   return (
     <div ref={ref} className={clsx("relative", className)}>
       {label && (
@@ -58,12 +74,7 @@ function Select({
             animate={{ opacity: 1 }}
             exit={{ opacity: 0 }}
             transition={{ duration: 0.15 }}
-            ref={(el) => {
-              if (el)
-                el.style.maxHeight = `calc(100vh - ${
-                  el?.getBoundingClientRect().y
-                }px - 0.278vw)`;
-            }}
+            ref={dropDownRef}
             className="absolute 2xl:mt-[0.278vw] 2xl:pt-[0.278vw] mt-1 p-1 2xl:space-y-[0.139vw] space-y-0.5 shadow-[0px_2px_8px_rgba(0,0,0,0.15)] overflow-auto rounded-xl bg-white w-full z-10"
           >
             {options.map((option, index) => (
diff --git a/src/data/markers.ts b/src/data/markers.ts
index 39ae9f0..514daed 100644
--- a/src/data/markers.ts
+++ b/src/data/markers.ts
@@ -4,30 +4,27 @@ export const markers: IMarker[] = [
   {
     id: 1,
     name: "downtown",
-    x: "56.7%",
-    y: "39.8%",
+    x: "54.2%",
+    y: "50.6%",
     popupPosition: "left",
     title: "Downtown",
-    unitsCount: 100,
     disabled: true,
   },
   {
     id: 2,
     name: "marasi-drive",
-    x: "58.6%",
-    y: "42%",
+    x: "55.6%",
+    y: "52.5%",
     popupPosition: "right",
     title: "Marasi Drive",
-    unitsCount: 200,
   },
   {
     id: 3,
     name: "dubai-marina",
-    x: "22.5%",
-    y: "76%",
+    x: "35.35%",
+    y: "71.6%",
     popupPosition: "right",
     title: "Dubai Marina",
-    unitsCount: 300,
     disabled: true,
   },
 ];
diff --git a/src/pages/ComplexPage.tsx b/src/pages/ComplexPage.tsx
index a563624..ba12c50 100644
--- a/src/pages/ComplexPage.tsx
+++ b/src/pages/ComplexPage.tsx
@@ -1,5 +1,6 @@
 import SequenceSlider from "../components/SequenceSlider";
 import { useParams } from "react-router";
+
 export default function ComplexPage() {
   const { complexName } = useParams();
 
diff --git a/src/types/IMarker.ts b/src/types/IMarker.ts
index 0a852b6..367d685 100644
--- a/src/types/IMarker.ts
+++ b/src/types/IMarker.ts
@@ -5,6 +5,5 @@ export default interface IMarker {
   x: string;
   y: string;
   popupPosition: "left" | "right";
-  unitsCount: number;
   disabled?: boolean;
 }