diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..f1cb40a
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "prettier.printWidth": 120
+}
diff --git a/client/public/images/PodiumLevel/PodiumLevelIndoor.jpg b/client/public/images/PodiumLevel/PodiumLevelIndoor.jpg
new file mode 100644
index 0000000..b985958
Binary files /dev/null and b/client/public/images/PodiumLevel/PodiumLevelIndoor.jpg differ
diff --git a/client/public/images/PodiumLevel/PodiumLevelOutdoor.jpg b/client/public/images/PodiumLevel/PodiumLevelOutdoor.jpg
new file mode 100644
index 0000000..a7875b6
Binary files /dev/null and b/client/public/images/PodiumLevel/PodiumLevelOutdoor.jpg differ
diff --git a/client/public/images/groundLevel/groundLevel.jpg b/client/public/images/groundLevel/groundLevel.jpg
new file mode 100644
index 0000000..e9cd99c
Binary files /dev/null and b/client/public/images/groundLevel/groundLevel.jpg differ
diff --git a/client/public/images/groundLevelSlider/1.jpg b/client/public/images/groundLevelSlider/1.jpg
new file mode 100644
index 0000000..8e71868
Binary files /dev/null and b/client/public/images/groundLevelSlider/1.jpg differ
diff --git a/client/public/images/groundLevelSlider/2.jpg b/client/public/images/groundLevelSlider/2.jpg
new file mode 100644
index 0000000..c8987be
Binary files /dev/null and b/client/public/images/groundLevelSlider/2.jpg differ
diff --git a/client/public/images/groundLevelSlider/3.jpg b/client/public/images/groundLevelSlider/3.jpg
new file mode 100644
index 0000000..c711e44
Binary files /dev/null and b/client/public/images/groundLevelSlider/3.jpg differ
diff --git a/client/public/images/groundLevelSlider/4.jpg b/client/public/images/groundLevelSlider/4.jpg
new file mode 100644
index 0000000..4046b51
Binary files /dev/null and b/client/public/images/groundLevelSlider/4.jpg differ
diff --git a/client/public/images/groundLevelSlider/5.jpg b/client/public/images/groundLevelSlider/5.jpg
new file mode 100644
index 0000000..392a662
Binary files /dev/null and b/client/public/images/groundLevelSlider/5.jpg differ
diff --git a/client/public/images/groundLevelSlider/6.jpg b/client/public/images/groundLevelSlider/6.jpg
new file mode 100644
index 0000000..2dcf569
Binary files /dev/null and b/client/public/images/groundLevelSlider/6.jpg differ
diff --git a/client/public/images/podiumLevelSlider/1.jpg b/client/public/images/podiumLevelSlider/1.jpg
new file mode 100644
index 0000000..a731fa5
Binary files /dev/null and b/client/public/images/podiumLevelSlider/1.jpg differ
diff --git a/client/public/images/podiumLevelSlider/10.jpg b/client/public/images/podiumLevelSlider/10.jpg
new file mode 100644
index 0000000..74a5d6b
Binary files /dev/null and b/client/public/images/podiumLevelSlider/10.jpg differ
diff --git a/client/public/images/podiumLevelSlider/11.jpg b/client/public/images/podiumLevelSlider/11.jpg
new file mode 100644
index 0000000..f301aaf
Binary files /dev/null and b/client/public/images/podiumLevelSlider/11.jpg differ
diff --git a/client/public/images/podiumLevelSlider/2.jpg b/client/public/images/podiumLevelSlider/2.jpg
new file mode 100644
index 0000000..16716f4
Binary files /dev/null and b/client/public/images/podiumLevelSlider/2.jpg differ
diff --git a/client/public/images/podiumLevelSlider/3.jpg b/client/public/images/podiumLevelSlider/3.jpg
new file mode 100644
index 0000000..c8450d4
Binary files /dev/null and b/client/public/images/podiumLevelSlider/3.jpg differ
diff --git a/client/public/images/podiumLevelSlider/4.jpg b/client/public/images/podiumLevelSlider/4.jpg
new file mode 100644
index 0000000..a32212a
Binary files /dev/null and b/client/public/images/podiumLevelSlider/4.jpg differ
diff --git a/client/public/images/podiumLevelSlider/5.jpg b/client/public/images/podiumLevelSlider/5.jpg
new file mode 100644
index 0000000..3859adc
Binary files /dev/null and b/client/public/images/podiumLevelSlider/5.jpg differ
diff --git a/client/public/images/podiumLevelSlider/6.jpg b/client/public/images/podiumLevelSlider/6.jpg
new file mode 100644
index 0000000..c8ba2da
Binary files /dev/null and b/client/public/images/podiumLevelSlider/6.jpg differ
diff --git a/client/public/images/podiumLevelSlider/7.jpg b/client/public/images/podiumLevelSlider/7.jpg
new file mode 100644
index 0000000..c21b7b0
Binary files /dev/null and b/client/public/images/podiumLevelSlider/7.jpg differ
diff --git a/client/public/images/podiumLevelSlider/8.jpg b/client/public/images/podiumLevelSlider/8.jpg
new file mode 100644
index 0000000..7c72e99
Binary files /dev/null and b/client/public/images/podiumLevelSlider/8.jpg differ
diff --git a/client/public/images/podiumLevelSlider/9.jpg b/client/public/images/podiumLevelSlider/9.jpg
new file mode 100644
index 0000000..113eb85
Binary files /dev/null and b/client/public/images/podiumLevelSlider/9.jpg differ
diff --git a/client/public/images/rooftop/rooftop.jpg b/client/public/images/rooftop/rooftop.jpg
new file mode 100644
index 0000000..b28619a
Binary files /dev/null and b/client/public/images/rooftop/rooftop.jpg differ
diff --git a/client/public/images/rooftopSlider/1.jpg b/client/public/images/rooftopSlider/1.jpg
new file mode 100644
index 0000000..1b2083f
Binary files /dev/null and b/client/public/images/rooftopSlider/1.jpg differ
diff --git a/client/public/images/sequence/1.jpg b/client/public/images/sequence/1.jpg
index e5a66c0..f864dea 100644
Binary files a/client/public/images/sequence/1.jpg and b/client/public/images/sequence/1.jpg differ
diff --git a/client/public/images/sequence/10.jpg b/client/public/images/sequence/10.jpg
index 47d3920..17fd950 100644
Binary files a/client/public/images/sequence/10.jpg and b/client/public/images/sequence/10.jpg differ
diff --git a/client/public/images/sequence/100.jpg b/client/public/images/sequence/100.jpg
index 06f4616..bcd081e 100644
Binary files a/client/public/images/sequence/100.jpg and b/client/public/images/sequence/100.jpg differ
diff --git a/client/public/images/sequence/101.jpg b/client/public/images/sequence/101.jpg
index 7cdc960..500cd07 100644
Binary files a/client/public/images/sequence/101.jpg and b/client/public/images/sequence/101.jpg differ
diff --git a/client/public/images/sequence/102.jpg b/client/public/images/sequence/102.jpg
index 7075707..487ae81 100644
Binary files a/client/public/images/sequence/102.jpg and b/client/public/images/sequence/102.jpg differ
diff --git a/client/public/images/sequence/103.jpg b/client/public/images/sequence/103.jpg
index 71c3a05..1689484 100644
Binary files a/client/public/images/sequence/103.jpg and b/client/public/images/sequence/103.jpg differ
diff --git a/client/public/images/sequence/104.jpg b/client/public/images/sequence/104.jpg
index ef9df67..970dc28 100644
Binary files a/client/public/images/sequence/104.jpg and b/client/public/images/sequence/104.jpg differ
diff --git a/client/public/images/sequence/105.jpg b/client/public/images/sequence/105.jpg
index 9b42e70..56b14f7 100644
Binary files a/client/public/images/sequence/105.jpg and b/client/public/images/sequence/105.jpg differ
diff --git a/client/public/images/sequence/106.jpg b/client/public/images/sequence/106.jpg
index 932ba36..12b801c 100644
Binary files a/client/public/images/sequence/106.jpg and b/client/public/images/sequence/106.jpg differ
diff --git a/client/public/images/sequence/107.jpg b/client/public/images/sequence/107.jpg
index 15d9912..5e36106 100644
Binary files a/client/public/images/sequence/107.jpg and b/client/public/images/sequence/107.jpg differ
diff --git a/client/public/images/sequence/108.jpg b/client/public/images/sequence/108.jpg
index 6b49b83..aeb6975 100644
Binary files a/client/public/images/sequence/108.jpg and b/client/public/images/sequence/108.jpg differ
diff --git a/client/public/images/sequence/109.jpg b/client/public/images/sequence/109.jpg
index 3bc2f88..0232fea 100644
Binary files a/client/public/images/sequence/109.jpg and b/client/public/images/sequence/109.jpg differ
diff --git a/client/public/images/sequence/11.jpg b/client/public/images/sequence/11.jpg
index 3e0c882..302ff02 100644
Binary files a/client/public/images/sequence/11.jpg and b/client/public/images/sequence/11.jpg differ
diff --git a/client/public/images/sequence/110.jpg b/client/public/images/sequence/110.jpg
index 1b1a118..41853fa 100644
Binary files a/client/public/images/sequence/110.jpg and b/client/public/images/sequence/110.jpg differ
diff --git a/client/public/images/sequence/111.jpg b/client/public/images/sequence/111.jpg
index 98559ea..4de95c5 100644
Binary files a/client/public/images/sequence/111.jpg and b/client/public/images/sequence/111.jpg differ
diff --git a/client/public/images/sequence/112.jpg b/client/public/images/sequence/112.jpg
index b45be60..f07c060 100644
Binary files a/client/public/images/sequence/112.jpg and b/client/public/images/sequence/112.jpg differ
diff --git a/client/public/images/sequence/113.jpg b/client/public/images/sequence/113.jpg
index 2ea7e9e..ec2f4ce 100644
Binary files a/client/public/images/sequence/113.jpg and b/client/public/images/sequence/113.jpg differ
diff --git a/client/public/images/sequence/114.jpg b/client/public/images/sequence/114.jpg
index 64769be..d063f54 100644
Binary files a/client/public/images/sequence/114.jpg and b/client/public/images/sequence/114.jpg differ
diff --git a/client/public/images/sequence/115.jpg b/client/public/images/sequence/115.jpg
index f6d9fb1..e14bfa3 100644
Binary files a/client/public/images/sequence/115.jpg and b/client/public/images/sequence/115.jpg differ
diff --git a/client/public/images/sequence/116.jpg b/client/public/images/sequence/116.jpg
index 83db19b..db31998 100644
Binary files a/client/public/images/sequence/116.jpg and b/client/public/images/sequence/116.jpg differ
diff --git a/client/public/images/sequence/117.jpg b/client/public/images/sequence/117.jpg
index d4f289c..88624fb 100644
Binary files a/client/public/images/sequence/117.jpg and b/client/public/images/sequence/117.jpg differ
diff --git a/client/public/images/sequence/118.jpg b/client/public/images/sequence/118.jpg
index 941fa69..542cf29 100644
Binary files a/client/public/images/sequence/118.jpg and b/client/public/images/sequence/118.jpg differ
diff --git a/client/public/images/sequence/119.jpg b/client/public/images/sequence/119.jpg
index 1fc137b..21ddcc1 100644
Binary files a/client/public/images/sequence/119.jpg and b/client/public/images/sequence/119.jpg differ
diff --git a/client/public/images/sequence/12.jpg b/client/public/images/sequence/12.jpg
index f56a2b7..5dca52b 100644
Binary files a/client/public/images/sequence/12.jpg and b/client/public/images/sequence/12.jpg differ
diff --git a/client/public/images/sequence/120.jpg b/client/public/images/sequence/120.jpg
index e8267c4..0ff93c8 100644
Binary files a/client/public/images/sequence/120.jpg and b/client/public/images/sequence/120.jpg differ
diff --git a/client/public/images/sequence/121.jpg b/client/public/images/sequence/121.jpg
index c40dd1f..33a65b1 100644
Binary files a/client/public/images/sequence/121.jpg and b/client/public/images/sequence/121.jpg differ
diff --git a/client/public/images/sequence/122.jpg b/client/public/images/sequence/122.jpg
index 0d9fb1d..b91c5c3 100644
Binary files a/client/public/images/sequence/122.jpg and b/client/public/images/sequence/122.jpg differ
diff --git a/client/public/images/sequence/123.jpg b/client/public/images/sequence/123.jpg
index 3697bbd..f9d0fdd 100644
Binary files a/client/public/images/sequence/123.jpg and b/client/public/images/sequence/123.jpg differ
diff --git a/client/public/images/sequence/124.jpg b/client/public/images/sequence/124.jpg
index 0a57eb9..2dd65db 100644
Binary files a/client/public/images/sequence/124.jpg and b/client/public/images/sequence/124.jpg differ
diff --git a/client/public/images/sequence/125.jpg b/client/public/images/sequence/125.jpg
index a655ca1..2797833 100644
Binary files a/client/public/images/sequence/125.jpg and b/client/public/images/sequence/125.jpg differ
diff --git a/client/public/images/sequence/126.jpg b/client/public/images/sequence/126.jpg
index 357422e..5e06ad3 100644
Binary files a/client/public/images/sequence/126.jpg and b/client/public/images/sequence/126.jpg differ
diff --git a/client/public/images/sequence/127.jpg b/client/public/images/sequence/127.jpg
index f5ac49e..c619d7a 100644
Binary files a/client/public/images/sequence/127.jpg and b/client/public/images/sequence/127.jpg differ
diff --git a/client/public/images/sequence/128.jpg b/client/public/images/sequence/128.jpg
index a102955..2464225 100644
Binary files a/client/public/images/sequence/128.jpg and b/client/public/images/sequence/128.jpg differ
diff --git a/client/public/images/sequence/129.jpg b/client/public/images/sequence/129.jpg
index 0fb614a..ad46adb 100644
Binary files a/client/public/images/sequence/129.jpg and b/client/public/images/sequence/129.jpg differ
diff --git a/client/public/images/sequence/13.jpg b/client/public/images/sequence/13.jpg
index 83aa16b..3332ece 100644
Binary files a/client/public/images/sequence/13.jpg and b/client/public/images/sequence/13.jpg differ
diff --git a/client/public/images/sequence/130.jpg b/client/public/images/sequence/130.jpg
index 9aa64f3..16ea325 100644
Binary files a/client/public/images/sequence/130.jpg and b/client/public/images/sequence/130.jpg differ
diff --git a/client/public/images/sequence/131.jpg b/client/public/images/sequence/131.jpg
index 8226511..beeecba 100644
Binary files a/client/public/images/sequence/131.jpg and b/client/public/images/sequence/131.jpg differ
diff --git a/client/public/images/sequence/132.jpg b/client/public/images/sequence/132.jpg
index d0a6e60..baf5d71 100644
Binary files a/client/public/images/sequence/132.jpg and b/client/public/images/sequence/132.jpg differ
diff --git a/client/public/images/sequence/133.jpg b/client/public/images/sequence/133.jpg
index d39f655..eff7b5e 100644
Binary files a/client/public/images/sequence/133.jpg and b/client/public/images/sequence/133.jpg differ
diff --git a/client/public/images/sequence/134.jpg b/client/public/images/sequence/134.jpg
index b8d6ad2..e1b40f8 100644
Binary files a/client/public/images/sequence/134.jpg and b/client/public/images/sequence/134.jpg differ
diff --git a/client/public/images/sequence/135.jpg b/client/public/images/sequence/135.jpg
index 30c2779..742a18c 100644
Binary files a/client/public/images/sequence/135.jpg and b/client/public/images/sequence/135.jpg differ
diff --git a/client/public/images/sequence/136.jpg b/client/public/images/sequence/136.jpg
index e5ac799..9e9cca3 100644
Binary files a/client/public/images/sequence/136.jpg and b/client/public/images/sequence/136.jpg differ
diff --git a/client/public/images/sequence/137.jpg b/client/public/images/sequence/137.jpg
index 1c6582a..e9ebd05 100644
Binary files a/client/public/images/sequence/137.jpg and b/client/public/images/sequence/137.jpg differ
diff --git a/client/public/images/sequence/138.jpg b/client/public/images/sequence/138.jpg
index 9f4c892..4daa181 100644
Binary files a/client/public/images/sequence/138.jpg and b/client/public/images/sequence/138.jpg differ
diff --git a/client/public/images/sequence/139.jpg b/client/public/images/sequence/139.jpg
index 51de4c6..3f097cf 100644
Binary files a/client/public/images/sequence/139.jpg and b/client/public/images/sequence/139.jpg differ
diff --git a/client/public/images/sequence/14.jpg b/client/public/images/sequence/14.jpg
index 7f1bac2..3d04355 100644
Binary files a/client/public/images/sequence/14.jpg and b/client/public/images/sequence/14.jpg differ
diff --git a/client/public/images/sequence/140.jpg b/client/public/images/sequence/140.jpg
index 63c8d36..e2cc6e5 100644
Binary files a/client/public/images/sequence/140.jpg and b/client/public/images/sequence/140.jpg differ
diff --git a/client/public/images/sequence/141.jpg b/client/public/images/sequence/141.jpg
index db3def1..bfbccc5 100644
Binary files a/client/public/images/sequence/141.jpg and b/client/public/images/sequence/141.jpg differ
diff --git a/client/public/images/sequence/142.jpg b/client/public/images/sequence/142.jpg
index 96fa3bc..06e53b1 100644
Binary files a/client/public/images/sequence/142.jpg and b/client/public/images/sequence/142.jpg differ
diff --git a/client/public/images/sequence/143.jpg b/client/public/images/sequence/143.jpg
index 8d69c70..499bc14 100644
Binary files a/client/public/images/sequence/143.jpg and b/client/public/images/sequence/143.jpg differ
diff --git a/client/public/images/sequence/144.jpg b/client/public/images/sequence/144.jpg
index fdc0dd4..8d25aea 100644
Binary files a/client/public/images/sequence/144.jpg and b/client/public/images/sequence/144.jpg differ
diff --git a/client/public/images/sequence/145.jpg b/client/public/images/sequence/145.jpg
index 14349f6..7f11a04 100644
Binary files a/client/public/images/sequence/145.jpg and b/client/public/images/sequence/145.jpg differ
diff --git a/client/public/images/sequence/146.jpg b/client/public/images/sequence/146.jpg
index 84fc0fd..5bf97ce 100644
Binary files a/client/public/images/sequence/146.jpg and b/client/public/images/sequence/146.jpg differ
diff --git a/client/public/images/sequence/147.jpg b/client/public/images/sequence/147.jpg
index b1115b4..081a3f7 100644
Binary files a/client/public/images/sequence/147.jpg and b/client/public/images/sequence/147.jpg differ
diff --git a/client/public/images/sequence/148.jpg b/client/public/images/sequence/148.jpg
index f3fc605..5e4481d 100644
Binary files a/client/public/images/sequence/148.jpg and b/client/public/images/sequence/148.jpg differ
diff --git a/client/public/images/sequence/149.jpg b/client/public/images/sequence/149.jpg
index 6f9a26e..3351407 100644
Binary files a/client/public/images/sequence/149.jpg and b/client/public/images/sequence/149.jpg differ
diff --git a/client/public/images/sequence/15.jpg b/client/public/images/sequence/15.jpg
index 6d8648c..99d8b3e 100644
Binary files a/client/public/images/sequence/15.jpg and b/client/public/images/sequence/15.jpg differ
diff --git a/client/public/images/sequence/150.jpg b/client/public/images/sequence/150.jpg
index af529f5..7361357 100644
Binary files a/client/public/images/sequence/150.jpg and b/client/public/images/sequence/150.jpg differ
diff --git a/client/public/images/sequence/151.jpg b/client/public/images/sequence/151.jpg
index 2ff038c..f98c8b4 100644
Binary files a/client/public/images/sequence/151.jpg and b/client/public/images/sequence/151.jpg differ
diff --git a/client/public/images/sequence/152.jpg b/client/public/images/sequence/152.jpg
index d850a5d..aa34c3b 100644
Binary files a/client/public/images/sequence/152.jpg and b/client/public/images/sequence/152.jpg differ
diff --git a/client/public/images/sequence/153.jpg b/client/public/images/sequence/153.jpg
index db7ab23..6fcf319 100644
Binary files a/client/public/images/sequence/153.jpg and b/client/public/images/sequence/153.jpg differ
diff --git a/client/public/images/sequence/154.jpg b/client/public/images/sequence/154.jpg
index 19fbf95..8a8e452 100644
Binary files a/client/public/images/sequence/154.jpg and b/client/public/images/sequence/154.jpg differ
diff --git a/client/public/images/sequence/155.jpg b/client/public/images/sequence/155.jpg
index f59a858..d825521 100644
Binary files a/client/public/images/sequence/155.jpg and b/client/public/images/sequence/155.jpg differ
diff --git a/client/public/images/sequence/156.jpg b/client/public/images/sequence/156.jpg
index 0fd55a2..f04dd60 100644
Binary files a/client/public/images/sequence/156.jpg and b/client/public/images/sequence/156.jpg differ
diff --git a/client/public/images/sequence/157.jpg b/client/public/images/sequence/157.jpg
index 97923f5..342c87a 100644
Binary files a/client/public/images/sequence/157.jpg and b/client/public/images/sequence/157.jpg differ
diff --git a/client/public/images/sequence/158.jpg b/client/public/images/sequence/158.jpg
index 4af6235..6be86b9 100644
Binary files a/client/public/images/sequence/158.jpg and b/client/public/images/sequence/158.jpg differ
diff --git a/client/public/images/sequence/159.jpg b/client/public/images/sequence/159.jpg
index d2709ca..6cf0481 100644
Binary files a/client/public/images/sequence/159.jpg and b/client/public/images/sequence/159.jpg differ
diff --git a/client/public/images/sequence/16.jpg b/client/public/images/sequence/16.jpg
index 4eaa6f1..584afbf 100644
Binary files a/client/public/images/sequence/16.jpg and b/client/public/images/sequence/16.jpg differ
diff --git a/client/public/images/sequence/160.jpg b/client/public/images/sequence/160.jpg
index 88045e7..75d5f8f 100644
Binary files a/client/public/images/sequence/160.jpg and b/client/public/images/sequence/160.jpg differ
diff --git a/client/public/images/sequence/161.jpg b/client/public/images/sequence/161.jpg
index e300811..1a07504 100644
Binary files a/client/public/images/sequence/161.jpg and b/client/public/images/sequence/161.jpg differ
diff --git a/client/public/images/sequence/162.jpg b/client/public/images/sequence/162.jpg
index b6ce74a..432a28a 100644
Binary files a/client/public/images/sequence/162.jpg and b/client/public/images/sequence/162.jpg differ
diff --git a/client/public/images/sequence/163.jpg b/client/public/images/sequence/163.jpg
index 621dcca..b6877e6 100644
Binary files a/client/public/images/sequence/163.jpg and b/client/public/images/sequence/163.jpg differ
diff --git a/client/public/images/sequence/164.jpg b/client/public/images/sequence/164.jpg
index c7c46a3..7b44d84 100644
Binary files a/client/public/images/sequence/164.jpg and b/client/public/images/sequence/164.jpg differ
diff --git a/client/public/images/sequence/165.jpg b/client/public/images/sequence/165.jpg
index 39c500a..25875fe 100644
Binary files a/client/public/images/sequence/165.jpg and b/client/public/images/sequence/165.jpg differ
diff --git a/client/public/images/sequence/166.jpg b/client/public/images/sequence/166.jpg
index 9a0b322..807fed4 100644
Binary files a/client/public/images/sequence/166.jpg and b/client/public/images/sequence/166.jpg differ
diff --git a/client/public/images/sequence/167.jpg b/client/public/images/sequence/167.jpg
index a63662c..3b7c5e6 100644
Binary files a/client/public/images/sequence/167.jpg and b/client/public/images/sequence/167.jpg differ
diff --git a/client/public/images/sequence/168.jpg b/client/public/images/sequence/168.jpg
index 80a2429..bb6f192 100644
Binary files a/client/public/images/sequence/168.jpg and b/client/public/images/sequence/168.jpg differ
diff --git a/client/public/images/sequence/169.jpg b/client/public/images/sequence/169.jpg
index a7e8caa..8ee684b 100644
Binary files a/client/public/images/sequence/169.jpg and b/client/public/images/sequence/169.jpg differ
diff --git a/client/public/images/sequence/17.jpg b/client/public/images/sequence/17.jpg
index 15a28cc..cf21617 100644
Binary files a/client/public/images/sequence/17.jpg and b/client/public/images/sequence/17.jpg differ
diff --git a/client/public/images/sequence/170.jpg b/client/public/images/sequence/170.jpg
index ee84c1e..bc194de 100644
Binary files a/client/public/images/sequence/170.jpg and b/client/public/images/sequence/170.jpg differ
diff --git a/client/public/images/sequence/171.jpg b/client/public/images/sequence/171.jpg
index 72c4ab5..a3d1d1e 100644
Binary files a/client/public/images/sequence/171.jpg and b/client/public/images/sequence/171.jpg differ
diff --git a/client/public/images/sequence/172.jpg b/client/public/images/sequence/172.jpg
index 4459999..b4022b0 100644
Binary files a/client/public/images/sequence/172.jpg and b/client/public/images/sequence/172.jpg differ
diff --git a/client/public/images/sequence/173.jpg b/client/public/images/sequence/173.jpg
index d59b749..9d73490 100644
Binary files a/client/public/images/sequence/173.jpg and b/client/public/images/sequence/173.jpg differ
diff --git a/client/public/images/sequence/174.jpg b/client/public/images/sequence/174.jpg
index fe7f4d1..df7dea9 100644
Binary files a/client/public/images/sequence/174.jpg and b/client/public/images/sequence/174.jpg differ
diff --git a/client/public/images/sequence/175.jpg b/client/public/images/sequence/175.jpg
index 4e47fe6..2580441 100644
Binary files a/client/public/images/sequence/175.jpg and b/client/public/images/sequence/175.jpg differ
diff --git a/client/public/images/sequence/176.jpg b/client/public/images/sequence/176.jpg
index 8b837a7..e38daee 100644
Binary files a/client/public/images/sequence/176.jpg and b/client/public/images/sequence/176.jpg differ
diff --git a/client/public/images/sequence/177.jpg b/client/public/images/sequence/177.jpg
index 5204d2f..00555b0 100644
Binary files a/client/public/images/sequence/177.jpg and b/client/public/images/sequence/177.jpg differ
diff --git a/client/public/images/sequence/178.jpg b/client/public/images/sequence/178.jpg
index e009d25..672f0b0 100644
Binary files a/client/public/images/sequence/178.jpg and b/client/public/images/sequence/178.jpg differ
diff --git a/client/public/images/sequence/179.jpg b/client/public/images/sequence/179.jpg
index 014a063..c944180 100644
Binary files a/client/public/images/sequence/179.jpg and b/client/public/images/sequence/179.jpg differ
diff --git a/client/public/images/sequence/18.jpg b/client/public/images/sequence/18.jpg
index 6300535..6c2ddcd 100644
Binary files a/client/public/images/sequence/18.jpg and b/client/public/images/sequence/18.jpg differ
diff --git a/client/public/images/sequence/180.jpg b/client/public/images/sequence/180.jpg
index c9c650a..afea281 100644
Binary files a/client/public/images/sequence/180.jpg and b/client/public/images/sequence/180.jpg differ
diff --git a/client/public/images/sequence/181.jpg b/client/public/images/sequence/181.jpg
index a5e815a..026c1c6 100644
Binary files a/client/public/images/sequence/181.jpg and b/client/public/images/sequence/181.jpg differ
diff --git a/client/public/images/sequence/182.jpg b/client/public/images/sequence/182.jpg
index 730368a..0c72bf5 100644
Binary files a/client/public/images/sequence/182.jpg and b/client/public/images/sequence/182.jpg differ
diff --git a/client/public/images/sequence/183.jpg b/client/public/images/sequence/183.jpg
index 8757239..ce9ae32 100644
Binary files a/client/public/images/sequence/183.jpg and b/client/public/images/sequence/183.jpg differ
diff --git a/client/public/images/sequence/184.jpg b/client/public/images/sequence/184.jpg
index c3cc7a5..a145d40 100644
Binary files a/client/public/images/sequence/184.jpg and b/client/public/images/sequence/184.jpg differ
diff --git a/client/public/images/sequence/185.jpg b/client/public/images/sequence/185.jpg
index a914f9d..f2252e6 100644
Binary files a/client/public/images/sequence/185.jpg and b/client/public/images/sequence/185.jpg differ
diff --git a/client/public/images/sequence/186.jpg b/client/public/images/sequence/186.jpg
index 20f08f0..9316043 100644
Binary files a/client/public/images/sequence/186.jpg and b/client/public/images/sequence/186.jpg differ
diff --git a/client/public/images/sequence/187.jpg b/client/public/images/sequence/187.jpg
index aedb76c..884d39f 100644
Binary files a/client/public/images/sequence/187.jpg and b/client/public/images/sequence/187.jpg differ
diff --git a/client/public/images/sequence/188.jpg b/client/public/images/sequence/188.jpg
index 76d6b20..a9f467c 100644
Binary files a/client/public/images/sequence/188.jpg and b/client/public/images/sequence/188.jpg differ
diff --git a/client/public/images/sequence/189.jpg b/client/public/images/sequence/189.jpg
index bed4394..36908fa 100644
Binary files a/client/public/images/sequence/189.jpg and b/client/public/images/sequence/189.jpg differ
diff --git a/client/public/images/sequence/19.jpg b/client/public/images/sequence/19.jpg
index 87cf1ef..6fc3e27 100644
Binary files a/client/public/images/sequence/19.jpg and b/client/public/images/sequence/19.jpg differ
diff --git a/client/public/images/sequence/190.jpg b/client/public/images/sequence/190.jpg
index 940b222..b741a45 100644
Binary files a/client/public/images/sequence/190.jpg and b/client/public/images/sequence/190.jpg differ
diff --git a/client/public/images/sequence/191.jpg b/client/public/images/sequence/191.jpg
index 86141ff..19db1a7 100644
Binary files a/client/public/images/sequence/191.jpg and b/client/public/images/sequence/191.jpg differ
diff --git a/client/public/images/sequence/192.jpg b/client/public/images/sequence/192.jpg
index c6061a7..f171852 100644
Binary files a/client/public/images/sequence/192.jpg and b/client/public/images/sequence/192.jpg differ
diff --git a/client/public/images/sequence/193.jpg b/client/public/images/sequence/193.jpg
index 4044ca5..19c5d1e 100644
Binary files a/client/public/images/sequence/193.jpg and b/client/public/images/sequence/193.jpg differ
diff --git a/client/public/images/sequence/194.jpg b/client/public/images/sequence/194.jpg
index 2b0653c..5b565e3 100644
Binary files a/client/public/images/sequence/194.jpg and b/client/public/images/sequence/194.jpg differ
diff --git a/client/public/images/sequence/195.jpg b/client/public/images/sequence/195.jpg
index 1469538..6975707 100644
Binary files a/client/public/images/sequence/195.jpg and b/client/public/images/sequence/195.jpg differ
diff --git a/client/public/images/sequence/196.jpg b/client/public/images/sequence/196.jpg
index 2c9d534..38f6c8a 100644
Binary files a/client/public/images/sequence/196.jpg and b/client/public/images/sequence/196.jpg differ
diff --git a/client/public/images/sequence/197.jpg b/client/public/images/sequence/197.jpg
index a3a4cd1..490e962 100644
Binary files a/client/public/images/sequence/197.jpg and b/client/public/images/sequence/197.jpg differ
diff --git a/client/public/images/sequence/198.jpg b/client/public/images/sequence/198.jpg
index ac9d5be..fd40fe5 100644
Binary files a/client/public/images/sequence/198.jpg and b/client/public/images/sequence/198.jpg differ
diff --git a/client/public/images/sequence/199.jpg b/client/public/images/sequence/199.jpg
index bb03372..4e6cc1e 100644
Binary files a/client/public/images/sequence/199.jpg and b/client/public/images/sequence/199.jpg differ
diff --git a/client/public/images/sequence/2.jpg b/client/public/images/sequence/2.jpg
index 8a8ad75..3bdee05 100644
Binary files a/client/public/images/sequence/2.jpg and b/client/public/images/sequence/2.jpg differ
diff --git a/client/public/images/sequence/20.jpg b/client/public/images/sequence/20.jpg
index 55d005a..5e1ea66 100644
Binary files a/client/public/images/sequence/20.jpg and b/client/public/images/sequence/20.jpg differ
diff --git a/client/public/images/sequence/200.jpg b/client/public/images/sequence/200.jpg
index 4f269bb..a9feb5d 100644
Binary files a/client/public/images/sequence/200.jpg and b/client/public/images/sequence/200.jpg differ
diff --git a/client/public/images/sequence/201.jpg b/client/public/images/sequence/201.jpg
index 9fff552..03d2422 100644
Binary files a/client/public/images/sequence/201.jpg and b/client/public/images/sequence/201.jpg differ
diff --git a/client/public/images/sequence/202.jpg b/client/public/images/sequence/202.jpg
index 148424c..c8feb3d 100644
Binary files a/client/public/images/sequence/202.jpg and b/client/public/images/sequence/202.jpg differ
diff --git a/client/public/images/sequence/203.jpg b/client/public/images/sequence/203.jpg
index 86813a1..9785051 100644
Binary files a/client/public/images/sequence/203.jpg and b/client/public/images/sequence/203.jpg differ
diff --git a/client/public/images/sequence/204.jpg b/client/public/images/sequence/204.jpg
index 592e485..ced9ac6 100644
Binary files a/client/public/images/sequence/204.jpg and b/client/public/images/sequence/204.jpg differ
diff --git a/client/public/images/sequence/205.jpg b/client/public/images/sequence/205.jpg
index 7c7c8db..76505c8 100644
Binary files a/client/public/images/sequence/205.jpg and b/client/public/images/sequence/205.jpg differ
diff --git a/client/public/images/sequence/206.jpg b/client/public/images/sequence/206.jpg
index dfc40c1..ea6d481 100644
Binary files a/client/public/images/sequence/206.jpg and b/client/public/images/sequence/206.jpg differ
diff --git a/client/public/images/sequence/207.jpg b/client/public/images/sequence/207.jpg
index d16ee5b..99fb0ef 100644
Binary files a/client/public/images/sequence/207.jpg and b/client/public/images/sequence/207.jpg differ
diff --git a/client/public/images/sequence/208.jpg b/client/public/images/sequence/208.jpg
index cc38b53..410a64e 100644
Binary files a/client/public/images/sequence/208.jpg and b/client/public/images/sequence/208.jpg differ
diff --git a/client/public/images/sequence/209.jpg b/client/public/images/sequence/209.jpg
index 1adc360..9423dd8 100644
Binary files a/client/public/images/sequence/209.jpg and b/client/public/images/sequence/209.jpg differ
diff --git a/client/public/images/sequence/21.jpg b/client/public/images/sequence/21.jpg
index d42a750..f7510b7 100644
Binary files a/client/public/images/sequence/21.jpg and b/client/public/images/sequence/21.jpg differ
diff --git a/client/public/images/sequence/210.jpg b/client/public/images/sequence/210.jpg
index 83dbd6d..7b311c9 100644
Binary files a/client/public/images/sequence/210.jpg and b/client/public/images/sequence/210.jpg differ
diff --git a/client/public/images/sequence/211.jpg b/client/public/images/sequence/211.jpg
index 2f7ea39..b099164 100644
Binary files a/client/public/images/sequence/211.jpg and b/client/public/images/sequence/211.jpg differ
diff --git a/client/public/images/sequence/212.jpg b/client/public/images/sequence/212.jpg
index d112d3d..5da3258 100644
Binary files a/client/public/images/sequence/212.jpg and b/client/public/images/sequence/212.jpg differ
diff --git a/client/public/images/sequence/213.jpg b/client/public/images/sequence/213.jpg
index 8e71b2e..36f9d88 100644
Binary files a/client/public/images/sequence/213.jpg and b/client/public/images/sequence/213.jpg differ
diff --git a/client/public/images/sequence/214.jpg b/client/public/images/sequence/214.jpg
index f8a94b2..78448f1 100644
Binary files a/client/public/images/sequence/214.jpg and b/client/public/images/sequence/214.jpg differ
diff --git a/client/public/images/sequence/215.jpg b/client/public/images/sequence/215.jpg
index 2053145..e2fc564 100644
Binary files a/client/public/images/sequence/215.jpg and b/client/public/images/sequence/215.jpg differ
diff --git a/client/public/images/sequence/216.jpg b/client/public/images/sequence/216.jpg
index 0395fd9..dde1f54 100644
Binary files a/client/public/images/sequence/216.jpg and b/client/public/images/sequence/216.jpg differ
diff --git a/client/public/images/sequence/217.jpg b/client/public/images/sequence/217.jpg
index ffb72d5..894b4b6 100644
Binary files a/client/public/images/sequence/217.jpg and b/client/public/images/sequence/217.jpg differ
diff --git a/client/public/images/sequence/218.jpg b/client/public/images/sequence/218.jpg
index fe0f21e..eb030b3 100644
Binary files a/client/public/images/sequence/218.jpg and b/client/public/images/sequence/218.jpg differ
diff --git a/client/public/images/sequence/219.jpg b/client/public/images/sequence/219.jpg
index 2101046..ab4f784 100644
Binary files a/client/public/images/sequence/219.jpg and b/client/public/images/sequence/219.jpg differ
diff --git a/client/public/images/sequence/22.jpg b/client/public/images/sequence/22.jpg
index ac5f951..365e4b8 100644
Binary files a/client/public/images/sequence/22.jpg and b/client/public/images/sequence/22.jpg differ
diff --git a/client/public/images/sequence/220.jpg b/client/public/images/sequence/220.jpg
index 9743446..51254cc 100644
Binary files a/client/public/images/sequence/220.jpg and b/client/public/images/sequence/220.jpg differ
diff --git a/client/public/images/sequence/221.jpg b/client/public/images/sequence/221.jpg
index 19278cb..8cceb6f 100644
Binary files a/client/public/images/sequence/221.jpg and b/client/public/images/sequence/221.jpg differ
diff --git a/client/public/images/sequence/222.jpg b/client/public/images/sequence/222.jpg
index d57df8e..ce237eb 100644
Binary files a/client/public/images/sequence/222.jpg and b/client/public/images/sequence/222.jpg differ
diff --git a/client/public/images/sequence/223.jpg b/client/public/images/sequence/223.jpg
index 55eddb3..018ce6c 100644
Binary files a/client/public/images/sequence/223.jpg and b/client/public/images/sequence/223.jpg differ
diff --git a/client/public/images/sequence/224.jpg b/client/public/images/sequence/224.jpg
index bd59296..d544b1f 100644
Binary files a/client/public/images/sequence/224.jpg and b/client/public/images/sequence/224.jpg differ
diff --git a/client/public/images/sequence/225.jpg b/client/public/images/sequence/225.jpg
index 84ec799..d669afa 100644
Binary files a/client/public/images/sequence/225.jpg and b/client/public/images/sequence/225.jpg differ
diff --git a/client/public/images/sequence/226.jpg b/client/public/images/sequence/226.jpg
index 1e42143..bdccc95 100644
Binary files a/client/public/images/sequence/226.jpg and b/client/public/images/sequence/226.jpg differ
diff --git a/client/public/images/sequence/227.jpg b/client/public/images/sequence/227.jpg
index 8b18655..bc98299 100644
Binary files a/client/public/images/sequence/227.jpg and b/client/public/images/sequence/227.jpg differ
diff --git a/client/public/images/sequence/228.jpg b/client/public/images/sequence/228.jpg
index 9e7e981..a2e90d1 100644
Binary files a/client/public/images/sequence/228.jpg and b/client/public/images/sequence/228.jpg differ
diff --git a/client/public/images/sequence/229.jpg b/client/public/images/sequence/229.jpg
index 92249f7..af9dee5 100644
Binary files a/client/public/images/sequence/229.jpg and b/client/public/images/sequence/229.jpg differ
diff --git a/client/public/images/sequence/23.jpg b/client/public/images/sequence/23.jpg
index 3419a9e..8cfa3e0 100644
Binary files a/client/public/images/sequence/23.jpg and b/client/public/images/sequence/23.jpg differ
diff --git a/client/public/images/sequence/230.jpg b/client/public/images/sequence/230.jpg
index 362424a..88d69ac 100644
Binary files a/client/public/images/sequence/230.jpg and b/client/public/images/sequence/230.jpg differ
diff --git a/client/public/images/sequence/231.jpg b/client/public/images/sequence/231.jpg
index af719a4..1c3c784 100644
Binary files a/client/public/images/sequence/231.jpg and b/client/public/images/sequence/231.jpg differ
diff --git a/client/public/images/sequence/232.jpg b/client/public/images/sequence/232.jpg
index caab3e1..1256d4e 100644
Binary files a/client/public/images/sequence/232.jpg and b/client/public/images/sequence/232.jpg differ
diff --git a/client/public/images/sequence/233.jpg b/client/public/images/sequence/233.jpg
index 1f2d0a2..bd40dab 100644
Binary files a/client/public/images/sequence/233.jpg and b/client/public/images/sequence/233.jpg differ
diff --git a/client/public/images/sequence/234.jpg b/client/public/images/sequence/234.jpg
index dfb0f00..6e6cbec 100644
Binary files a/client/public/images/sequence/234.jpg and b/client/public/images/sequence/234.jpg differ
diff --git a/client/public/images/sequence/235.jpg b/client/public/images/sequence/235.jpg
index 08fe14a..fab9091 100644
Binary files a/client/public/images/sequence/235.jpg and b/client/public/images/sequence/235.jpg differ
diff --git a/client/public/images/sequence/236.jpg b/client/public/images/sequence/236.jpg
index ea496d7..bf8f7ae 100644
Binary files a/client/public/images/sequence/236.jpg and b/client/public/images/sequence/236.jpg differ
diff --git a/client/public/images/sequence/237.jpg b/client/public/images/sequence/237.jpg
index cf8a329..7cc837e 100644
Binary files a/client/public/images/sequence/237.jpg and b/client/public/images/sequence/237.jpg differ
diff --git a/client/public/images/sequence/238.jpg b/client/public/images/sequence/238.jpg
index 7cc88b2..8c52729 100644
Binary files a/client/public/images/sequence/238.jpg and b/client/public/images/sequence/238.jpg differ
diff --git a/client/public/images/sequence/239.jpg b/client/public/images/sequence/239.jpg
index 8576165..101d9f0 100644
Binary files a/client/public/images/sequence/239.jpg and b/client/public/images/sequence/239.jpg differ
diff --git a/client/public/images/sequence/24.jpg b/client/public/images/sequence/24.jpg
index 826322d..5fa160e 100644
Binary files a/client/public/images/sequence/24.jpg and b/client/public/images/sequence/24.jpg differ
diff --git a/client/public/images/sequence/240.jpg b/client/public/images/sequence/240.jpg
index e20cadb..c3cd6db 100644
Binary files a/client/public/images/sequence/240.jpg and b/client/public/images/sequence/240.jpg differ
diff --git a/client/public/images/sequence/241.jpg b/client/public/images/sequence/241.jpg
index 95dac11..00c52d8 100644
Binary files a/client/public/images/sequence/241.jpg and b/client/public/images/sequence/241.jpg differ
diff --git a/client/public/images/sequence/242.jpg b/client/public/images/sequence/242.jpg
index 5c249e9..7bc8ab8 100644
Binary files a/client/public/images/sequence/242.jpg and b/client/public/images/sequence/242.jpg differ
diff --git a/client/public/images/sequence/243.jpg b/client/public/images/sequence/243.jpg
index 0068f0e..6baa03f 100644
Binary files a/client/public/images/sequence/243.jpg and b/client/public/images/sequence/243.jpg differ
diff --git a/client/public/images/sequence/244.jpg b/client/public/images/sequence/244.jpg
index 7740000..2396786 100644
Binary files a/client/public/images/sequence/244.jpg and b/client/public/images/sequence/244.jpg differ
diff --git a/client/public/images/sequence/245.jpg b/client/public/images/sequence/245.jpg
index b1dd553..99bbf43 100644
Binary files a/client/public/images/sequence/245.jpg and b/client/public/images/sequence/245.jpg differ
diff --git a/client/public/images/sequence/246.jpg b/client/public/images/sequence/246.jpg
index b0ed52a..e32aefa 100644
Binary files a/client/public/images/sequence/246.jpg and b/client/public/images/sequence/246.jpg differ
diff --git a/client/public/images/sequence/247.jpg b/client/public/images/sequence/247.jpg
index efef9f4..629bed7 100644
Binary files a/client/public/images/sequence/247.jpg and b/client/public/images/sequence/247.jpg differ
diff --git a/client/public/images/sequence/248.jpg b/client/public/images/sequence/248.jpg
index a58604d..c52dd17 100644
Binary files a/client/public/images/sequence/248.jpg and b/client/public/images/sequence/248.jpg differ
diff --git a/client/public/images/sequence/249.jpg b/client/public/images/sequence/249.jpg
index 9086c3e..796be7b 100644
Binary files a/client/public/images/sequence/249.jpg and b/client/public/images/sequence/249.jpg differ
diff --git a/client/public/images/sequence/25.jpg b/client/public/images/sequence/25.jpg
index c645afc..2359d85 100644
Binary files a/client/public/images/sequence/25.jpg and b/client/public/images/sequence/25.jpg differ
diff --git a/client/public/images/sequence/250.jpg b/client/public/images/sequence/250.jpg
index 651117a..9691a54 100644
Binary files a/client/public/images/sequence/250.jpg and b/client/public/images/sequence/250.jpg differ
diff --git a/client/public/images/sequence/251.jpg b/client/public/images/sequence/251.jpg
index 3503c21..0cd8f02 100644
Binary files a/client/public/images/sequence/251.jpg and b/client/public/images/sequence/251.jpg differ
diff --git a/client/public/images/sequence/252.jpg b/client/public/images/sequence/252.jpg
index be60570..1a5dfd7 100644
Binary files a/client/public/images/sequence/252.jpg and b/client/public/images/sequence/252.jpg differ
diff --git a/client/public/images/sequence/253.jpg b/client/public/images/sequence/253.jpg
index c4aeb78..4903d5f 100644
Binary files a/client/public/images/sequence/253.jpg and b/client/public/images/sequence/253.jpg differ
diff --git a/client/public/images/sequence/254.jpg b/client/public/images/sequence/254.jpg
index c57debd..27fc7f7 100644
Binary files a/client/public/images/sequence/254.jpg and b/client/public/images/sequence/254.jpg differ
diff --git a/client/public/images/sequence/255.jpg b/client/public/images/sequence/255.jpg
index a53d2a6..1052e69 100644
Binary files a/client/public/images/sequence/255.jpg and b/client/public/images/sequence/255.jpg differ
diff --git a/client/public/images/sequence/256.jpg b/client/public/images/sequence/256.jpg
index 95dcdd6..698ef6e 100644
Binary files a/client/public/images/sequence/256.jpg and b/client/public/images/sequence/256.jpg differ
diff --git a/client/public/images/sequence/257.jpg b/client/public/images/sequence/257.jpg
index 40b37e5..bce6177 100644
Binary files a/client/public/images/sequence/257.jpg and b/client/public/images/sequence/257.jpg differ
diff --git a/client/public/images/sequence/258.jpg b/client/public/images/sequence/258.jpg
index a8bc547..4987a33 100644
Binary files a/client/public/images/sequence/258.jpg and b/client/public/images/sequence/258.jpg differ
diff --git a/client/public/images/sequence/259.jpg b/client/public/images/sequence/259.jpg
index ac1e1a6..b1af758 100644
Binary files a/client/public/images/sequence/259.jpg and b/client/public/images/sequence/259.jpg differ
diff --git a/client/public/images/sequence/26.jpg b/client/public/images/sequence/26.jpg
index 8628b63..541d76a 100644
Binary files a/client/public/images/sequence/26.jpg and b/client/public/images/sequence/26.jpg differ
diff --git a/client/public/images/sequence/260.jpg b/client/public/images/sequence/260.jpg
index 852a129..448cd5d 100644
Binary files a/client/public/images/sequence/260.jpg and b/client/public/images/sequence/260.jpg differ
diff --git a/client/public/images/sequence/261.jpg b/client/public/images/sequence/261.jpg
index ed60266..a41d456 100644
Binary files a/client/public/images/sequence/261.jpg and b/client/public/images/sequence/261.jpg differ
diff --git a/client/public/images/sequence/262.jpg b/client/public/images/sequence/262.jpg
index 44193b1..2bffbd9 100644
Binary files a/client/public/images/sequence/262.jpg and b/client/public/images/sequence/262.jpg differ
diff --git a/client/public/images/sequence/263.jpg b/client/public/images/sequence/263.jpg
index f61544a..65b4090 100644
Binary files a/client/public/images/sequence/263.jpg and b/client/public/images/sequence/263.jpg differ
diff --git a/client/public/images/sequence/264.jpg b/client/public/images/sequence/264.jpg
index 81e4c5f..63a8e42 100644
Binary files a/client/public/images/sequence/264.jpg and b/client/public/images/sequence/264.jpg differ
diff --git a/client/public/images/sequence/265.jpg b/client/public/images/sequence/265.jpg
index 6b5a941..701021e 100644
Binary files a/client/public/images/sequence/265.jpg and b/client/public/images/sequence/265.jpg differ
diff --git a/client/public/images/sequence/266.jpg b/client/public/images/sequence/266.jpg
index c4d8b32..041aef8 100644
Binary files a/client/public/images/sequence/266.jpg and b/client/public/images/sequence/266.jpg differ
diff --git a/client/public/images/sequence/267.jpg b/client/public/images/sequence/267.jpg
index ff364bb..c44c189 100644
Binary files a/client/public/images/sequence/267.jpg and b/client/public/images/sequence/267.jpg differ
diff --git a/client/public/images/sequence/268.jpg b/client/public/images/sequence/268.jpg
index 41c7bd1..9e34d30 100644
Binary files a/client/public/images/sequence/268.jpg and b/client/public/images/sequence/268.jpg differ
diff --git a/client/public/images/sequence/269.jpg b/client/public/images/sequence/269.jpg
index 9032034..8f18f95 100644
Binary files a/client/public/images/sequence/269.jpg and b/client/public/images/sequence/269.jpg differ
diff --git a/client/public/images/sequence/27.jpg b/client/public/images/sequence/27.jpg
index 5abf19a..1c2e9c8 100644
Binary files a/client/public/images/sequence/27.jpg and b/client/public/images/sequence/27.jpg differ
diff --git a/client/public/images/sequence/270.jpg b/client/public/images/sequence/270.jpg
index 5cdd676..4274140 100644
Binary files a/client/public/images/sequence/270.jpg and b/client/public/images/sequence/270.jpg differ
diff --git a/client/public/images/sequence/271.jpg b/client/public/images/sequence/271.jpg
index f9c4d75..7a4e716 100644
Binary files a/client/public/images/sequence/271.jpg and b/client/public/images/sequence/271.jpg differ
diff --git a/client/public/images/sequence/272.jpg b/client/public/images/sequence/272.jpg
index 8df375c..7ad1302 100644
Binary files a/client/public/images/sequence/272.jpg and b/client/public/images/sequence/272.jpg differ
diff --git a/client/public/images/sequence/273.jpg b/client/public/images/sequence/273.jpg
index caff863..43430d7 100644
Binary files a/client/public/images/sequence/273.jpg and b/client/public/images/sequence/273.jpg differ
diff --git a/client/public/images/sequence/274.jpg b/client/public/images/sequence/274.jpg
index 4f531d6..87b44aa 100644
Binary files a/client/public/images/sequence/274.jpg and b/client/public/images/sequence/274.jpg differ
diff --git a/client/public/images/sequence/275.jpg b/client/public/images/sequence/275.jpg
index 06564b4..0cf59a7 100644
Binary files a/client/public/images/sequence/275.jpg and b/client/public/images/sequence/275.jpg differ
diff --git a/client/public/images/sequence/276.jpg b/client/public/images/sequence/276.jpg
index 509202c..08f5f48 100644
Binary files a/client/public/images/sequence/276.jpg and b/client/public/images/sequence/276.jpg differ
diff --git a/client/public/images/sequence/277.jpg b/client/public/images/sequence/277.jpg
index e3205e8..12d5a60 100644
Binary files a/client/public/images/sequence/277.jpg and b/client/public/images/sequence/277.jpg differ
diff --git a/client/public/images/sequence/278.jpg b/client/public/images/sequence/278.jpg
index 7d7abe4..2e4a598 100644
Binary files a/client/public/images/sequence/278.jpg and b/client/public/images/sequence/278.jpg differ
diff --git a/client/public/images/sequence/279.jpg b/client/public/images/sequence/279.jpg
index c5e7ded..15ae73e 100644
Binary files a/client/public/images/sequence/279.jpg and b/client/public/images/sequence/279.jpg differ
diff --git a/client/public/images/sequence/28.jpg b/client/public/images/sequence/28.jpg
index b6fbecd..547af70 100644
Binary files a/client/public/images/sequence/28.jpg and b/client/public/images/sequence/28.jpg differ
diff --git a/client/public/images/sequence/280.jpg b/client/public/images/sequence/280.jpg
index 267337a..675754e 100644
Binary files a/client/public/images/sequence/280.jpg and b/client/public/images/sequence/280.jpg differ
diff --git a/client/public/images/sequence/281.jpg b/client/public/images/sequence/281.jpg
index fc4a883..136faba 100644
Binary files a/client/public/images/sequence/281.jpg and b/client/public/images/sequence/281.jpg differ
diff --git a/client/public/images/sequence/282.jpg b/client/public/images/sequence/282.jpg
index b2242d8..06fa4e2 100644
Binary files a/client/public/images/sequence/282.jpg and b/client/public/images/sequence/282.jpg differ
diff --git a/client/public/images/sequence/283.jpg b/client/public/images/sequence/283.jpg
index e854b4d..cef0f4e 100644
Binary files a/client/public/images/sequence/283.jpg and b/client/public/images/sequence/283.jpg differ
diff --git a/client/public/images/sequence/284.jpg b/client/public/images/sequence/284.jpg
index 0001d21..051348c 100644
Binary files a/client/public/images/sequence/284.jpg and b/client/public/images/sequence/284.jpg differ
diff --git a/client/public/images/sequence/285.jpg b/client/public/images/sequence/285.jpg
index 34f7e93..4ab5acc 100644
Binary files a/client/public/images/sequence/285.jpg and b/client/public/images/sequence/285.jpg differ
diff --git a/client/public/images/sequence/286.jpg b/client/public/images/sequence/286.jpg
index b3ba3b9..6dfdefc 100644
Binary files a/client/public/images/sequence/286.jpg and b/client/public/images/sequence/286.jpg differ
diff --git a/client/public/images/sequence/287.jpg b/client/public/images/sequence/287.jpg
index 76d8e23..6d526b8 100644
Binary files a/client/public/images/sequence/287.jpg and b/client/public/images/sequence/287.jpg differ
diff --git a/client/public/images/sequence/288.jpg b/client/public/images/sequence/288.jpg
index 8237f91..c04e827 100644
Binary files a/client/public/images/sequence/288.jpg and b/client/public/images/sequence/288.jpg differ
diff --git a/client/public/images/sequence/289.jpg b/client/public/images/sequence/289.jpg
index 96df64b..611827e 100644
Binary files a/client/public/images/sequence/289.jpg and b/client/public/images/sequence/289.jpg differ
diff --git a/client/public/images/sequence/29.jpg b/client/public/images/sequence/29.jpg
index 28b129e..41847fe 100644
Binary files a/client/public/images/sequence/29.jpg and b/client/public/images/sequence/29.jpg differ
diff --git a/client/public/images/sequence/290.jpg b/client/public/images/sequence/290.jpg
index 900418c..2355531 100644
Binary files a/client/public/images/sequence/290.jpg and b/client/public/images/sequence/290.jpg differ
diff --git a/client/public/images/sequence/291.jpg b/client/public/images/sequence/291.jpg
index 13fde16..daf5d9c 100644
Binary files a/client/public/images/sequence/291.jpg and b/client/public/images/sequence/291.jpg differ
diff --git a/client/public/images/sequence/292.jpg b/client/public/images/sequence/292.jpg
index 8f92ad8..bc4c86b 100644
Binary files a/client/public/images/sequence/292.jpg and b/client/public/images/sequence/292.jpg differ
diff --git a/client/public/images/sequence/293.jpg b/client/public/images/sequence/293.jpg
index 64bfc0b..2c034e2 100644
Binary files a/client/public/images/sequence/293.jpg and b/client/public/images/sequence/293.jpg differ
diff --git a/client/public/images/sequence/294.jpg b/client/public/images/sequence/294.jpg
index b70efe4..0831776 100644
Binary files a/client/public/images/sequence/294.jpg and b/client/public/images/sequence/294.jpg differ
diff --git a/client/public/images/sequence/295.jpg b/client/public/images/sequence/295.jpg
index a45a237..c9d16ed 100644
Binary files a/client/public/images/sequence/295.jpg and b/client/public/images/sequence/295.jpg differ
diff --git a/client/public/images/sequence/296.jpg b/client/public/images/sequence/296.jpg
index 04813fa..5247adb 100644
Binary files a/client/public/images/sequence/296.jpg and b/client/public/images/sequence/296.jpg differ
diff --git a/client/public/images/sequence/297.jpg b/client/public/images/sequence/297.jpg
index f007461..83c8b28 100644
Binary files a/client/public/images/sequence/297.jpg and b/client/public/images/sequence/297.jpg differ
diff --git a/client/public/images/sequence/298.jpg b/client/public/images/sequence/298.jpg
index 14ade27..42caaa0 100644
Binary files a/client/public/images/sequence/298.jpg and b/client/public/images/sequence/298.jpg differ
diff --git a/client/public/images/sequence/299.jpg b/client/public/images/sequence/299.jpg
index de6b481..6c66ee8 100644
Binary files a/client/public/images/sequence/299.jpg and b/client/public/images/sequence/299.jpg differ
diff --git a/client/public/images/sequence/3.jpg b/client/public/images/sequence/3.jpg
index b7a9c3a..8cb38fd 100644
Binary files a/client/public/images/sequence/3.jpg and b/client/public/images/sequence/3.jpg differ
diff --git a/client/public/images/sequence/30.jpg b/client/public/images/sequence/30.jpg
index 5bcd821..53e194b 100644
Binary files a/client/public/images/sequence/30.jpg and b/client/public/images/sequence/30.jpg differ
diff --git a/client/public/images/sequence/300.jpg b/client/public/images/sequence/300.jpg
index 6d9c769..f37a531 100644
Binary files a/client/public/images/sequence/300.jpg and b/client/public/images/sequence/300.jpg differ
diff --git a/client/public/images/sequence/301.jpg b/client/public/images/sequence/301.jpg
index a963b02..d84ae74 100644
Binary files a/client/public/images/sequence/301.jpg and b/client/public/images/sequence/301.jpg differ
diff --git a/client/public/images/sequence/302.jpg b/client/public/images/sequence/302.jpg
index fb88721..780290c 100644
Binary files a/client/public/images/sequence/302.jpg and b/client/public/images/sequence/302.jpg differ
diff --git a/client/public/images/sequence/303.jpg b/client/public/images/sequence/303.jpg
index 1696eab..5d9250d 100644
Binary files a/client/public/images/sequence/303.jpg and b/client/public/images/sequence/303.jpg differ
diff --git a/client/public/images/sequence/304.jpg b/client/public/images/sequence/304.jpg
index df792d4..2349306 100644
Binary files a/client/public/images/sequence/304.jpg and b/client/public/images/sequence/304.jpg differ
diff --git a/client/public/images/sequence/305.jpg b/client/public/images/sequence/305.jpg
index 89e5397..41f4e71 100644
Binary files a/client/public/images/sequence/305.jpg and b/client/public/images/sequence/305.jpg differ
diff --git a/client/public/images/sequence/306.jpg b/client/public/images/sequence/306.jpg
index b0a4702..0608d74 100644
Binary files a/client/public/images/sequence/306.jpg and b/client/public/images/sequence/306.jpg differ
diff --git a/client/public/images/sequence/307.jpg b/client/public/images/sequence/307.jpg
index fddc63b..90834ca 100644
Binary files a/client/public/images/sequence/307.jpg and b/client/public/images/sequence/307.jpg differ
diff --git a/client/public/images/sequence/308.jpg b/client/public/images/sequence/308.jpg
index 689d893..cd885bf 100644
Binary files a/client/public/images/sequence/308.jpg and b/client/public/images/sequence/308.jpg differ
diff --git a/client/public/images/sequence/309.jpg b/client/public/images/sequence/309.jpg
index fba93d6..b176c65 100644
Binary files a/client/public/images/sequence/309.jpg and b/client/public/images/sequence/309.jpg differ
diff --git a/client/public/images/sequence/31.jpg b/client/public/images/sequence/31.jpg
index 833a852..4e31d33 100644
Binary files a/client/public/images/sequence/31.jpg and b/client/public/images/sequence/31.jpg differ
diff --git a/client/public/images/sequence/310.jpg b/client/public/images/sequence/310.jpg
index e0f63df..4a1003c 100644
Binary files a/client/public/images/sequence/310.jpg and b/client/public/images/sequence/310.jpg differ
diff --git a/client/public/images/sequence/311.jpg b/client/public/images/sequence/311.jpg
index 56558a9..b1eda87 100644
Binary files a/client/public/images/sequence/311.jpg and b/client/public/images/sequence/311.jpg differ
diff --git a/client/public/images/sequence/312.jpg b/client/public/images/sequence/312.jpg
index 6cea46f..7d0c18e 100644
Binary files a/client/public/images/sequence/312.jpg and b/client/public/images/sequence/312.jpg differ
diff --git a/client/public/images/sequence/313.jpg b/client/public/images/sequence/313.jpg
index 6d741f1..9891c81 100644
Binary files a/client/public/images/sequence/313.jpg and b/client/public/images/sequence/313.jpg differ
diff --git a/client/public/images/sequence/314.jpg b/client/public/images/sequence/314.jpg
index a01ea37..78efdae 100644
Binary files a/client/public/images/sequence/314.jpg and b/client/public/images/sequence/314.jpg differ
diff --git a/client/public/images/sequence/315.jpg b/client/public/images/sequence/315.jpg
index 90afdc5..0576aa2 100644
Binary files a/client/public/images/sequence/315.jpg and b/client/public/images/sequence/315.jpg differ
diff --git a/client/public/images/sequence/316.jpg b/client/public/images/sequence/316.jpg
index cf422a3..2c73355 100644
Binary files a/client/public/images/sequence/316.jpg and b/client/public/images/sequence/316.jpg differ
diff --git a/client/public/images/sequence/317.jpg b/client/public/images/sequence/317.jpg
index df28374..1d84543 100644
Binary files a/client/public/images/sequence/317.jpg and b/client/public/images/sequence/317.jpg differ
diff --git a/client/public/images/sequence/318.jpg b/client/public/images/sequence/318.jpg
index b1a59d6..3edf264 100644
Binary files a/client/public/images/sequence/318.jpg and b/client/public/images/sequence/318.jpg differ
diff --git a/client/public/images/sequence/319.jpg b/client/public/images/sequence/319.jpg
index 18d49f7..f291a2a 100644
Binary files a/client/public/images/sequence/319.jpg and b/client/public/images/sequence/319.jpg differ
diff --git a/client/public/images/sequence/32.jpg b/client/public/images/sequence/32.jpg
index 139def0..38426eb 100644
Binary files a/client/public/images/sequence/32.jpg and b/client/public/images/sequence/32.jpg differ
diff --git a/client/public/images/sequence/320.jpg b/client/public/images/sequence/320.jpg
index 469e918..ace2ed5 100644
Binary files a/client/public/images/sequence/320.jpg and b/client/public/images/sequence/320.jpg differ
diff --git a/client/public/images/sequence/321.jpg b/client/public/images/sequence/321.jpg
index 6fd54fb..db2e1fe 100644
Binary files a/client/public/images/sequence/321.jpg and b/client/public/images/sequence/321.jpg differ
diff --git a/client/public/images/sequence/322.jpg b/client/public/images/sequence/322.jpg
index 9e1503a..8d28f09 100644
Binary files a/client/public/images/sequence/322.jpg and b/client/public/images/sequence/322.jpg differ
diff --git a/client/public/images/sequence/323.jpg b/client/public/images/sequence/323.jpg
index bd66b4d..c65e0d5 100644
Binary files a/client/public/images/sequence/323.jpg and b/client/public/images/sequence/323.jpg differ
diff --git a/client/public/images/sequence/324.jpg b/client/public/images/sequence/324.jpg
index 704bc60..b4bb429 100644
Binary files a/client/public/images/sequence/324.jpg and b/client/public/images/sequence/324.jpg differ
diff --git a/client/public/images/sequence/325.jpg b/client/public/images/sequence/325.jpg
index c43f8b0..2240c36 100644
Binary files a/client/public/images/sequence/325.jpg and b/client/public/images/sequence/325.jpg differ
diff --git a/client/public/images/sequence/326.jpg b/client/public/images/sequence/326.jpg
index 6b82418..815de28 100644
Binary files a/client/public/images/sequence/326.jpg and b/client/public/images/sequence/326.jpg differ
diff --git a/client/public/images/sequence/327.jpg b/client/public/images/sequence/327.jpg
index fdd6ca0..653b2d4 100644
Binary files a/client/public/images/sequence/327.jpg and b/client/public/images/sequence/327.jpg differ
diff --git a/client/public/images/sequence/328.jpg b/client/public/images/sequence/328.jpg
index 93cadc8..029ea3d 100644
Binary files a/client/public/images/sequence/328.jpg and b/client/public/images/sequence/328.jpg differ
diff --git a/client/public/images/sequence/329.jpg b/client/public/images/sequence/329.jpg
index d7d5345..00b6b04 100644
Binary files a/client/public/images/sequence/329.jpg and b/client/public/images/sequence/329.jpg differ
diff --git a/client/public/images/sequence/33.jpg b/client/public/images/sequence/33.jpg
index 249644d..08696b2 100644
Binary files a/client/public/images/sequence/33.jpg and b/client/public/images/sequence/33.jpg differ
diff --git a/client/public/images/sequence/330.jpg b/client/public/images/sequence/330.jpg
index 9e4618f..81ba256 100644
Binary files a/client/public/images/sequence/330.jpg and b/client/public/images/sequence/330.jpg differ
diff --git a/client/public/images/sequence/331.jpg b/client/public/images/sequence/331.jpg
index 6d74631..0278563 100644
Binary files a/client/public/images/sequence/331.jpg and b/client/public/images/sequence/331.jpg differ
diff --git a/client/public/images/sequence/332.jpg b/client/public/images/sequence/332.jpg
index d64a258..caa3ab4 100644
Binary files a/client/public/images/sequence/332.jpg and b/client/public/images/sequence/332.jpg differ
diff --git a/client/public/images/sequence/333.jpg b/client/public/images/sequence/333.jpg
index 4d65ae5..88926e2 100644
Binary files a/client/public/images/sequence/333.jpg and b/client/public/images/sequence/333.jpg differ
diff --git a/client/public/images/sequence/334.jpg b/client/public/images/sequence/334.jpg
index 67bb3b7..303f16e 100644
Binary files a/client/public/images/sequence/334.jpg and b/client/public/images/sequence/334.jpg differ
diff --git a/client/public/images/sequence/335.jpg b/client/public/images/sequence/335.jpg
index 13dfc80..2fb569c 100644
Binary files a/client/public/images/sequence/335.jpg and b/client/public/images/sequence/335.jpg differ
diff --git a/client/public/images/sequence/336.jpg b/client/public/images/sequence/336.jpg
index 8b77456..186d26e 100644
Binary files a/client/public/images/sequence/336.jpg and b/client/public/images/sequence/336.jpg differ
diff --git a/client/public/images/sequence/337.jpg b/client/public/images/sequence/337.jpg
index 2c91f4b..f65c757 100644
Binary files a/client/public/images/sequence/337.jpg and b/client/public/images/sequence/337.jpg differ
diff --git a/client/public/images/sequence/338.jpg b/client/public/images/sequence/338.jpg
index 7f26a63..76a422e 100644
Binary files a/client/public/images/sequence/338.jpg and b/client/public/images/sequence/338.jpg differ
diff --git a/client/public/images/sequence/339.jpg b/client/public/images/sequence/339.jpg
index 697ad8f..912187e 100644
Binary files a/client/public/images/sequence/339.jpg and b/client/public/images/sequence/339.jpg differ
diff --git a/client/public/images/sequence/34.jpg b/client/public/images/sequence/34.jpg
index 4b35a16..c92c4f5 100644
Binary files a/client/public/images/sequence/34.jpg and b/client/public/images/sequence/34.jpg differ
diff --git a/client/public/images/sequence/340.jpg b/client/public/images/sequence/340.jpg
index 8dc5e0d..ab5788d 100644
Binary files a/client/public/images/sequence/340.jpg and b/client/public/images/sequence/340.jpg differ
diff --git a/client/public/images/sequence/341.jpg b/client/public/images/sequence/341.jpg
index 90c0a83..10574de 100644
Binary files a/client/public/images/sequence/341.jpg and b/client/public/images/sequence/341.jpg differ
diff --git a/client/public/images/sequence/342.jpg b/client/public/images/sequence/342.jpg
index f1ef30e..90a1ba8 100644
Binary files a/client/public/images/sequence/342.jpg and b/client/public/images/sequence/342.jpg differ
diff --git a/client/public/images/sequence/343.jpg b/client/public/images/sequence/343.jpg
index b8ca150..3bfc969 100644
Binary files a/client/public/images/sequence/343.jpg and b/client/public/images/sequence/343.jpg differ
diff --git a/client/public/images/sequence/344.jpg b/client/public/images/sequence/344.jpg
index 6c74baf..8be0b41 100644
Binary files a/client/public/images/sequence/344.jpg and b/client/public/images/sequence/344.jpg differ
diff --git a/client/public/images/sequence/345.jpg b/client/public/images/sequence/345.jpg
index cde9b87..ff2cdca 100644
Binary files a/client/public/images/sequence/345.jpg and b/client/public/images/sequence/345.jpg differ
diff --git a/client/public/images/sequence/346.jpg b/client/public/images/sequence/346.jpg
index 9342e60..24591bc 100644
Binary files a/client/public/images/sequence/346.jpg and b/client/public/images/sequence/346.jpg differ
diff --git a/client/public/images/sequence/347.jpg b/client/public/images/sequence/347.jpg
index ffe572c..fc070e0 100644
Binary files a/client/public/images/sequence/347.jpg and b/client/public/images/sequence/347.jpg differ
diff --git a/client/public/images/sequence/348.jpg b/client/public/images/sequence/348.jpg
index b87b544..8170ed8 100644
Binary files a/client/public/images/sequence/348.jpg and b/client/public/images/sequence/348.jpg differ
diff --git a/client/public/images/sequence/349.jpg b/client/public/images/sequence/349.jpg
index 7815166..b473c21 100644
Binary files a/client/public/images/sequence/349.jpg and b/client/public/images/sequence/349.jpg differ
diff --git a/client/public/images/sequence/35.jpg b/client/public/images/sequence/35.jpg
index 2156f1f..792cf3f 100644
Binary files a/client/public/images/sequence/35.jpg and b/client/public/images/sequence/35.jpg differ
diff --git a/client/public/images/sequence/350.jpg b/client/public/images/sequence/350.jpg
index f0323b6..f35d3a5 100644
Binary files a/client/public/images/sequence/350.jpg and b/client/public/images/sequence/350.jpg differ
diff --git a/client/public/images/sequence/351.jpg b/client/public/images/sequence/351.jpg
index ee5ebb0..669cd18 100644
Binary files a/client/public/images/sequence/351.jpg and b/client/public/images/sequence/351.jpg differ
diff --git a/client/public/images/sequence/352.jpg b/client/public/images/sequence/352.jpg
index 02355f4..43bb309 100644
Binary files a/client/public/images/sequence/352.jpg and b/client/public/images/sequence/352.jpg differ
diff --git a/client/public/images/sequence/353.jpg b/client/public/images/sequence/353.jpg
index efa26e2..707e663 100644
Binary files a/client/public/images/sequence/353.jpg and b/client/public/images/sequence/353.jpg differ
diff --git a/client/public/images/sequence/354.jpg b/client/public/images/sequence/354.jpg
index 5a7d8c5..cb52710 100644
Binary files a/client/public/images/sequence/354.jpg and b/client/public/images/sequence/354.jpg differ
diff --git a/client/public/images/sequence/355.jpg b/client/public/images/sequence/355.jpg
index 5305554..86c07ff 100644
Binary files a/client/public/images/sequence/355.jpg and b/client/public/images/sequence/355.jpg differ
diff --git a/client/public/images/sequence/356.jpg b/client/public/images/sequence/356.jpg
index e8c392f..cd012d0 100644
Binary files a/client/public/images/sequence/356.jpg and b/client/public/images/sequence/356.jpg differ
diff --git a/client/public/images/sequence/357.jpg b/client/public/images/sequence/357.jpg
index cc5c925..0653e08 100644
Binary files a/client/public/images/sequence/357.jpg and b/client/public/images/sequence/357.jpg differ
diff --git a/client/public/images/sequence/358.jpg b/client/public/images/sequence/358.jpg
index 94e4413..26f21bc 100644
Binary files a/client/public/images/sequence/358.jpg and b/client/public/images/sequence/358.jpg differ
diff --git a/client/public/images/sequence/359.jpg b/client/public/images/sequence/359.jpg
index 2a0eff7..395c5b4 100644
Binary files a/client/public/images/sequence/359.jpg and b/client/public/images/sequence/359.jpg differ
diff --git a/client/public/images/sequence/36.jpg b/client/public/images/sequence/36.jpg
index 50d121e..1806814 100644
Binary files a/client/public/images/sequence/36.jpg and b/client/public/images/sequence/36.jpg differ
diff --git a/client/public/images/sequence/360.jpg b/client/public/images/sequence/360.jpg
index d44ba62..37fe1f7 100644
Binary files a/client/public/images/sequence/360.jpg and b/client/public/images/sequence/360.jpg differ
diff --git a/client/public/images/sequence/37.jpg b/client/public/images/sequence/37.jpg
index 098fafa..d669537 100644
Binary files a/client/public/images/sequence/37.jpg and b/client/public/images/sequence/37.jpg differ
diff --git a/client/public/images/sequence/38.jpg b/client/public/images/sequence/38.jpg
index 00f30fc..3aa778e 100644
Binary files a/client/public/images/sequence/38.jpg and b/client/public/images/sequence/38.jpg differ
diff --git a/client/public/images/sequence/39.jpg b/client/public/images/sequence/39.jpg
index 1c2eed8..78e3eac 100644
Binary files a/client/public/images/sequence/39.jpg and b/client/public/images/sequence/39.jpg differ
diff --git a/client/public/images/sequence/4.jpg b/client/public/images/sequence/4.jpg
index 0391ba7..37612cf 100644
Binary files a/client/public/images/sequence/4.jpg and b/client/public/images/sequence/4.jpg differ
diff --git a/client/public/images/sequence/40.jpg b/client/public/images/sequence/40.jpg
index ee94fba..9120c9a 100644
Binary files a/client/public/images/sequence/40.jpg and b/client/public/images/sequence/40.jpg differ
diff --git a/client/public/images/sequence/41.jpg b/client/public/images/sequence/41.jpg
index 67c1bfc..f753262 100644
Binary files a/client/public/images/sequence/41.jpg and b/client/public/images/sequence/41.jpg differ
diff --git a/client/public/images/sequence/42.jpg b/client/public/images/sequence/42.jpg
index 212a4b4..feec558 100644
Binary files a/client/public/images/sequence/42.jpg and b/client/public/images/sequence/42.jpg differ
diff --git a/client/public/images/sequence/43.jpg b/client/public/images/sequence/43.jpg
index f665726..590c669 100644
Binary files a/client/public/images/sequence/43.jpg and b/client/public/images/sequence/43.jpg differ
diff --git a/client/public/images/sequence/44.jpg b/client/public/images/sequence/44.jpg
index 0e746d4..a912231 100644
Binary files a/client/public/images/sequence/44.jpg and b/client/public/images/sequence/44.jpg differ
diff --git a/client/public/images/sequence/45.jpg b/client/public/images/sequence/45.jpg
index ee5feb2..fdaa954 100644
Binary files a/client/public/images/sequence/45.jpg and b/client/public/images/sequence/45.jpg differ
diff --git a/client/public/images/sequence/46.jpg b/client/public/images/sequence/46.jpg
index 4f49e11..182cf5f 100644
Binary files a/client/public/images/sequence/46.jpg and b/client/public/images/sequence/46.jpg differ
diff --git a/client/public/images/sequence/47.jpg b/client/public/images/sequence/47.jpg
index 279a7f5..da48c52 100644
Binary files a/client/public/images/sequence/47.jpg and b/client/public/images/sequence/47.jpg differ
diff --git a/client/public/images/sequence/48.jpg b/client/public/images/sequence/48.jpg
index 9353c1d..3e6d48d 100644
Binary files a/client/public/images/sequence/48.jpg and b/client/public/images/sequence/48.jpg differ
diff --git a/client/public/images/sequence/49.jpg b/client/public/images/sequence/49.jpg
index 129d117..130d08d 100644
Binary files a/client/public/images/sequence/49.jpg and b/client/public/images/sequence/49.jpg differ
diff --git a/client/public/images/sequence/5.jpg b/client/public/images/sequence/5.jpg
index a8461e2..ca0bc22 100644
Binary files a/client/public/images/sequence/5.jpg and b/client/public/images/sequence/5.jpg differ
diff --git a/client/public/images/sequence/50.jpg b/client/public/images/sequence/50.jpg
index 3524f93..906b576 100644
Binary files a/client/public/images/sequence/50.jpg and b/client/public/images/sequence/50.jpg differ
diff --git a/client/public/images/sequence/51.jpg b/client/public/images/sequence/51.jpg
index f79307b..98db1ca 100644
Binary files a/client/public/images/sequence/51.jpg and b/client/public/images/sequence/51.jpg differ
diff --git a/client/public/images/sequence/52.jpg b/client/public/images/sequence/52.jpg
index 58efc6e..5b42c03 100644
Binary files a/client/public/images/sequence/52.jpg and b/client/public/images/sequence/52.jpg differ
diff --git a/client/public/images/sequence/53.jpg b/client/public/images/sequence/53.jpg
index bcb634a..975e722 100644
Binary files a/client/public/images/sequence/53.jpg and b/client/public/images/sequence/53.jpg differ
diff --git a/client/public/images/sequence/54.jpg b/client/public/images/sequence/54.jpg
index f6d8c1b..eff21e6 100644
Binary files a/client/public/images/sequence/54.jpg and b/client/public/images/sequence/54.jpg differ
diff --git a/client/public/images/sequence/55.jpg b/client/public/images/sequence/55.jpg
index 886a2ad..c30f6f7 100644
Binary files a/client/public/images/sequence/55.jpg and b/client/public/images/sequence/55.jpg differ
diff --git a/client/public/images/sequence/56.jpg b/client/public/images/sequence/56.jpg
index 26ee478..a7414dc 100644
Binary files a/client/public/images/sequence/56.jpg and b/client/public/images/sequence/56.jpg differ
diff --git a/client/public/images/sequence/57.jpg b/client/public/images/sequence/57.jpg
index 7cb3b8a..cf7119e 100644
Binary files a/client/public/images/sequence/57.jpg and b/client/public/images/sequence/57.jpg differ
diff --git a/client/public/images/sequence/58.jpg b/client/public/images/sequence/58.jpg
index f88acb5..783bf53 100644
Binary files a/client/public/images/sequence/58.jpg and b/client/public/images/sequence/58.jpg differ
diff --git a/client/public/images/sequence/59.jpg b/client/public/images/sequence/59.jpg
index 705a023..2f1dde3 100644
Binary files a/client/public/images/sequence/59.jpg and b/client/public/images/sequence/59.jpg differ
diff --git a/client/public/images/sequence/6.jpg b/client/public/images/sequence/6.jpg
index d3d45bd..12d8649 100644
Binary files a/client/public/images/sequence/6.jpg and b/client/public/images/sequence/6.jpg differ
diff --git a/client/public/images/sequence/60.jpg b/client/public/images/sequence/60.jpg
index 3ed6652..b7f4742 100644
Binary files a/client/public/images/sequence/60.jpg and b/client/public/images/sequence/60.jpg differ
diff --git a/client/public/images/sequence/61.jpg b/client/public/images/sequence/61.jpg
index b28aec3..a565043 100644
Binary files a/client/public/images/sequence/61.jpg and b/client/public/images/sequence/61.jpg differ
diff --git a/client/public/images/sequence/62.jpg b/client/public/images/sequence/62.jpg
index cc47dc7..6601a3e 100644
Binary files a/client/public/images/sequence/62.jpg and b/client/public/images/sequence/62.jpg differ
diff --git a/client/public/images/sequence/63.jpg b/client/public/images/sequence/63.jpg
index 8346cf0..cc7976d 100644
Binary files a/client/public/images/sequence/63.jpg and b/client/public/images/sequence/63.jpg differ
diff --git a/client/public/images/sequence/64.jpg b/client/public/images/sequence/64.jpg
index 0273e0d..181c9ed 100644
Binary files a/client/public/images/sequence/64.jpg and b/client/public/images/sequence/64.jpg differ
diff --git a/client/public/images/sequence/65.jpg b/client/public/images/sequence/65.jpg
index ce3d4f9..8df7a59 100644
Binary files a/client/public/images/sequence/65.jpg and b/client/public/images/sequence/65.jpg differ
diff --git a/client/public/images/sequence/66.jpg b/client/public/images/sequence/66.jpg
index de9f796..d1794e5 100644
Binary files a/client/public/images/sequence/66.jpg and b/client/public/images/sequence/66.jpg differ
diff --git a/client/public/images/sequence/67.jpg b/client/public/images/sequence/67.jpg
index cc9447c..913c633 100644
Binary files a/client/public/images/sequence/67.jpg and b/client/public/images/sequence/67.jpg differ
diff --git a/client/public/images/sequence/68.jpg b/client/public/images/sequence/68.jpg
index 21423b4..5cd2e94 100644
Binary files a/client/public/images/sequence/68.jpg and b/client/public/images/sequence/68.jpg differ
diff --git a/client/public/images/sequence/69.jpg b/client/public/images/sequence/69.jpg
index c80081a..1d57c90 100644
Binary files a/client/public/images/sequence/69.jpg and b/client/public/images/sequence/69.jpg differ
diff --git a/client/public/images/sequence/7.jpg b/client/public/images/sequence/7.jpg
index 4a5bfce..d5c1e98 100644
Binary files a/client/public/images/sequence/7.jpg and b/client/public/images/sequence/7.jpg differ
diff --git a/client/public/images/sequence/70.jpg b/client/public/images/sequence/70.jpg
index 4bf3328..891589a 100644
Binary files a/client/public/images/sequence/70.jpg and b/client/public/images/sequence/70.jpg differ
diff --git a/client/public/images/sequence/71.jpg b/client/public/images/sequence/71.jpg
index 61dbfed..0359535 100644
Binary files a/client/public/images/sequence/71.jpg and b/client/public/images/sequence/71.jpg differ
diff --git a/client/public/images/sequence/72.jpg b/client/public/images/sequence/72.jpg
index c9ee5be..f9559a2 100644
Binary files a/client/public/images/sequence/72.jpg and b/client/public/images/sequence/72.jpg differ
diff --git a/client/public/images/sequence/73.jpg b/client/public/images/sequence/73.jpg
index f260f80..010fcc2 100644
Binary files a/client/public/images/sequence/73.jpg and b/client/public/images/sequence/73.jpg differ
diff --git a/client/public/images/sequence/74.jpg b/client/public/images/sequence/74.jpg
index 776d70e..7f17999 100644
Binary files a/client/public/images/sequence/74.jpg and b/client/public/images/sequence/74.jpg differ
diff --git a/client/public/images/sequence/75.jpg b/client/public/images/sequence/75.jpg
index 8468e81..b99d5aa 100644
Binary files a/client/public/images/sequence/75.jpg and b/client/public/images/sequence/75.jpg differ
diff --git a/client/public/images/sequence/76.jpg b/client/public/images/sequence/76.jpg
index ed77a27..d341172 100644
Binary files a/client/public/images/sequence/76.jpg and b/client/public/images/sequence/76.jpg differ
diff --git a/client/public/images/sequence/77.jpg b/client/public/images/sequence/77.jpg
index 748d37b..96898ac 100644
Binary files a/client/public/images/sequence/77.jpg and b/client/public/images/sequence/77.jpg differ
diff --git a/client/public/images/sequence/78.jpg b/client/public/images/sequence/78.jpg
index 47debbb..b22f8cb 100644
Binary files a/client/public/images/sequence/78.jpg and b/client/public/images/sequence/78.jpg differ
diff --git a/client/public/images/sequence/79.jpg b/client/public/images/sequence/79.jpg
index 8111bc1..5f17431 100644
Binary files a/client/public/images/sequence/79.jpg and b/client/public/images/sequence/79.jpg differ
diff --git a/client/public/images/sequence/8.jpg b/client/public/images/sequence/8.jpg
index 28d5558..8bed505 100644
Binary files a/client/public/images/sequence/8.jpg and b/client/public/images/sequence/8.jpg differ
diff --git a/client/public/images/sequence/80.jpg b/client/public/images/sequence/80.jpg
index fbed29b..9d1c01c 100644
Binary files a/client/public/images/sequence/80.jpg and b/client/public/images/sequence/80.jpg differ
diff --git a/client/public/images/sequence/81.jpg b/client/public/images/sequence/81.jpg
index 1627561..a5c4641 100644
Binary files a/client/public/images/sequence/81.jpg and b/client/public/images/sequence/81.jpg differ
diff --git a/client/public/images/sequence/82.jpg b/client/public/images/sequence/82.jpg
index 4c70f14..ed5c152 100644
Binary files a/client/public/images/sequence/82.jpg and b/client/public/images/sequence/82.jpg differ
diff --git a/client/public/images/sequence/83.jpg b/client/public/images/sequence/83.jpg
index 18314fd..e0f4f49 100644
Binary files a/client/public/images/sequence/83.jpg and b/client/public/images/sequence/83.jpg differ
diff --git a/client/public/images/sequence/84.jpg b/client/public/images/sequence/84.jpg
index 17b8574..7c45639 100644
Binary files a/client/public/images/sequence/84.jpg and b/client/public/images/sequence/84.jpg differ
diff --git a/client/public/images/sequence/85.jpg b/client/public/images/sequence/85.jpg
index 2c67630..7e79197 100644
Binary files a/client/public/images/sequence/85.jpg and b/client/public/images/sequence/85.jpg differ
diff --git a/client/public/images/sequence/86.jpg b/client/public/images/sequence/86.jpg
index 805bdd3..9212257 100644
Binary files a/client/public/images/sequence/86.jpg and b/client/public/images/sequence/86.jpg differ
diff --git a/client/public/images/sequence/87.jpg b/client/public/images/sequence/87.jpg
index 0d04118..4b0b51b 100644
Binary files a/client/public/images/sequence/87.jpg and b/client/public/images/sequence/87.jpg differ
diff --git a/client/public/images/sequence/88.jpg b/client/public/images/sequence/88.jpg
index 86ee566..da28f4e 100644
Binary files a/client/public/images/sequence/88.jpg and b/client/public/images/sequence/88.jpg differ
diff --git a/client/public/images/sequence/89.jpg b/client/public/images/sequence/89.jpg
index ecf86aa..5eb7165 100644
Binary files a/client/public/images/sequence/89.jpg and b/client/public/images/sequence/89.jpg differ
diff --git a/client/public/images/sequence/9.jpg b/client/public/images/sequence/9.jpg
index 109a53c..cbc48ea 100644
Binary files a/client/public/images/sequence/9.jpg and b/client/public/images/sequence/9.jpg differ
diff --git a/client/public/images/sequence/90.jpg b/client/public/images/sequence/90.jpg
index 0eac9ba..e75deb8 100644
Binary files a/client/public/images/sequence/90.jpg and b/client/public/images/sequence/90.jpg differ
diff --git a/client/public/images/sequence/91.jpg b/client/public/images/sequence/91.jpg
index ed9675e..a682c28 100644
Binary files a/client/public/images/sequence/91.jpg and b/client/public/images/sequence/91.jpg differ
diff --git a/client/public/images/sequence/92.jpg b/client/public/images/sequence/92.jpg
index 3ecd33f..d0ef008 100644
Binary files a/client/public/images/sequence/92.jpg and b/client/public/images/sequence/92.jpg differ
diff --git a/client/public/images/sequence/93.jpg b/client/public/images/sequence/93.jpg
index 5ade799..e713cd1 100644
Binary files a/client/public/images/sequence/93.jpg and b/client/public/images/sequence/93.jpg differ
diff --git a/client/public/images/sequence/94.jpg b/client/public/images/sequence/94.jpg
index 1d02030..374d2c9 100644
Binary files a/client/public/images/sequence/94.jpg and b/client/public/images/sequence/94.jpg differ
diff --git a/client/public/images/sequence/95.jpg b/client/public/images/sequence/95.jpg
index c49c5c5..fc72f0e 100644
Binary files a/client/public/images/sequence/95.jpg and b/client/public/images/sequence/95.jpg differ
diff --git a/client/public/images/sequence/96.jpg b/client/public/images/sequence/96.jpg
index cb5e7e2..3da36f4 100644
Binary files a/client/public/images/sequence/96.jpg and b/client/public/images/sequence/96.jpg differ
diff --git a/client/public/images/sequence/97.jpg b/client/public/images/sequence/97.jpg
index c853d1b..fdadea0 100644
Binary files a/client/public/images/sequence/97.jpg and b/client/public/images/sequence/97.jpg differ
diff --git a/client/public/images/sequence/98.jpg b/client/public/images/sequence/98.jpg
index c396f68..3d2a240 100644
Binary files a/client/public/images/sequence/98.jpg and b/client/public/images/sequence/98.jpg differ
diff --git a/client/public/images/sequence/99.jpg b/client/public/images/sequence/99.jpg
index 607bf66..34f4cb8 100644
Binary files a/client/public/images/sequence/99.jpg and b/client/public/images/sequence/99.jpg differ
diff --git a/client/public/images/sequenceSliderMobile/1.jpg b/client/public/images/sequenceSliderMobile/1.jpg
new file mode 100644
index 0000000..488adee
Binary files /dev/null and b/client/public/images/sequenceSliderMobile/1.jpg differ
diff --git a/client/public/images/sequenceSliderMobile/2.jpg b/client/public/images/sequenceSliderMobile/2.jpg
new file mode 100644
index 0000000..89d31ec
Binary files /dev/null and b/client/public/images/sequenceSliderMobile/2.jpg differ
diff --git a/client/public/images/sequenceSliderMobile/3.jpg b/client/public/images/sequenceSliderMobile/3.jpg
new file mode 100644
index 0000000..f84c4a2
Binary files /dev/null and b/client/public/images/sequenceSliderMobile/3.jpg differ
diff --git a/client/public/images/sequenceSliderMobile/4.jpg b/client/public/images/sequenceSliderMobile/4.jpg
new file mode 100644
index 0000000..726d0d9
Binary files /dev/null and b/client/public/images/sequenceSliderMobile/4.jpg differ
diff --git a/client/public/images/sequenceWing.jpg b/client/public/images/sequenceWing.jpg
index 936740c..9d60fa2 100644
Binary files a/client/public/images/sequenceWing.jpg and b/client/public/images/sequenceWing.jpg differ
diff --git a/client/public/images/sequenceWingOld2.jpg b/client/public/images/sequenceWingOld2.jpg
new file mode 100644
index 0000000..936740c
Binary files /dev/null and b/client/public/images/sequenceWingOld2.jpg differ
diff --git a/client/public/images/skyGardenSlider/1.jpg b/client/public/images/skyGardenSlider/1.jpg
index b364187..8601831 100644
Binary files a/client/public/images/skyGardenSlider/1.jpg and b/client/public/images/skyGardenSlider/1.jpg differ
diff --git a/client/public/images/skyGardenSlider/2.jpg b/client/public/images/skyGardenSlider/2.jpg
index 3a48479..1870bfb 100644
Binary files a/client/public/images/skyGardenSlider/2.jpg and b/client/public/images/skyGardenSlider/2.jpg differ
diff --git a/client/public/images/skyGardenSlider/3.jpg b/client/public/images/skyGardenSlider/3.jpg
index d4e11a8..1dae43f 100644
Binary files a/client/public/images/skyGardenSlider/3.jpg and b/client/public/images/skyGardenSlider/3.jpg differ
diff --git a/client/public/images/skyGardenSlider/4.jpg b/client/public/images/skyGardenSlider/4.jpg
index 255e023..463359e 100644
Binary files a/client/public/images/skyGardenSlider/4.jpg and b/client/public/images/skyGardenSlider/4.jpg differ
diff --git a/client/public/videos/GroundLevel.mp4 b/client/public/videos/GroundLevel.mp4
new file mode 100644
index 0000000..123fe43
Binary files /dev/null and b/client/public/videos/GroundLevel.mp4 differ
diff --git a/client/public/videos/PodiumLevel.mp4 b/client/public/videos/PodiumLevel.mp4
new file mode 100644
index 0000000..f4425c6
Binary files /dev/null and b/client/public/videos/PodiumLevel.mp4 differ
diff --git a/client/public/videos/Rooftop.mp4 b/client/public/videos/Rooftop.mp4
new file mode 100644
index 0000000..bfa8a52
Binary files /dev/null and b/client/public/videos/Rooftop.mp4 differ
diff --git a/client/src/components/AboutProject/Slider.tsx b/client/src/components/AboutProject/Slider.tsx
index f602696..4ea48ba 100644
--- a/client/src/components/AboutProject/Slider.tsx
+++ b/client/src/components/AboutProject/Slider.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from "react";
-import Button2 from "../Button2";
 import ArrowLeftIcon from "../icons/ArrowLeftIcon";
 import ArrowRightIcon from "../icons/ArrowRightIcon";
+import Button3 from "../Button3";
 
 const slides = [
   {
@@ -84,7 +84,7 @@ function Slider() {
           </div>
           <div className="flex justify-between">
             <div className="flex gap-3">
-              <Button2
+              <Button3
                 variant="secondary"
                 size="small"
                 icon={
@@ -97,7 +97,7 @@ function Slider() {
                 onlyIcon
                 onClick={prev}
               />
-              <Button2
+              <Button3
                 variant="secondary"
                 size="small"
                 icon={
diff --git a/client/src/components/ApartmentSidebar.tsx b/client/src/components/ApartmentSidebar.tsx
index 537f626..8684a2b 100644
--- a/client/src/components/ApartmentSidebar.tsx
+++ b/client/src/components/ApartmentSidebar.tsx
@@ -1,7 +1,6 @@
 import { useNavigate } from "react-router-dom";
-import Button from "./Button";
-// import { formatNumber } from "../calc/formatNumber";
 import { IAparmentRes } from "../types/apartmentsRes";
+import Button3 from "./Button3";
 
 interface ApartmentSidebarProps {
   currentApartment: IAparmentRes;
@@ -18,19 +17,19 @@ const ApartmentSidebar = ({ currentApartment }: ApartmentSidebarProps) => {
   };
 
   return (
-    <div className="flex lg:flex-col gap-2 h-full">
-      <div className="rounded-2xl overflow-clip lg:flex-1 flex-none relative">
+    <div className="flex h-full gap-2 lg:flex-col">
+      <div className="relative flex-none rounded-2xl overflow-clip lg:flex-1">
         <p className="absolute top-[30px] left-6 font-semibold text-m text-white">
           View from window
         </p>
         <img
           src="/images/view_from_window.png"
           alt=""
-          className="w-full h-full object-cover"
+          className="object-cover w-full h-full"
         />
       </div>
-      <div className="flex gap-2 flex-col flex-1 lg:flex-none">
-        <div className="flex flex-col rounded-2xl bg-white p-6 gap-6 ">
+      <div className="flex flex-col flex-1 gap-2 lg:flex-none">
+        <div className="flex flex-col gap-6 p-6 bg-white rounded-2xl ">
           <h2 className="font-semibold text-[#0D1922] text-subheadline-s">
             Parameters
           </h2>
@@ -63,19 +62,18 @@ const ApartmentSidebar = ({ currentApartment }: ApartmentSidebarProps) => {
             {/* AED {formatNumber(1668888, ",", 3, 1)} */}
           </p>
         </div>
-        <div className="rounded-2xl bg-white flex flex-col p-6 gap-4 flex-1 lg:flex-none justify-between">
+        <div className="flex flex-col justify-between flex-1 gap-4 p-6 bg-white rounded-2xl lg:flex-none">
           <div className="flex gap-2">
-            <Button
+            <Button3
+              variant="secondary"
+              className="flex justify-center w-full"
               onClick={handleOn3DTourClick}
-              text="3D Tour"
-              buttonType="secondary"
-              className="w-full flex justify-center"
-            />
-            <Button
-              text="Send Enquiry"
-              buttonType="cta"
-              className="w-full flex justify-center"
-            />
+            >
+              3D Tour
+            </Button3>
+            <Button3 className="flex justify-center w-full">
+              Send Enquiry
+            </Button3>
           </div>
         </div>
       </div>
diff --git a/client/src/components/ButtomPanel.tsx b/client/src/components/ButtomPanel.tsx
index 1ff0e1f..b5271d8 100644
--- a/client/src/components/ButtomPanel.tsx
+++ b/client/src/components/ButtomPanel.tsx
@@ -1,7 +1,7 @@
-import Button from "./Button";
 import DisclaimerIcon from "./icons/DisclaimerIcon";
 import useModal from "../store/useModal";
 import DisclaimerModal from "./modals/DisclaimerModal";
+import Button3 from "./Button3";
 
 const ButtomPanel = () => {
   const { setModal } = useModal();
@@ -9,23 +9,28 @@ const ButtomPanel = () => {
     setModal(<DisclaimerModal />);
   };
   return (
-    <div className="absolute bottom-0 left-0 z-20 flex items-end justify-between w-full gap-2 pointer-events-none select-none touch-none">
+    <div className="absolute bottom-0 left-0 z-10 flex items-end justify-between w-full gap-2 select-none touch-none">
       <div className="flex flex-col gap-2">
         <div className="flex gap-2 pb-6 pl-6">
-          <Button
-            text="Disclaimer"
-            buttonType="special"
-            className="pl-2"
+          <Button3
+            variant="special"
+            size="xsmall"
             icon={<DisclaimerIcon />}
+            roundedFull
             onClick={handleOnDisclaimerClick}
-            isCircleRounded
-          />
+          >
+            Disclaimer
+          </Button3>
           {/* <Button text="Privacy Policy" buttonType="special" isCircleRounded /> */}
         </div>
       </div>
       <div className="p-6 max-sm:hidden">
         <div className="bg-[#0D192266] rounded-full backdrop-blur-sm">
-          <img src="../images/masterplan/compass.png" alt="compass" />
+          <img
+            src="../images/masterplan/compass.png"
+            alt=""
+            className="pointer-events-none"
+          />
         </div>
       </div>
     </div>
diff --git a/client/src/components/ButtomPanelCompass.tsx b/client/src/components/ButtomPanelCompass.tsx
index ae7a38f..3d8dd79 100644
--- a/client/src/components/ButtomPanelCompass.tsx
+++ b/client/src/components/ButtomPanelCompass.tsx
@@ -1,8 +1,8 @@
 import useModal from "../store/useModal";
 import useCompass from "../store/useCompass";
-import Button from "./Button";
 import DisclaimerIcon from "./icons/DisclaimerIcon";
 import DisclaimerModal from "./modals/DisclaimerModal";
+import Button3 from "./Button3";
 
 const ButtomPanelCompass = () => {
   const { setModal } = useModal();
@@ -13,16 +13,18 @@ const ButtomPanelCompass = () => {
   };
 
   return (
-    <div className="absolute bottom-0 left-0 z-20 flex items-end justify-between w-full gap-2 pointer-events-none select-none touch-none">
+    <div className="absolute bottom-0 left-0 z-10 flex items-end justify-between w-full gap-2 select-none touch-none">
       <div className="flex flex-col gap-2">
         <div className="flex gap-2 pb-6 pl-6">
-          <Button
-            text="Disclaimer"
-            buttonType="special"
-            className="pl-2"
+          <Button3
+            variant="special"
+            size="xsmall"
             icon={<DisclaimerIcon />}
+            roundedFull
             onClick={handleOnDisclaimerClick}
-          />
+          >
+            Disclaimer
+          </Button3>
           {/* <Button text="Privacy Policy" buttonType="special" /> */}
         </div>
       </div>
@@ -31,8 +33,8 @@ const ButtomPanelCompass = () => {
           <img
             style={{ transform: `rotate(${currentCompassRotate - 180}deg)` }}
             src="/images/masterplan/compass.png"
-            alt="compass"
-            className="transition-transform duration-[750ms] ease-in-out"
+            alt=""
+            className="transition-transform duration-[750ms] ease-in-out pointer-events-none"
           />
         </div>
       </div>
diff --git a/client/src/components/Button.tsx b/client/src/components/Button.tsx
deleted file mode 100644
index 0820abf..0000000
--- a/client/src/components/Button.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import {
-  backgroundColors,
-  textColors,
-  borders,
-  paddings,
-} from "../consts/buttonStyles";
-import { ButtonType } from "../types/button";
-
-interface ButtonProps {
-  buttonType?: ButtonType;
-  icon?: React.ReactNode;
-  text?: string;
-  className?: string;
-  onClick?: (
-    event: React.MouseEvent<HTMLButtonElement, MouseEvent>
-  ) => void | (() => void);
-  disabled?: boolean;
-  isCircleRounded?: boolean;
-  type?: "button" | "submit" | "reset";
-  iconPos?: "right" | "left";
-}
-
-const Button = ({
-  className,
-  icon,
-  text,
-  buttonType = "primary",
-  disabled = false,
-  onClick,
-  type = "button",
-  iconPos = "left",
-  isCircleRounded = false,
-}: ButtonProps) => {
-  const backgroundColor = backgroundColors[buttonType];
-  const textColor = textColors[buttonType];
-  const border = borders[buttonType];
-  const padding = paddings[buttonType];
-  const rounded = isCircleRounded ? "rounded-full" : "rounded-lg";
-  const disabledStyle = disabled ? "bg-[#0D192214] text-gray-400" : "";
-
-  return (
-    <button
-      type={type}
-      disabled={disabled}
-      onClick={onClick}
-      className={`min-w-10 max-h-10 ${rounded}  ${
-        icon && !text ? "p-[10px]" : padding
-      }  transition-all duration-300 ease-in-out text-s pointer-events-auto flex gap-1 items-center  align-middle h-fit ${backgroundColor} ${textColor} ${border} ${disabledStyle} ${
-        className ? className : ""
-      }`}
-    >
-      {/* {icon && <div>{icon}</div>} */}
-      {icon && iconPos === "left" && <div>{icon}</div>}
-      {text && <div>{text}</div>}
-      {icon && iconPos === "right" && <div>{icon}</div>}
-    </button>
-  );
-};
-
-export default Button;
diff --git a/client/src/components/Button2.tsx b/client/src/components/Button2.tsx
deleted file mode 100644
index ca261a2..0000000
--- a/client/src/components/Button2.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-interface Props {
-  variant?: "primary" | "secondary";
-  size?: "large" | "medium" | "small";
-  roundedFull?: boolean;
-  icon?: JSX.Element;
-  onlyIcon?: boolean;
-  children?: React.ReactNode;
-  className?: string;
-  onClick?: () => void;
-}
-
-const variantClasses = {
-  primary: "bg-[#00BED7] text-white hover:bg-[#0AB3C9]",
-  secondary: "bg-white hover:text-[#0D1922]",
-};
-
-const sizeClasses = {
-  large: "px-4 py-3 gap-2 text-base",
-  medium: "px-3.5 py-2.5 gap-1 text-sm",
-  small: "px-3 py-2.5 gap-1 text-xs",
-};
-
-function Button2({
-  variant = "primary",
-  size = "medium",
-  roundedFull = false,
-  icon,
-  onlyIcon = false,
-  children,
-  className,
-  onClick,
-}: Props) {
-  return (
-    <button
-      className={`flex items-center justify-center transition-colors w-fit ${
-        variantClasses[variant]
-      } ${sizeClasses[size]} ${
-        roundedFull ? "rounded-full" : "rounded-lg"
-      } ${className}`}
-      onClick={onClick}
-    >
-      {onlyIcon ? (
-        icon
-      ) : (
-        <>
-          {icon}
-          {children}
-        </>
-      )}
-    </button>
-  );
-}
-
-export default Button2;
diff --git a/client/src/components/Button3.tsx b/client/src/components/Button3.tsx
index 208e933..cf888ed 100644
--- a/client/src/components/Button3.tsx
+++ b/client/src/components/Button3.tsx
@@ -1,6 +1,7 @@
 interface Props {
-  variant?: "primary" | "secondary";
-  size?: "large" | "medium" | "small";
+  type?: "button" | "submit" | "reset";
+  variant?: "primary" | "secondary" | "special";
+  size?: "large" | "medium" | "small" | "xsmall";
   roundedFull?: boolean;
   icon?: JSX.Element;
   onlyIcon?: boolean;
@@ -12,22 +13,28 @@ interface Props {
 
 const variantClasses = {
   primary: "bg-[#00BED7] text-white enabled:hover:bg-[#0AB3C9]",
-  secondary: "bg-white enabled:hover:text-[#0D1922] ring-1 ring-[#E2E2DC] ring-inset",
+  secondary:
+    "bg-white enabled:hover:text-[#0D1922] ring-1 ring-[#E2E2DC] ring-inset",
+  special:
+    "bg-[#0D1922]/60 font-semibold text-white enabled:hover:bg-[#0D1922]/40",
 };
 
 const sizeClasses = {
   large: "px-4 py-3 gap-2 text-base",
   medium: "px-3.5 py-2.5 gap-1 text-sm",
   small: "px-3 py-2.5 gap-1 text-xs",
+  xsmall: "pl-2 pr-3 py-1 gap-1 text-xs",
 };
 
 const onlyIconSizeClasses = {
   large: "p-3",
   medium: "p-2.5",
   small: "p-2.5",
+  xsmall: "p-2",
 };
 
 function Button3({
+  type = "button",
   variant = "primary",
   size = "medium",
   roundedFull = false,
@@ -40,12 +47,13 @@ function Button3({
 }: Props) {
   return (
     <button
+      type={type}
       disabled={disabled}
-      className={`flex items-center justify-center transition-colors w-fit outline-none ${
+      className={`flex items-center justify-center transition-all w-fit outline-none disabled:opacity-50 ${
         variantClasses[variant]
       } ${onlyIcon ? onlyIconSizeClasses[size] : sizeClasses[size]} ${
         roundedFull ? "rounded-full" : "rounded-lg"
-      } ${className} disabled:bg-[#0D1922]/10`}
+      } ${className}`}
       onClick={onClick}
     >
       {icon}
diff --git a/client/src/components/EastWingFloorLabels.tsx b/client/src/components/EastWingFloorLabels.tsx
index 70e0ef5..f8dcf28 100644
--- a/client/src/components/EastWingFloorLabels.tsx
+++ b/client/src/components/EastWingFloorLabels.tsx
@@ -17,7 +17,7 @@ function EastWingFloorLabels() {
           }}
         />
       </g>
-      <g data-name="Podium label">
+      <g data-name="Podium Level label">
         <path
           d="M166,1945h61c8.84,0,16,7.16,16,16h0c0,8.84-7.16,16-16,16h-61c-8.84,0-16-7.16-16-16h0c0-8.84,7.16-16,16-16Z"
           style={{
diff --git a/client/src/components/FloorLabels.tsx b/client/src/components/FloorLabels.tsx
index 969860a..da5bf52 100644
--- a/client/src/components/FloorLabels.tsx
+++ b/client/src/components/FloorLabels.tsx
@@ -17,7 +17,7 @@ function FloorLabels() {
           }}
         />
       </g>
-      <g data-name="Podium label">
+      <g data-name="Podium Level label">
         <path
           d="M1370.33,2626h61.99c7.91,0,14.33,6.42,14.33,14.33h0c0,7.92-6.42,14.33-14.33,14.33h-61.99c-7.91,0-14.33-6.42-14.33-14.33h0c0-7.92,6.42-14.33,14.33-14.33Z"
           style={{
@@ -465,6 +465,38 @@ function FloorLabels() {
           }}
         />
       </g>
+      <g data-name="West Wing label">
+        <path
+          d="M2156.5,1301h106c9.67,0,17.5,7.83,17.5,17.5h0c0,9.67-7.83,17.5-17.5,17.5h-106c-9.67,0-17.5-7.83-17.5-17.5h0c0-9.67,7.83-17.5,17.5-17.5Z"
+          style={{
+            fill: "rgba(13, 25, 34, .4)",
+            strokeWidth: 0,
+          }}
+        />
+        <path
+          d="M2173.72,1310.64h2.88l-4.4,15.36h-3.14l-3.14-11.36h-.04l-3.14,11.36h-3.18l-4.42-15.36h2.98l3.16,11.86h.04l3.08-11.86h3.1l3.08,11.8h.04l3.1-11.8ZM2179.34,1319.68h4.86c-.12-1.52-.78-2.58-2.36-2.58s-2.34,1.04-2.5,2.58ZM2184.78,1322.86l1.72,1.52c-.96,1.14-2.34,1.84-4.36,1.84-3.64,0-5.56-2.24-5.56-5.58s1.9-5.6,5.28-5.6,5.02,2.3,5.02,5.26c0,.4-.02.9-.08,1.2h-7.46c.2,1.64,1.08,2.66,2.86,2.66,1.04,0,1.92-.42,2.58-1.3ZM2192.78,1326.22c-2.08,0-3.66-.56-4.86-1.44l1.28-1.84c1.04.82,2.36,1.26,3.62,1.26,1.34,0,2.1-.4,2.1-1.16,0-.86-.98-1.06-2.74-1.38-2.12-.4-3.82-1.18-3.82-3.26,0-1.84,1.46-3.36,4.5-3.36,1.94,0,3.34.52,4.5,1.34l-1.2,1.8c-1.04-.74-2.22-1.12-3.34-1.12-1.2,0-1.76.48-1.76,1.06,0,.8.78.98,2.6,1.32,1.98.38,3.94,1.02,3.94,3.24,0,2.1-1.74,3.54-4.82,3.54ZM2198.22,1317.22v-1.96h2.02v-3.4h2.68v3.4h2.44v1.96h-2.44v5.28c0,1.08.32,1.62,1.64,1.62.3,0,.58-.02.8-.06v1.96c-.46.12-1.1.2-1.78.2-2.3,0-3.34-1.14-3.34-3.14v-5.86h-2.02ZM2229.6,1310.64h2.88l-4.4,15.36h-3.14l-3.14-11.36h-.04l-3.14,11.36h-3.18l-4.42-15.36h2.98l3.16,11.86h.04l3.08-11.86h3.1l3.08,11.8h.04l3.1-11.8ZM2233.96,1313.1v-2.46h2.82v2.46h-2.82ZM2236.72,1326h-2.7v-10.74h2.7v10.74ZM2239.53,1326v-10.74h2.54l.06,1.52h.04c.66-1.08,1.82-1.74,3.28-1.74,2.26,0,3.72,1.48,3.72,3.7v7.26h-2.7v-6.86c0-1.1-.66-1.98-1.92-1.98-1.44,0-2.32,1.02-2.32,2.38v6.46h-2.7ZM2261.69,1315.26v9.42c0,3.52-2.34,5.2-5.84,5.2-1.76,0-3.1-.44-4.06-.98l.88-1.96c.8.48,1.78.92,3.12.92,1.82,0,3.22-.84,3.22-3.1v-.74h-.04c-.76,1.08-1.92,1.7-3.36,1.7-2.72,0-4.46-2.26-4.46-5.24s1.76-5.44,4.62-5.44c1.48,0,2.6.68,3.38,1.76h.04l.08-1.54h2.42ZM2256.49,1323.68c1.68,0,2.6-1.44,2.6-3.3s-.94-3.26-2.6-3.26-2.6,1.48-2.6,3.3.82,3.26,2.6,3.26Z"
+          style={{
+            fill: "#fff",
+            strokeWidth: 0,
+          }}
+        />
+      </g>
+      <g data-name="East Wing label">
+        <path
+          d="M1673.5,1301h97c9.67,0,17.5,7.83,17.5,17.5h0c0,9.67-7.83,17.5-17.5,17.5h-97c-9.67,0-17.5-7.83-17.5-17.5h0c0-9.67,7.83-17.5,17.5-17.5Z"
+          style={{
+            fill: "rgba(13, 25, 34, .4)",
+            strokeWidth: 0,
+          }}
+        />
+        <path
+          d="M1683.9,1326h-10.44v-15.36h10.3v2.3h-7.48v4.18h6.52v2.28h-6.52v4.3h7.62v2.3ZM1694.64,1326h-2.54l-.06-1.52h-.04c-.62,1.08-1.68,1.74-3.14,1.74-2.06,0-3.42-1.36-3.42-3.26,0-1.32.64-2.32,2.04-2.8,1.1-.38,2.78-.48,4.48-.54v-.8c0-.98-.68-1.7-1.94-1.7-1.16,0-1.84.58-2.16,1.42l-2.08-1.02c.72-1.64,2.18-2.48,4.36-2.48,2.9,0,4.5,1.42,4.5,3.78v7.18ZM1689.72,1324.2c1.36,0,2.24-1.02,2.24-2.28v-.58c-.64.04-1.54.1-2.26.2-.86.12-1.58.42-1.58,1.3,0,.78.58,1.36,1.6,1.36ZM1701.2,1326.22c-2.08,0-3.66-.56-4.86-1.44l1.28-1.84c1.04.82,2.36,1.26,3.62,1.26,1.34,0,2.1-.4,2.1-1.16,0-.86-.98-1.06-2.74-1.38-2.12-.4-3.82-1.18-3.82-3.26,0-1.84,1.46-3.36,4.5-3.36,1.94,0,3.34.52,4.5,1.34l-1.2,1.8c-1.04-.74-2.22-1.12-3.34-1.12-1.2,0-1.76.48-1.76,1.06,0,.8.78.98,2.6,1.32,1.98.38,3.94,1.02,3.94,3.24,0,2.1-1.74,3.54-4.82,3.54ZM1706.65,1317.22v-1.96h2.02v-3.4h2.68v3.4h2.44v1.96h-2.44v5.28c0,1.08.32,1.62,1.64,1.62.3,0,.58-.02.8-.06v1.96c-.46.12-1.1.2-1.78.2-2.3,0-3.34-1.14-3.34-3.14v-5.86h-2.02ZM1738.02,1310.64h2.88l-4.4,15.36h-3.14l-3.14-11.36h-.04l-3.14,11.36h-3.18l-4.42-15.36h2.98l3.16,11.86h.04l3.08-11.86h3.1l3.08,11.8h.04l3.1-11.8ZM1742.38,1313.1v-2.46h2.82v2.46h-2.82ZM1745.14,1326h-2.7v-10.74h2.7v10.74ZM1747.95,1326v-10.74h2.54l.06,1.52h.04c.66-1.08,1.82-1.74,3.28-1.74,2.26,0,3.72,1.48,3.72,3.7v7.26h-2.7v-6.86c0-1.1-.66-1.98-1.92-1.98-1.44,0-2.32,1.02-2.32,2.38v6.46h-2.7ZM1770.11,1315.26v9.42c0,3.52-2.34,5.2-5.84,5.2-1.76,0-3.1-.44-4.06-.98l.88-1.96c.8.48,1.78.92,3.12.92,1.82,0,3.22-.84,3.22-3.1v-.74h-.04c-.76,1.08-1.92,1.7-3.36,1.7-2.72,0-4.46-2.26-4.46-5.24s1.76-5.44,4.62-5.44c1.48,0,2.6.68,3.38,1.76h.04l.08-1.54h2.42ZM1764.91,1323.68c1.68,0,2.6-1.44,2.6-3.3s-.94-3.26-2.6-3.26-2.6,1.48-2.6,3.3.82,3.26,2.6,3.26Z"
+          style={{
+            fill: "#fff",
+            strokeWidth: 0,
+          }}
+        />
+      </g>
     </g>
   );
 }
diff --git a/client/src/components/FloorPlan.tsx b/client/src/components/FloorPlan.tsx
index 3790ecf..8c09185 100644
--- a/client/src/components/FloorPlan.tsx
+++ b/client/src/components/FloorPlan.tsx
@@ -55,7 +55,7 @@ function FloorPlan({ wing, floor }: Props) {
   async function getUnit(unitNumber: string) {
     try {
       const result: IUnit[] = await api
-        .get(`units?unitNo=${wing[0]}-${floor}${unitNumber.padStart(2, "0")}`)
+        .get(`units?unitNo=${wing[0].toUpperCase()}-${floor}${unitNumber.padStart(2, "0")}`)
         .json();
 
       setHoveredUnit(result[0]);
@@ -65,6 +65,8 @@ function FloorPlan({ wing, floor }: Props) {
   }
 
   useEffect(() => {
+    console.log("hoveredUnit", hoveredUnit);
+
     if (!isMobile || !hoveredUnit || !type) return;
 
     setModal(<UnitModal unit={hoveredUnit} type={type} />);
@@ -120,14 +122,7 @@ function FloorPlan({ wing, floor }: Props) {
           )}
         </svg>
 
-        {!isMobile && (
-          <UnitPopup
-            unit={hoveredUnit}
-            type={type}
-            show={showPopup}
-            mousePos={mousePos}
-          />
-        )}
+        {!isMobile && <UnitPopup unit={hoveredUnit} type={type} show={showPopup} mousePos={mousePos} />}
       </div>
     </div>
   );
diff --git a/client/src/components/FloorPlanGroundLevel.tsx b/client/src/components/FloorPlanGroundLevel.tsx
new file mode 100644
index 0000000..13c07e8
--- /dev/null
+++ b/client/src/components/FloorPlanGroundLevel.tsx
@@ -0,0 +1,71 @@
+import Button3 from "./Button3";
+import ActivityCard from "./complexWingPage/SkygardenSidebar/ActivityCard";
+import PlayIcon from "./icons/PlayIcon";
+import VirtualTourVideoModal from "./modals/VirtualTourVideoModal";
+import useModal from "../store/useModal";
+import SidebarSlider from "./complexWingPage/SidebarSlider";
+import PadelPongIcon from "./icons/amenities/PadelPongIcon";
+import LoungingSpaceIcon from "./icons/amenities/LoungingSpaceIcon";
+import OutdoorCoworkingSpaceIcon from "./icons/amenities/OutdoorCoworkingSpaceIcon";
+import LushLandscapeIcon from "./icons/amenities/LushLandscapeIcon";
+import PrivateMeetingRoomsIcon from "./icons/amenities/PrivateMeetingRoomsIcon";
+import ConvenienceStoreIcon from "./icons/amenities/ConvenienceStoreIcon";
+import SoundproofMeetingPodsIcon from "./icons/amenities/SoundproofMeetingPodsIcon";
+
+function FloorPlanGroundLevel() {
+  const { setModal } = useModal();
+
+  return (
+    <div className="space-y-6">
+      <div className="pb-6 border-b border-[#E2E2DC]">
+        <div className="relative flex flex-col p-6 bg-white rounded-2xl">
+          <Button3
+            variant="secondary"
+            icon={<PlayIcon />}
+            className="absolute self-end max-sm:hidden"
+            onClick={() => setModal(<VirtualTourVideoModal videoHref="/videos/GroundLevel.mp4" />)}
+          >
+            Play video
+          </Button3>
+          <Button3
+            variant="secondary"
+            icon={<PlayIcon />}
+            onlyIcon
+            size="small"
+            className="absolute self-end sm:hidden"
+            onClick={() => setModal(<VirtualTourVideoModal videoHref="/videos/GroundLevel.mp4" />)}
+          />
+          <div className="flex flex-col gap-10">
+            <div className="px-4">
+              <img src="/images/groundLevel/groundLevel.jpg" alt="" className="pointer-events-none" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="pb-6 space-y-6 border-b border-[#E2E2DC]">
+        <p className="sm:text-xl text-[#0D1922] font-semibold">Amenities</p>
+        <div className="grid grid-cols-3 gap-4 sm:grid-cols-4">
+          <ActivityCard title="Rove Café" icon={<PadelPongIcon />} />
+          <ActivityCard title="Lobby Lounge" icon={<LoungingSpaceIcon />} />
+          <ActivityCard title="Coworking Space" icon={<OutdoorCoworkingSpaceIcon />} />
+          <ActivityCard title="Outdoor Terrace" icon={<LushLandscapeIcon />} />
+          <ActivityCard title="Private Meeting Rooms" icon={<PrivateMeetingRoomsIcon />} />
+          <ActivityCard title="Convenience Store" icon={<ConvenienceStoreIcon />} />
+          <ActivityCard title="Soundproof Meeting Pods" icon={<SoundproofMeetingPodsIcon />} />
+        </div>
+      </div>
+      <SidebarSlider
+        images={[
+          "/images/groundLevelSlider/1.jpg",
+          "/images/groundLevelSlider/2.jpg",
+          "/images/groundLevelSlider/3.jpg",
+          "/images/groundLevelSlider/4.jpg",
+          "/images/groundLevelSlider/5.jpg",
+          "/images/groundLevelSlider/6.jpg",
+        ]}
+      />
+    </div>
+  );
+}
+
+export default FloorPlanGroundLevel;
diff --git a/client/src/components/FloorPlanPodiumLevel.tsx b/client/src/components/FloorPlanPodiumLevel.tsx
new file mode 100644
index 0000000..fee297d
--- /dev/null
+++ b/client/src/components/FloorPlanPodiumLevel.tsx
@@ -0,0 +1,142 @@
+import { useState } from "react";
+import Button3 from "./Button3";
+import ActivityCard from "./complexWingPage/SkygardenSidebar/ActivityCard";
+import PlayIcon from "./icons/PlayIcon";
+import VirtualTourVideoModal from "./modals/VirtualTourVideoModal";
+import SwitchToggle from "./SwitchToggle";
+import useModal from "../store/useModal";
+import SidebarSlider from "./complexWingPage/SidebarSlider";
+import IndoorLoungeIcon from "./icons/amenities/IndoorLoungeIcon";
+import MonkeyBarsIcon from "./icons/amenities/MonkeyBarsIcon";
+import KaraokeRoomIcon from "./icons/amenities/KaraokeRoomIcon";
+import ArcadeGamesIcon from "./icons/amenities/ArcadeGamesIcon";
+import ClimbingWallIcon from "./icons/amenities/ClimbingWallIcon";
+import PlaystationDeckIcon from "./icons/amenities/PlaystationDeckIcon";
+import FullyEquippedGymIcon from "./icons/amenities/FullyEquippedGymIcon";
+import ChangingRoomsIcon from "./icons/amenities/ChangingRoomsIcon";
+import HammockMovieLoungeIcon from "./icons/amenities/HammockMovieLoungeIcon";
+import GuestRoomsIcon from "./icons/amenities/GuestRoomsIcon";
+import MultiBallInteractiveGamingIcon from "./icons/amenities/MultiBallInteractiveGamingIcon";
+import MultiPurposeRoomWithKitchenIcon from "./icons/amenities/MultiPurposeRoomWithKitchenIcon";
+import GamingLoungeIcon from "./icons/amenities/GamingLoungeIcon";
+import UrbanBeachPoolIcon from "./icons/amenities/UrbanBeachPoolIcon";
+import JacuzziIcon from "./icons/amenities/JacuzziIcon";
+import YogaLoungeIcon from "./icons/amenities/YogaLoungeIcon";
+import SunLoungingDeckIcon from "./icons/amenities/SunLoungingDeckIcon";
+import IndoorLapPoolIcon from "./icons/amenities/IndoorLapPoolIcon";
+import AquaCyclingIcon from "./icons/amenities/AquaCyclingIcon";
+import CabanasWithDaybedsIcon from "./icons/amenities/CabanasWithDaybedsIcon";
+import OpenAirGymIcon from "./icons/amenities/OpenAirGymIcon";
+import RoveBeverageTruckIcon from "./icons/amenities/RoveBeverageTruckIcon";
+import IntegratedLapPoolIcon from "./icons/amenities/IntegratedLapPoolIcon";
+import OutdoorCoworkingSpaceIcon from "./icons/amenities/OutdoorCoworkingSpaceIcon";
+import OutdoorGamingTerraceIcon from "./icons/amenities/OutdoorGamingTerraceIcon";
+import SunkenSeatingIcon from "./icons/amenities/SunkenSeatingIcon";
+
+const podiumLevelImages: { indoor: string; outdoor: string } = {
+  indoor: "/images/PodiumLevel/PodiumLevelIndoor.jpg",
+  outdoor: "/images/PodiumLevel/PodiumLevelOutdoor.jpg",
+};
+
+function FloorPlanPodiumLevel() {
+  const { setModal } = useModal();
+  const [selectedPodiumLevelImage, setSelectedPodiumLevelImage] = useState<"indoor" | "outdoor">("indoor");
+
+  return (
+    <div className="space-y-6">
+      <div className="pb-6 border-b border-[#E2E2DC]">
+        <div className="relative flex flex-col p-6 bg-white rounded-2xl">
+          <Button3
+            variant="secondary"
+            icon={<PlayIcon />}
+            className="absolute self-end max-sm:hidden"
+            onClick={() => setModal(<VirtualTourVideoModal videoHref="/videos/PodiumLevel.mp4" />)}
+          >
+            Play video
+          </Button3>
+          <Button3
+            variant="secondary"
+            icon={<PlayIcon />}
+            onlyIcon
+            size="small"
+            className="absolute self-end sm:hidden"
+            onClick={() => setModal(<VirtualTourVideoModal videoHref="/videos/PodiumLevel.mp4" />)}
+          />
+          <div className="flex flex-col gap-10">
+            <div className="px-4">
+              <img src={podiumLevelImages[selectedPodiumLevelImage]} alt="" className="pointer-events-none" />
+            </div>
+            <div className="self-center">
+              <SwitchToggle
+                labels={[
+                  { id: "indoor", label: "Indoor" },
+                  { id: "outdoor", label: "Outdoor" },
+                ]}
+                currentLabel={
+                  selectedPodiumLevelImage === "indoor"
+                    ? { id: "indoor", label: "Indoor" }
+                    : { id: "outdoor", label: "Outdoor" }
+                }
+                onClick={(label) => setSelectedPodiumLevelImage(label.id as "indoor" | "outdoor")}
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="pb-6 space-y-6 border-b border-[#E2E2DC]">
+        <p className="sm:text-xl text-[#0D1922] font-semibold">Indoor Amenities</p>
+        <div className="grid grid-cols-3 gap-4 sm:grid-cols-4">
+          <ActivityCard title="Indoor Lounge" icon={<IndoorLoungeIcon />} />
+          <ActivityCard title="Monkey Bars" icon={<MonkeyBarsIcon />} />
+          <ActivityCard title="Karaoke Room" icon={<KaraokeRoomIcon />} />
+          <ActivityCard title="Arcade Games" icon={<ArcadeGamesIcon />} />
+          <ActivityCard title="Climbing Wall" icon={<ClimbingWallIcon />} />
+          <ActivityCard title="Playstation Deck" icon={<PlaystationDeckIcon />} />
+          <ActivityCard title="Fully Equipped Gym" icon={<FullyEquippedGymIcon />} />
+          <ActivityCard title="Changing Rooms" icon={<ChangingRoomsIcon />} />
+          <ActivityCard title={"Hammock Movie\nLounge"} icon={<HammockMovieLoungeIcon />} />
+          <ActivityCard title="Guest Rooms" icon={<GuestRoomsIcon />} />
+          <ActivityCard title={"Multi Ball\nInteractive Gaming"} icon={<MultiBallInteractiveGamingIcon />} />
+          <ActivityCard title={"Multi-Purpose\nRoom with Kitchen"} icon={<MultiPurposeRoomWithKitchenIcon />} />
+          <ActivityCard title={"Gaming Lounge"} icon={<GamingLoungeIcon />} />
+        </div>
+      </div>
+      <div className="pb-6 space-y-6 border-b border-[#E2E2DC]">
+        <p className="sm:text-xl text-[#0D1922] font-semibold">Outdoor Amenities</p>
+        <div className="grid grid-cols-3 sm:grid-cols-4 gap-x-4 gap-y-6">
+          <ActivityCard title="Urban Beach Pool" icon={<UrbanBeachPoolIcon />} />
+          <ActivityCard title="Jacuzzi" icon={<JacuzziIcon />} />
+          <ActivityCard title="Yoga Lounge" icon={<YogaLoungeIcon />} />
+          <ActivityCard title="Sun Lounging Deck" icon={<SunLoungingDeckIcon />} />
+          <ActivityCard title="Cascading Leisure Pool" icon={<IndoorLapPoolIcon />} />
+          <ActivityCard title="Aqua Cycling" icon={<AquaCyclingIcon />} />
+          <ActivityCard title="Open-Air Gym" icon={<OpenAirGymIcon />} />
+          <ActivityCard title="Rove Beverage Truck" icon={<RoveBeverageTruckIcon />} />
+          <ActivityCard title="Cabanas with Daybeds" icon={<CabanasWithDaybedsIcon />} />
+          <ActivityCard title="Integrated Lap Pool" icon={<IntegratedLapPoolIcon />} />
+          <ActivityCard title="Sunken Gardens" icon={<SunkenSeatingIcon />} />
+          <ActivityCard title="Outdoor Multi-Purpose Terrace" icon={<MultiPurposeRoomWithKitchenIcon />} />
+          <ActivityCard title="Outdoor Gaming Terrace" icon={<OutdoorGamingTerraceIcon />} />
+          <ActivityCard title="Outdoor Coworking Space" icon={<OutdoorCoworkingSpaceIcon />} />
+        </div>
+      </div>
+      <SidebarSlider
+        images={[
+          "/images/podiumLevelSlider/1.jpg",
+          "/images/podiumLevelSlider/2.jpg",
+          "/images/podiumLevelSlider/3.jpg",
+          "/images/podiumLevelSlider/4.jpg",
+          "/images/podiumLevelSlider/5.jpg",
+          "/images/podiumLevelSlider/6.jpg",
+          "/images/podiumLevelSlider/7.jpg",
+          "/images/podiumLevelSlider/8.jpg",
+          "/images/podiumLevelSlider/9.jpg",
+          "/images/podiumLevelSlider/10.jpg",
+          "/images/podiumLevelSlider/11.jpg",
+        ]}
+      />
+    </div>
+  );
+}
+
+export default FloorPlanPodiumLevel;
diff --git a/client/src/components/FloorPlanRooftop.tsx b/client/src/components/FloorPlanRooftop.tsx
new file mode 100644
index 0000000..827b052
--- /dev/null
+++ b/client/src/components/FloorPlanRooftop.tsx
@@ -0,0 +1,68 @@
+import Button3 from "./Button3";
+import ActivityCard from "./complexWingPage/SkygardenSidebar/ActivityCard";
+import PlayIcon from "./icons/PlayIcon";
+import VirtualTourVideoModal from "./modals/VirtualTourVideoModal";
+import useModal from "../store/useModal";
+import StargazingPointIcon from "./icons/amenities/StargazingPointIcon";
+import BBQTerraceIcon from "./icons/amenities/BBQTerraceIcon";
+import OutdoorKitchenIcon from "./icons/amenities/OutdoorKitchenIcon";
+import CabanasWithDaybedsIcon from "./icons/amenities/CabanasWithDaybedsIcon";
+import ViewingDeckWithSwingsIcon from "./icons/amenities/ViewingDeckWithSwingsIcon";
+import LoungingSpaceIcon from "./icons/amenities/LoungingSpaceIcon";
+import SunkenSeatingIcon from "./icons/amenities/SunkenSeatingIcon";
+import FirepitIcon from "./icons/amenities/FirepitIcon";
+import RooftopGardenIcon from "./icons/amenities/RooftopGardenIcon";
+import CommunalDiningTablesIcon from "./icons/amenities/CommunalDiningTablesIcon";
+import SidebarSlider from "./complexWingPage/SidebarSlider";
+
+function FloorPlanRooftop() {
+  const { setModal } = useModal();
+
+  return (
+    <div className="space-y-6">
+      <div className="pb-6 border-b border-[#E2E2DC]">
+        <div className="relative flex flex-col p-6 bg-white rounded-2xl">
+          <Button3
+            variant="secondary"
+            icon={<PlayIcon />}
+            className="absolute self-end max-sm:hidden"
+            onClick={() => setModal(<VirtualTourVideoModal videoHref="/videos/Rooftop.mp4" />)}
+          >
+            Play video
+          </Button3>
+          <Button3
+            variant="secondary"
+            icon={<PlayIcon />}
+            onlyIcon
+            size="small"
+            className="absolute self-end sm:hidden"
+            onClick={() => setModal(<VirtualTourVideoModal videoHref="/videos/Rooftop.mp4" />)}
+          />
+          <div className="flex flex-col gap-10">
+            <div className="px-4">
+              <img src="/images/rooftop/rooftop.jpg" alt="" className="pointer-events-none" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="pb-6 space-y-6 border-b border-[#E2E2DC]">
+        <p className="sm:text-xl text-[#0D1922] font-semibold">Amenities</p>
+        <div className="grid grid-cols-3 gap-4 sm:grid-cols-4">
+          <ActivityCard title="Stargazing Point" icon={<StargazingPointIcon />} />
+          <ActivityCard title="BBQ Terrace" icon={<BBQTerraceIcon />} />
+          <ActivityCard title="Outdoor Kitchen" icon={<OutdoorKitchenIcon />} />
+          <ActivityCard title={"Cabanas with\nDaybeds"} icon={<CabanasWithDaybedsIcon />} />
+          <ActivityCard title={"Viewing Deck\nwith Swings"} icon={<ViewingDeckWithSwingsIcon />} />
+          <ActivityCard title="Lounging Space" icon={<LoungingSpaceIcon />} />
+          <ActivityCard title="Sunken Seating" icon={<SunkenSeatingIcon />} />
+          <ActivityCard title="Firepit" icon={<FirepitIcon />} />
+          <ActivityCard title="Rooftop Garden" icon={<RooftopGardenIcon />} />
+          <ActivityCard title="Communal Dining Tables" icon={<CommunalDiningTablesIcon />} />
+        </div>
+      </div>
+      <SidebarSlider images={["/images/rooftopSlider/1.jpg"]} />
+    </div>
+  );
+}
+
+export default FloorPlanRooftop;
diff --git a/client/src/components/FloorPlanSkyGarden.tsx b/client/src/components/FloorPlanSkyGarden.tsx
index fb59b5f..4ef3159 100644
--- a/client/src/components/FloorPlanSkyGarden.tsx
+++ b/client/src/components/FloorPlanSkyGarden.tsx
@@ -1,28 +1,28 @@
 import { useState } from "react";
 import Button3 from "./Button3";
 import ActivityCard from "./complexWingPage/SkygardenSidebar/ActivityCard";
-import SkyGardenSlider from "./complexWingPage/SkygardenSidebar/SkyGardenSlider";
-import AmphitheatreIcon from "./icons/activities/AmphitheatreIcon";
-import BoulderingWallIcon from "./icons/activities/BoulderingWallIcon";
-import ChangingRoomsIcon from "./icons/activities/ChangingRoomsIcon";
-import ChessTablesIcon from "./icons/activities/ChessTablesIcon";
-import ClimbingRoomIcon from "./icons/activities/ClimbingRoomIcon";
-import CommunalDiningTablesIcon from "./icons/activities/CommunalDiningTablesIcon";
-import IndoorLapPoolIcon from "./icons/activities/IndoorLapPoolIcon";
-import LushLandscapeIcon from "./icons/activities/LushLandscapeIcon";
-import MultiPurposeCourtIcon from "./icons/activities/MultiPurposeCourtIcon";
-import OutdoorCinemaIcon from "./icons/activities/OutdoorCinemaIcon";
-import OutdoorCoworkingSpaceIcon from "./icons/activities/OutdoorCoworkingSpaceIcon";
-import PadelPongIcon from "./icons/activities/PadelPongIcon";
-import PingPongInATableIcon from "./icons/activities/PingPongInATableIcon";
-import RunningWheelIcon from "./icons/activities/RunningWheelIcon";
-import SunLoungingDeckIcon from "./icons/activities/SunLoungingDeckIcon";
-import SuspendedLoungingNetsIcon from "./icons/activities/SuspendedLoungingNetsIcon";
-import WellnessFeaturesIcon from "./icons/activities/WellnessFeaturesIcon";
+import AmphitheatreIcon from "./icons/amenities/AmphitheatreIcon";
+import BoulderingWallIcon from "./icons/amenities/BoulderingWallIcon";
+import ChangingRoomsIcon from "./icons/amenities/ChangingRoomsIcon";
+import ChessTablesIcon from "./icons/amenities/ChessTablesIcon";
+import ClimbingRoomIcon from "./icons/amenities/ClimbingRoomIcon";
+import CommunalDiningTablesIcon from "./icons/amenities/CommunalDiningTablesIcon";
+import IndoorLapPoolIcon from "./icons/amenities/IndoorLapPoolIcon";
+import LushLandscapeIcon from "./icons/amenities/LushLandscapeIcon";
+import MultiPurposeCourtIcon from "./icons/amenities/MultiPurposeCourtIcon";
+import OutdoorCinemaIcon from "./icons/amenities/OutdoorCinemaIcon";
+import OutdoorCoworkingSpaceIcon from "./icons/amenities/OutdoorCoworkingSpaceIcon";
+import PadelPongIcon from "./icons/amenities/PadelPongIcon";
+import PingPongInATableIcon from "./icons/amenities/PingPongInATableIcon";
+import RunningWheelIcon from "./icons/amenities/RunningWheelIcon";
+import SunLoungingDeckIcon from "./icons/amenities/SunLoungingDeckIcon";
+import SuspendedLoungingNetsIcon from "./icons/amenities/SuspendedLoungingNetsIcon";
+import WellnessFeaturesIcon from "./icons/amenities/WellnessFeaturesIcon";
 import PlayIcon from "./icons/PlayIcon";
 import VirtualTourVideoModal from "./modals/VirtualTourVideoModal";
 import SwitchToggle from "./SwitchToggle";
 import useModal from "../store/useModal";
+import SidebarSlider from "./complexWingPage/SidebarSlider";
 
 const skyGardenImages: { indoor: string; outdoor: string } = {
   indoor: "/images/skyGarden/sky-garden-indoor.jpg",
@@ -148,7 +148,14 @@ function FloorPlanSkyGarden() {
           />
         </div>
       </div>
-      <SkyGardenSlider />
+      <SidebarSlider
+        images={[
+          "/images/skyGardenSlider/1.jpg",
+          "/images/skyGardenSlider/2.jpg",
+          "/images/skyGardenSlider/3.jpg",
+          "/images/skyGardenSlider/4.jpg",
+        ]}
+      />
     </div>
   );
 }
diff --git a/client/src/components/FloorPopup.tsx b/client/src/components/FloorPopup.tsx
index deb6a3a..5af5ecf 100644
--- a/client/src/components/FloorPopup.tsx
+++ b/client/src/components/FloorPopup.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from "react";
+import IFloorPopupItem from "../types/IFloorPopupItem";
 
 interface Props {
   visible: boolean;
@@ -9,30 +10,149 @@ interface Props {
 function FloorPopup({ visible, mousePos, path }: Props) {
   const [name, setName] = useState<string>();
   const [wing, setWing] = useState<string>();
+  const [items, setItems] = useState<IFloorPopupItem[]>([]);
 
   useEffect(() => {
     if (!path) return;
 
-    if (path.dataset["name"]?.includes("floor")) {
-      setName(`${path.dataset["name"].split(" ")[1]} floor`);
-      setWing(`${path.dataset["name"].split(" ")[0]} Wing`);
+    const name = path.dataset["name"];
+
+    if (name?.includes("floor")) {
+      const floor = name.split(" ")[1];
+      const wing = name.split(" ")[0];
+      setName(`${floor} floor`);
+      setWing(`${wing} Wing`);
+
+      if (wing === "East") {
+        setItems([
+          {
+            count: 7,
+            title: "Studio²",
+          },
+          {
+            count: 8,
+            title: "1 Bedroom",
+          },
+          {
+            count: 1,
+            title: "2 Bedroom²",
+          },
+        ]);
+      } else {
+        if (+floor > 21) {
+          // upper
+          setItems([
+            {
+              count: 5,
+              title: "Studio²",
+            },
+            {
+              count: 8,
+              title: "1 Bedroom",
+            },
+            {
+              count: 2,
+              title: "2 Bedroom²",
+            },
+          ]);
+        } else {
+          // lower
+          setItems([
+            {
+              count: 6,
+              title: "Studio Flex",
+            },
+            {
+              count: 3,
+              title: "Studio²",
+            },
+            {
+              count: 6,
+              title: "1 Bedroom",
+            },
+            {
+              count: 1,
+              title: "2 Bedroom²",
+            },
+          ]);
+        }
+      }
     } else {
       setName(path.dataset["name"]);
       setWing("");
+
+      switch (name) {
+        case "Rooftop":
+          setItems([
+            {
+              count: 10,
+              title: "Amenities",
+            },
+          ]);
+          break;
+
+        case "Sky Garden":
+          setItems([
+            {
+              count: 3,
+              title: "Indoor Amenities",
+            },
+            {
+              count: 14,
+              title: "Outdoor Amenities",
+            },
+          ]);
+          break;
+
+        case "Podium Level":
+          setItems([
+            {
+              count: 13,
+              title: "Indoor Amenities",
+            },
+            {
+              count: 14,
+              title: "Outdoor Amenities",
+            },
+          ]);
+          break;
+
+        case "Ground Level":
+          setItems([
+            {
+              count: 7,
+              title: "Amenities",
+            },
+          ]);
+          break;
+
+        default:
+          break;
+      }
     }
   }, [path]);
 
   return (
     <div
-      className={`absolute z-10 bg-white rounded-2xl w-[344px] transition-[opacity,transform] duration-300 p-6 space-y-4 pointer-events-none select-none ${"-translate-x-[calc(100%+16px)]"} -translate-y-[50%] ${
+      className={`absolute z-10 bg-white rounded-2xl w-[344px] transition-[opacity,transform] duration-300 p-6 space-y-4 pointer-events-none select-none ${"-translate-x-[calc(100%+16px)]"} -translate-y-[100%] ${
         visible ? "opacity-100" : "opacity-0"
       }`}
       style={{ top: `${mousePos[1]}px`, left: `${mousePos[0]}px` }}
     >
-      <div className="space-y-1">
+      <div className="space-y-1 pb-4 border-b border-[#E2E2DC]">
         <p className="text-xl font-semibold text-[#0D1922]">{name}</p>
         {wing && <p className="text-xs font-semibold">{wing}</p>}
       </div>
+      <div className="grid grid-cols-2 gap-2">
+        {items.map((item, index) => (
+          <div key={index} className="flex items-center gap-2">
+            <div className="flex items-center justify-center w-5 h-5 rounded-full bg-[#00BED7] text-white text-[10px] font-semibold font-mono">
+              {item.count}
+            </div>
+            <p className="text-xs">{item.title}</p>
+          </div>
+        ))}
+      </div>
     </div>
   );
 }
diff --git a/client/src/components/FloorSidebarContainer.tsx b/client/src/components/FloorSidebarContainer.tsx
index 09000bf..7b8ad7f 100644
--- a/client/src/components/FloorSidebarContainer.tsx
+++ b/client/src/components/FloorSidebarContainer.tsx
@@ -5,7 +5,7 @@ import CloseIcon from "./icons/CloseIcon";
 interface Props {
   sidebarComponent: {
     element: JSX.Element;
-    name: "Floor" | "Rooftop" | "Sky Garden" | "Podium" | "Ground";
+    name: "Floor" | "Rooftop" | "Sky Garden" | "Podium Level" | "Ground Level";
     desc?: string;
   } | null;
   onClose: () => void;
@@ -21,22 +21,18 @@ function FloorSidebarContainer({ sidebarComponent, onClose }: Props) {
 
   return (
     <div
-      className={`fixed top-[54px] right-0 w-1/2 bg-[#F3F3F2] h-[calc(100dvh-54px)] flex flex-col p-6 space-y-6 transition-all duration-300 z-10 ${
+      className={`fixed top-[54px] right-0 lg:w-1/2 w-full bg-[#F3F3F2] h-[calc(100dvh-54px)] flex flex-col p-6 space-y-6 transition-all duration-300 z-10 ${
         sidebarComponent ? "opacity-100 " : "opacity-50 translate-x-full"
-      } ${component?.name === "Floor" ? "overflow-hidden" : "overflow-auto"}`}
+      } ${component?.name !== "Floor" ? "overflow-auto" : ""}`}
     >
       <div className="flex justify-between">
-        <div className="">
+        <div className="self-center">
           <p className="text-2xl font-semibold text-[#0D1922]">
-            {(component?.name === "Floor" &&
-              `${component.element.props.floor} floor`) ||
-              (component?.name === "Sky Garden" && `${component.name}`)}
+            {component?.name === "Floor" ? `${component.element.props.floor} floor` : component?.name}
           </p>
-          <p>{component?.name === "Sky Garden" && `${component.desc}`}</p>
-        </div>
-        <div className="">
-          <Button3 icon={<CloseIcon />} onlyIcon onClick={onClose} />
+          <p className="text-sm">{component?.desc}</p>
         </div>
+        <Button3 icon={<CloseIcon className="w-5 h-5" />} onlyIcon onClick={onClose} className="self-start" />
       </div>
 
       {component?.element}
diff --git a/client/src/components/Header.tsx b/client/src/components/Header.tsx
index ae152a7..f9d85ae 100644
--- a/client/src/components/Header.tsx
+++ b/client/src/components/Header.tsx
@@ -1,8 +1,7 @@
 import { NavLink } from "react-router-dom";
 import LocationIcon from "./icons/LocationIcon";
 import Logo2Icon from "./icons/Logo2Icon";
-import Button2 from "./Button2";
-import BurgerIcon from "./icons/activities/BurgerIcon";
+import BurgerIcon from "./icons/amenities/BurgerIcon";
 import useModal from "../store/useModal";
 import NavbarModal from "./modals/NavbarModal";
 import { useState } from "react";
@@ -12,6 +11,7 @@ import ChevronDownIcon from "./icons/ChevronDownIcon";
 import DownloadIcon from "./icons/DownloadIcon";
 import { useClickAway } from "@uidotdev/usehooks";
 import { Transition } from "react-transition-group";
+import Button3 from "./Button3";
 
 function Header() {
   const [showNavbar, setShowNavbar] = useState<boolean>(false);
@@ -110,7 +110,7 @@ function Header() {
                     href="/files/marasi-drive/ROVE_AMENITIES_BROCHURE.pdf"
                     className="flex items-center justify-between gap-4 bg-[#FFFFFF]/80 text-xs font-semibold px-3 py-2 rounded-lg transition-[color] hover:text-[#00BED7]"
                   >
-                    Rove Amenties Brochure
+                    Rove Amenities Brochure
                     <DownloadIcon className="w-5 h-5" />
                   </a>
                   <a
@@ -139,7 +139,7 @@ function Header() {
                     href="/files/downtown/ROVE_AMENITIES_BROCHURE.pdf"
                     className="flex items-center justify-between gap-4 bg-[#FFFFFF]/80 text-xs font-semibold px-3 py-2 rounded-lg transition-[color] hover:text-[#00BED7]"
                   >
-                    Rove Amenties Brochure
+                    Rove Amenities Brochure
                     <DownloadIcon className="w-5 h-5" />
                   </a>
                   <a
@@ -162,7 +162,7 @@ function Header() {
       </div>
       <div className="w-[230px]"></div>
       <div className="px-4 py-2 xl:hidden">
-        <Button2
+        <Button3
           variant="secondary"
           size="small"
           icon={
diff --git a/client/src/components/SelectWingMobile.tsx b/client/src/components/SelectWingMobile.tsx
new file mode 100644
index 0000000..dc76341
--- /dev/null
+++ b/client/src/components/SelectWingMobile.tsx
@@ -0,0 +1,30 @@
+interface Props {
+  onClick: (wing: "east" | "west") => void;
+}
+
+function SelectWingMobile({ onClick }: Props) {
+  return (
+    <>
+      {/* <path
+        d="M1663.06,2753.99l-195.69-71.53c-2.61-.95-5.37.98-5.37,3.76v85.81c0,1.51-.86,2.9-2.21,3.58l-.58.28c-1.35.68-2.21,2.07-2.21,3.58v1.47c0,.68.27,1.33.75,1.81s.75,1.13.75,1.81v49.84c0,1.58.93,3.01,2.38,3.65l143.04,63.47c.71.31,1.48.42,2.24.3l786.46-122.79c1.94-.31,3.38-1.98,3.38-3.95v-15.56c0-1.16.86-2.13,2-2.27s2-1.11,2-2.27v-2.36c0-.37-.23-.71-.58-.84-.88-.33-.73-1.62.2-1.73l16.88-2.11c2-.25,3.5-1.95,3.5-3.97v-56.06c0-2.41-2.13-4.28-4.52-3.96l-631,83.39c-32.48,4.66-77.48,2.66-121.42-13.35Z"
+        className="fill-[#00bed7]/40"
+      />
+      <path
+        d="M1587.83,2640.32v43.12c0,1.72,1.1,3.25,2.74,3.8l85.47,28.43c33.98,11.3,70.04,14.85,105.57,10.41l509.72-63.82c2-.25,3.5-1.95,3.5-3.96v-35.08c0-1.48-.81-2.83-2.11-3.53l-20.56-11.04c-7.19-3.87-14.83-6.84-22.75-8.85l-197.74-50.14c-23.14-5.87-46.91-8.83-70.79-8.83h-17.05l-31.71,2.28c-20.47,1.47-40.72,5.13-60.41,10.91l-281.01,82.46c-1.7.5-2.87,2.07-2.87,3.84Z"
+        className="fill-[#00bed7]/40"
+      /> */}
+      <path
+        d="M2446,1489.72v25.79l-.29,1041.64v33.08l-15.21,2.27v89l-134,18v-36.5l-3.5-3-48,7.5c-64.83-22.5-200.49-68.6-218.43-73-17.94-4.4-49.72-3.5-63.37-2.5v-64.53l.29-1015.83v-111.64c22.83-.17,74.11-1.6,96.51-6v-7.5l73.5-9,24,3.5,91.5-10.5,151,19v63l46,3v34.22Z"
+        className="fill-[#00bed7]/40"
+        onClick={() => onClick("west")}
+      />
+      <path
+        d="M1441.29,1493.16v23.81l-.29,1034.35h0v40.68l30,8v36.5l-15,4.5,120.5,42,12-5.5,15.5,5.5v7l22,8.5,284.5-95c11.63-3.83,38.46-11.5,52.7-11.5v-64.53l.29-1015.83v-111.64c-12.5.33-50.29-.9-101.49-8.5v-5.5l-69-10-17,3-124-19-24,3.5-58-9.5-50,8v18.5l-16,2.5v66.5l-62.71,10v33.66Z"
+        className="fill-[#00bed7]/40"
+        onClick={() => onClick("east")}
+      />
+    </>
+  );
+}
+
+export default SelectWingMobile;
diff --git a/client/src/components/WestWingFloorLabels.tsx b/client/src/components/WestWingFloorLabels.tsx
index c89ca05..06f13f4 100644
--- a/client/src/components/WestWingFloorLabels.tsx
+++ b/client/src/components/WestWingFloorLabels.tsx
@@ -17,7 +17,7 @@ function WestWingFloorLabels() {
           }}
         />
       </g>
-      <g id="ag" data-name="Podium label">
+      <g id="ag" data-name="Podium Level label">
         <path
           d="M657,1929h61c8.84,0,16,7.16,16,16h0c0,8.84-7.16,16-16,16h-61c-8.84,0-16-7.16-16-16h0c0-8.84,7.16-16,16-16Z"
           style={{
diff --git a/client/src/components/aboutComplex/LivingSolutionSlider.tsx b/client/src/components/aboutComplex/LivingSolutionSlider.tsx
index ae38ecc..85b5072 100644
--- a/client/src/components/aboutComplex/LivingSolutionSlider.tsx
+++ b/client/src/components/aboutComplex/LivingSolutionSlider.tsx
@@ -3,9 +3,9 @@ import { useSwipeable } from "react-swipeable";
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { Image } from "../../types/image";
 import { isMobile } from "react-device-detect";
-import Button from "../Button";
 import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
 import RightArrowSliderIcon from "../icons/RightArrowSliderIcon";
+import Button3 from "../Button3";
 
 const images: Image[] = [
   { id: "1", src: "/images/aboutCompany/livingSolutionsSlider/1.jpg" },
@@ -68,7 +68,7 @@ const LivingSolutionSlider = () => {
   return (
     <div className="flex flex-col gap-6" {...handlers}>
       <div
-        className="relative col-span-full overflow-x-hidden flex flex-col"
+        className="relative flex flex-col overflow-x-hidden col-span-full"
         style={{ height: "clamp(30rem, 12.6318rem + 21.6933vw, 75rem)" }}
       >
         <div
@@ -87,18 +87,20 @@ const LivingSolutionSlider = () => {
             />
           ))}
         </div>
-        <Button
-          onClick={prev}
+        <Button3
           icon={<LeftArrowSliderIcon />}
+          onlyIcon
+          onClick={prev}
           className="absolute text-[#73787C] top-[calc(50%-22px)] xl:left-solution-slider-btn-offset left-6 hidden sm:block"
         />
-        <Button
-          onClick={next}
+        <Button3
           icon={<RightArrowSliderIcon />}
+          onlyIcon
+          onClick={next}
           className="absolute text-[#73787C] top-[calc(50%-22px)] right-6 hidden sm:block"
         />
       </div>
-      <div className="self-center gap-1 sm:hidden flex">
+      <div className="flex self-center gap-1 sm:hidden">
         {images.map((image, index) => (
           <div
             key={image.id}
diff --git a/client/src/components/aboutComplex/RoveHomeSlider.tsx b/client/src/components/aboutComplex/RoveHomeSlider.tsx
index 37e305b..486fd26 100644
--- a/client/src/components/aboutComplex/RoveHomeSlider.tsx
+++ b/client/src/components/aboutComplex/RoveHomeSlider.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useRef, useState } from "react";
-import Button from "../Button";
 import LeftArrowIcon from "../icons/LeftArrowIcon";
 import RightArrowIcon from "../icons/RightArrowIcon";
 import { useSwipeable } from "react-swipeable";
+import Button3 from "../Button3";
 
 interface IRoveHomeSlide {
   src: string;
@@ -97,7 +97,7 @@ const RoveHomeSlider = () => {
       className="col-span-full relative xl:aspect-video sm:aspect-[7.6/10] grid grid-cols-12 items-end pb-6 sm:pl-4 sm:px-0 px-4"
       {...handlers}
     >
-      {/* <div className="absolute w-full h-full z-50" ></div> */}
+      {/* <div className="absolute z-50 w-full h-full" ></div> */}
       <div className="bg-[#F3F3F2] select-none p-8 z-50 xl:col-span-3 col-span-6 xl:col-start-3 rounded-2xl xl:min-h-[528px] sm:flex hidden flex-col justify-between">
         <div>
           <h2 className="text-subheadline-m font-semibold text-[#00BED7] pb-4 ">
@@ -110,10 +110,10 @@ const RoveHomeSlider = () => {
             {rovehomeSlides[offset * -1].desc2}
           </p>
         </div>
-        <div className="flex justify-between items-end justify-self-end">
+        <div className="flex items-end justify-between justify-self-end">
           <div className="flex gap-3 pt-8">
-            <Button icon={<LeftArrowIcon />} onClick={prev} />
-            <Button icon={<RightArrowIcon />} onClick={next} />
+            <Button3 icon={<LeftArrowIcon />} onlyIcon onClick={prev} />
+            <Button3 icon={<RightArrowIcon />} onlyIcon onClick={next} />
           </div>
           <p className="text-l text-[#00BED7]">
             {rovehomeSlides.length - rovehomeSlides.length + 1 - offset}/
@@ -123,11 +123,11 @@ const RoveHomeSlider = () => {
       </div>
       <div className="sm:absolute lg:w-[calc(100vw-5px)] sm:w-screen w-[calc(100vw-32px)] overflow-hidden xl:aspect-video sm:aspect-[7.6/10]  rounded-2xl sm:rounded-ee-2xl sm:rounded-es-2xl rounded-ee-none rounded-es-none">
         <div
-          className="w-fit flex transition-transform duration-300 ease-in-out"
+          className="flex transition-transform duration-300 ease-in-out w-fit"
           style={{ transform: `translateX(${offset * imageWidth}px)` }}
         >
           {rovehomeSlides.map((slide) => (
-            <div key={slide.id} className="flex w-screen flex-col select-none">
+            <div key={slide.id} className="flex flex-col w-screen select-none">
               <img
                 ref={imageRef}
                 src={slide.src}
@@ -144,7 +144,7 @@ const RoveHomeSlider = () => {
             </div>
           ))}
         </div>
-        <div className="flex gap-1 justify-center pt-4 ">
+        <div className="flex justify-center gap-1 pt-4 ">
           {rovehomeSlides.map((_, index) => (
             <div
               key={index}
diff --git a/client/src/components/apartmentPage/ButtonPanel.tsx b/client/src/components/apartmentPage/ButtonPanel.tsx
index 15dc8d2..fe0f63b 100644
--- a/client/src/components/apartmentPage/ButtonPanel.tsx
+++ b/client/src/components/apartmentPage/ButtonPanel.tsx
@@ -1,10 +1,10 @@
 import { useNavigate } from "react-router-dom";
-import Button from "../Button";
 import HeartIcon from "../icons/Heart";
 import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
 import { IAparmentRes } from "../../types/apartmentsRes";
-import useFavorites from "../../store/useFavorites";
+// import useFavorites from "../../store/useFavorites";
 import { useEffect, useState } from "react";
+import Button3 from "../Button3";
 
 interface ButtonPanelProps {
   currentApartment: IAparmentRes;
@@ -14,43 +14,43 @@ const ButtonPanel = ({ currentApartment }: ButtonPanelProps) => {
   const navigate = useNavigate();
   const unitNo = currentApartment.Unit_No.split("-")[1];
   const [isFavorite, setIsFavorite] = useState(false);
-  const { setFavorites } = useFavorites();
+  // const { setFavorites } = useFavorites();
 
   const handleOnBackClick = () => {
     navigate("../search");
   };
 
-  const handleOnFavoriteClick = (
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent>
-  ) => {
-    e.stopPropagation();
-    const favorites = localStorage.getItem("Favorites");
+  // const handleOnFavoriteClick = (
+  //   e: React.MouseEvent<HTMLButtonElement, MouseEvent>
+  // ) => {
+  //   e.stopPropagation();
+  //   const favorites = localStorage.getItem("Favorites");
 
-    if (!favorites) {
-      setIsFavorite(true);
-      const updatedFavorites = JSON.stringify([currentApartment]);
+  //   if (!favorites) {
+  //     setIsFavorite(true);
+  //     const updatedFavorites = JSON.stringify([currentApartment]);
 
-      localStorage.setItem("Favorites", updatedFavorites);
-    } else {
-      const _favorites = JSON.parse(favorites) as IAparmentRes[];
+  //     localStorage.setItem("Favorites", updatedFavorites);
+  //   } else {
+  //     const _favorites = JSON.parse(favorites) as IAparmentRes[];
 
-      if (_favorites.some((apart) => apart.id === currentApartment.id)) {
-        setIsFavorite(false);
-        const updatedFavorites = [..._favorites].filter(
-          (apart) => apart.id !== currentApartment.id
-        );
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        setFavorites(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      } else {
-        setIsFavorite(true);
-        const updatedFavorites = [..._favorites, currentApartment];
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      }
-    }
-  };
+  //     if (_favorites.some((apart) => apart.id === currentApartment.id)) {
+  //       setIsFavorite(false);
+  //       const updatedFavorites = [..._favorites].filter(
+  //         (apart) => apart.id !== currentApartment.id
+  //       );
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       setFavorites(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     } else {
+  //       setIsFavorite(true);
+  //       const updatedFavorites = [..._favorites, currentApartment];
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     }
+  //   }
+  // };
 
   useEffect(() => {
     const favorites = localStorage.getItem("Favorites");
@@ -63,13 +63,9 @@ const ButtonPanel = ({ currentApartment }: ButtonPanelProps) => {
   }, [currentApartment.id]);
 
   return (
-    <div className="flex justify-between w-full gap-4 items-center pb-3">
-      <div className="flex gap-4 items-center ">
-        <Button
-          icon={<LeftArrowSliderIcon />}
-          buttonType="cta"
-          onClick={handleOnBackClick}
-        />
+    <div className="flex items-center justify-between w-full gap-4 pb-3">
+      <div className="flex items-center gap-4 ">
+        <Button3 icon={<LeftArrowSliderIcon />} onClick={handleOnBackClick} />
         <div className="flex flex-col">
           <p className="text-[#73787C] text-caption-m font-semibold">
             № {unitNo}
@@ -79,12 +75,7 @@ const ButtonPanel = ({ currentApartment }: ButtonPanelProps) => {
           </h2>
         </div>
       </div>
-      <Button
-        buttonType="favorite"
-        icon={<HeartIcon isFilled={isFavorite} />}
-        isCircleRounded
-        onClick={handleOnFavoriteClick}
-      />
+      <Button3 icon={<HeartIcon isFilled={isFavorite} />} roundedFull />
     </div>
   );
 };
diff --git a/client/src/components/apartmentPage/SimilarSlider.tsx b/client/src/components/apartmentPage/SimilarSlider.tsx
index 234ecde..d0826fb 100644
--- a/client/src/components/apartmentPage/SimilarSlider.tsx
+++ b/client/src/components/apartmentPage/SimilarSlider.tsx
@@ -3,9 +3,9 @@
 import { useLayoutEffect, useRef, useState } from "react";
 import { layoutsCards } from "../../consts/initialSearchPage";
 import SimilarAppartmentCard from "./SimilarAppartmentCard";
-import Button from "../Button";
 import RightArrowIcon from "../icons/RightArrowIcon";
 import { useSwipeable } from "react-swipeable";
+import Button3 from "../Button3";
 
 const desktopCols = 4;
 const laptopCols = 2;
@@ -61,22 +61,20 @@ const SimilarSlider = () => {
           Similar
         </h2>
         <div className="flex gap-2 ">
-          <Button
-            isCircleRounded
-            onClick={handleOnLeftBtnClick}
+          <Button3
             icon={<RightArrowIcon />}
-            buttonType="fab"
+            roundedFull
             className="rotate-180"
+            onClick={handleOnLeftBtnClick}
           />
-          <Button
-            isCircleRounded
+          <Button3
             icon={<RightArrowIcon />}
+            roundedFull
             onClick={handleOnRightBtnClick}
-            buttonType="fab"
           />
         </div>
       </div>
-      <div className="border-t border-b py-4" {...handlers}>
+      <div className="py-4 border-t border-b" {...handlers}>
         <div className="w-[100vw-16px] overflow-hidden ">
           <div
             className={`transition-transform duration-300 ease-in-out`}
@@ -84,7 +82,7 @@ const SimilarSlider = () => {
               transform: `translateX(${offset * cardWidth}px)`,
             }}
           >
-            <div className="flex w-fit gap-4 ">
+            <div className="flex gap-4 w-fit ">
               {Array.from({ length: Math.round(cards.length / cols) }).map(
                 (_, index) => {
                   return (
diff --git a/client/src/components/companyPage/OurValues/Slider.tsx b/client/src/components/companyPage/OurValues/Slider.tsx
index 3b13e30..a9435cc 100644
--- a/client/src/components/companyPage/OurValues/Slider.tsx
+++ b/client/src/components/companyPage/OurValues/Slider.tsx
@@ -2,10 +2,10 @@
 import { useSwipeable } from "react-swipeable";
 import { Image } from "../../../types/image";
 import { useLayoutEffect, useRef, useState } from "react";
-import Button from "../../Button";
 import LeftArrowSliderIcon from "../../icons/LeftArrowSliderIcon";
 import RightArrowSliderIcon from "../../icons/RightArrowSliderIcon";
 import { isMobile } from "react-device-detect";
+import Button3 from "../../Button3";
 
 const images: Image[] = [
   { id: "1", src: "./images/company/slider/1.jpg" },
@@ -67,7 +67,7 @@ const Slider = () => {
   return (
     <div className="flex flex-col gap-6 " {...handlers}>
       <div
-        className="relative col-span-full overflow-x-hidden flex flex-col"
+        className="relative flex flex-col overflow-x-hidden col-span-full"
         style={{ height: "clamp(30rem, 12.6318rem + 21.6933vw, 75rem)" }}
       >
         <div
@@ -86,18 +86,18 @@ const Slider = () => {
             />
           ))}
         </div>
-        <Button
-          onClick={prev}
+        <Button3
           icon={<LeftArrowSliderIcon />}
           className="absolute text-[#73787C] top-[calc(50%-22px)] xl:left-slider-btn-offset left-6 hidden sm:block"
+          onClick={prev}
         />
-        <Button
-          onClick={next}
+        <Button3
           icon={<RightArrowSliderIcon />}
           className="absolute text-[#73787C] top-[calc(50%-22px)] right-6 hidden sm:block"
+          onClick={next}
         />
       </div>
-      <div className="self-center gap-1 sm:hidden flex">
+      <div className="flex self-center gap-1 sm:hidden">
         {images.map((image, index) => (
           <div
             key={image.id}
diff --git a/client/src/components/complexPage/ComplexTopPanel.tsx b/client/src/components/complexPage/ComplexTopPanel.tsx
index 90c1a36..b752c98 100644
--- a/client/src/components/complexPage/ComplexTopPanel.tsx
+++ b/client/src/components/complexPage/ComplexTopPanel.tsx
@@ -1,138 +1,45 @@
 import { useNavigate } from "react-router-dom";
-import useModal from "../../store/useModal";
-import Button from "../Button";
-import FilterIcon from "../icons/FilterIcon";
-// import HintIcon from "../icons/HintIcon";
-import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
-// import ResizeIcon from "../icons/ResizeIcon";
-// import HelpModal from "../modals/HelpModal";
-// import MasterplanFilters from "../modals/MasterplanFilters";
 import InfoIcon from "../icons/InfoIcon";
-// import useFullScreen from "../../store/useFullScreen";
-// import ActiveResizeIcon from "../icons/ActiveResizeIcon";
-import useWingSidebar from "../../store/useWingSidebar";
-import { MobileModalWrapper } from "../modals/mobile/MobileModalWrapper";
-import MasterplanFiltersModal from "../modals/mobile/MasterplanFiltersModal";
+import Button3 from "../Button3";
+import ArrowLeftIcon from "../icons/ArrowLeftIcon";
 
 const ComplexTopPanel = () => {
-  const { setModal } = useModal();
-  // const { onFullscreen, isFullscreen, setIsFullscreen } = useFullScreen();
-  const { setIsSidebar, isSidebar } = useWingSidebar();
   const navigate = useNavigate();
 
-  // const handleOnHelpClick = () => {
-  //   setModal(<HelpModal />);
-  // };
-
-  // const handleOnFiltersClick = () => {
-  //   setModal(<MasterplanFilters />);
-  // };
-
-  const handleOnMobileFiltersClick = () => {
-    setModal(
-      <MobileModalWrapper>
-        <MasterplanFiltersModal />
-      </MobileModalWrapper>
-    );
-  };
-
-  const handleOnBackClick = () => {
-    if (isSidebar) {
-      setIsSidebar(false);
-    } else {
-      navigate("/");
-    }
-  };
-
-  // const handleOnFullScreenClick = () => {
-  //   if (!onFullscreen) return;
-
-  //   setIsFullscreen(!isFullscreen);
-  //   if (!isFullscreen) {
-  //     onFullscreen.enter();
-  //   } else {
-  //     onFullscreen.exit();
-  //   }
-  // };
-
-  const handleOnAboutComplexClick = () => {
-    navigate(`../about-projects`);
-  };
-
   return (
-    <>
-      <div className="absolute top-0 z-20 w-screen pointer-events-none select-none">
-        <img src="../images/top_shadow.png" className="w-screen" alt="" />
-      </div>
-      <div
-        className={`absolute top-[62px] left-0 z-20 w-full p-4 grid grid-cols-12 select-none touch-none pointer-events-none`}
-      >
-        <div className="flex col-span-7 gap-2 sm:col-span-5">
-          <Button
-            icon={<LeftArrowSliderIcon />}
-            buttonType="cta"
-            onClick={handleOnBackClick}
-          />
-          {/* <Button
-            className="hidden lg:flex"
-            icon={<FilterIcon />}
-            buttonType="primary"
-            text="Filters"
-            onClick={handleOnFiltersClick}
-          /> */}
-          <Button
-            className="flex lg:hidden"
-            icon={<FilterIcon />}
-            buttonType="primary"
-            text="Filters"
-            onClick={handleOnMobileFiltersClick}
-          />
-          <Button
-            icon={<InfoIcon />}
-            buttonType="primary"
-            text="About Projects"
-            onClick={handleOnAboutComplexClick}
+    <div className="absolute top-0 left-0 z-20 w-full p-3 mt-14">
+      <div className="flex sm:gap-2 max-sm:justify-between">
+        <div>
+          <Button3
+            size="small"
+            icon={<ArrowLeftIcon />}
+            onlyIcon
+            onClick={() => navigate("/")}
           />
         </div>
-        <div className="flex flex-col items-start col-span-4 col-start-8 text-center text-white sm:col-start-6 sm:col-span-4 ">
-          <div
-            className={`text-center duration-300 ease-in-out transition-opacity hidden sm:block ${
-              isSidebar ? "opacity-0" : "opacity-100"
-            }`}
+        <div className="font-semibold text-center text-white sm:hidden">
+          <p className="text-base">ROVE Home Marasi Drive</p>
+          <p className="text-xs">Select a wing</p>
+        </div>
+        <div>
+          <Button3
+            variant="secondary"
+            icon={<InfoIcon className="w-5 h-5" />}
+            className="max-sm:hidden"
+            onClick={() => navigate("/about-projects")}
           >
-            <h2 className="font-semibold text-subheadline-s drop-shadow drop-shadow-[0_2px_8px_0px_rgba(62, 84, 100, 0.25)] select-none">
-              ROVE Home Marasi Drive
-            </h2>
-            {/* <p className="text-s drop-shadow drop-shadow-[0_2px_8px_0px_rgba(62, 84, 100, 0.25)]">
-              Select a wing
-            </p> */}
-          </div>
-        </div>
-        {/* <div className="flex justify-end col-span-1 col-start-12 gap-2">
-          {isFullscreen ? (
-            <Button
-              buttonType="fab"
-              icon={<ActiveResizeIcon />}
-              onClick={handleOnFullScreenClick}
-              isCircleRounded
-            />
-          ) : (
-            <Button
-              buttonType="fab"
-              icon={<ResizeIcon />}
-              onClick={handleOnFullScreenClick}
-              isCircleRounded
-            />
-          )}
-          <Button
-            buttonType="fab"
-            icon={<HintIcon />}
-            onClick={handleOnHelpClick}
-            isCircleRounded
+            About Projects
+          </Button3>
+          <Button3
+            variant="secondary"
+            icon={<InfoIcon />}
+            onlyIcon
+            className="sm:hidden"
+            onClick={() => navigate("/about-projects")}
           />
-        </div> */}
+        </div>
       </div>
-    </>
+    </div>
   );
 };
 
diff --git a/client/src/components/complexPage/SequenceSlider.tsx b/client/src/components/complexPage/SequenceSlider.tsx
index 0ce5c6d..f5cfbf2 100644
--- a/client/src/components/complexPage/SequenceSlider.tsx
+++ b/client/src/components/complexPage/SequenceSlider.tsx
@@ -5,12 +5,12 @@ import { isMobile } from "react-device-detect";
 import { useSwipeable } from "react-swipeable";
 import { Transition } from "react-transition-group";
 import { useNavigate } from "react-router-dom";
-import Button from "../Button";
 import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
 import RightArrowSliderIcon from "../icons/RightArrowSliderIcon";
 import useCompass from "../../store/useCompass";
 import SequenceHighlighting from "./SequenceHighlighting";
 import { laptopWidth, mobileWidht } from "../../consts/masterplan";
+import Button3 from "../Button3";
 
 const arrayLength = 360;
 const keyframes: number[] = [51, 178, 249, 339];
@@ -165,7 +165,7 @@ function SequenceSlider({ path }: SequenceSliderProps) {
   return (
     <div
       {...handlers}
-      className="absolute w-full h-full overflow-hidden bg-black top-0 left-0 z-10"
+      className="absolute top-0 left-0 z-10 w-full h-full overflow-hidden bg-black"
     >
       <div
         className="absolute left-0"
@@ -218,24 +218,22 @@ function SequenceSlider({ path }: SequenceSliderProps) {
           onClick={handleOnSequenceClick}
         />
       </div>
-      <Button
-        disabled={isAnimate}
-        className={`p-3 rounded-full transition-colors absolute left-6 top-[calc(50%-24px)] z-50 ${
-          isAnimate ? "opacity-50" : "opacity-100"
-        }`}
-        isCircleRounded
-        buttonType="fab"
+      <Button3
+        variant="secondary"
         icon={<LeftArrowSliderIcon />}
+        onlyIcon
+        roundedFull
+        disabled={isAnimate}
+        className={`absolute left-6 top-[calc(50%-24px)] z-50`}
         onClick={prev}
       />
-      <Button
-        disabled={isAnimate}
-        className={`p-3 rounded-full transition-colors absolute right-6 top-[calc(50%-24px)] z-50 ${
-          isAnimate ? "opacity-50" : "opacity-100"
-        }`}
-        buttonType="fab"
-        isCircleRounded
+      <Button3
+        variant="secondary"
         icon={<RightArrowSliderIcon />}
+        onlyIcon
+        roundedFull
+        disabled={isAnimate}
+        className={`absolute right-6 top-[calc(50%-24px)] z-50`}
         onClick={next}
       />
       <div
@@ -276,7 +274,7 @@ function SequenceSlider({ path }: SequenceSliderProps) {
           // <div
           //   className={`absolute top-0 left-0 w-full h-full flex items-center justify-center bg-neutral-950 z-50 transition-opacity duration-300 ${state}`}
           // >
-          //   <h2 className="text-2xl font-tenor text-white whitespace-nowrap">
+          //   <h2 className="text-2xl text-white font-tenor whitespace-nowrap">
           //     Loading... {Math.round((100 / arrayLength) * loadedImages)} %
           //   </h2>
           // </div>
diff --git a/client/src/components/complexPage/SequenceSliderMobile.tsx b/client/src/components/complexPage/SequenceSliderMobile.tsx
new file mode 100644
index 0000000..7320ec0
--- /dev/null
+++ b/client/src/components/complexPage/SequenceSliderMobile.tsx
@@ -0,0 +1,80 @@
+import { useState } from "react";
+import { useSwipeable } from "react-swipeable";
+import Button3 from "../Button3";
+import { useNavigate } from "react-router-dom";
+import ArrowLeftIcon from "../icons/ArrowLeftIcon";
+import ArrowRightIcon from "../icons/ArrowRightIcon";
+import InfoIcon from "../icons/InfoIcon";
+
+const images = [
+  "/images/sequenceSliderMobile/1.jpg",
+  "/images/sequenceSliderMobile/2.jpg",
+  "/images/sequenceSliderMobile/3.jpg",
+  "/images/sequenceSliderMobile/4.jpg",
+];
+
+function SequenceSliderMobile() {
+  const [selectedIndex, setSelectedIndex] = useState<number>(3);
+  const navigate = useNavigate();
+
+  const handlers = useSwipeable({
+    onSwipedRight: prev,
+    onSwipedLeft: next,
+  });
+
+  function prev() {
+    setSelectedIndex((prev) => (prev - 1 + images.length) % images.length);
+  }
+
+  function next() {
+    setSelectedIndex((prev) => (prev + 1) % images.length);
+  }
+
+  return (
+    <div {...handlers} className="absolute flex flex-col items-start justify-center w-full h-dvh bg-black/50">
+      {images.map((image, index) => (
+        <img
+          key={index}
+          src={image}
+          alt=""
+          className={`absolute object-cover w-full h-full transition-all duration-700 ${
+            selectedIndex === index ? "opacity-100" : "opacity-0"
+          }`}
+        />
+      ))}
+
+      <div className="absolute top-[56px] p-3 flex items-center justify-between w-full">
+        <Button3 icon={<ArrowLeftIcon className="w-5 h-5" />} onlyIcon onClick={() => navigate("/")} />
+        <p className="font-semibold text-white">ROVE Home Marasi Drive</p>
+        <Button3
+          variant="secondary"
+          icon={<InfoIcon className="w-5 h-5" />}
+          onlyIcon
+          onClick={() => navigate("/about-projects")}
+        />
+      </div>
+
+      <div className="absolute flex justify-between w-full px-3">
+        <Button3 variant="secondary" icon={<ArrowLeftIcon className="w-5 h-5" />} onlyIcon roundedFull onClick={prev} />
+        <Button3
+          variant="secondary"
+          icon={<ArrowRightIcon className="w-5 h-5" />}
+          onlyIcon
+          roundedFull
+          onClick={next}
+        />
+      </div>
+
+      <div className="fixed bottom-0 w-full p-3">
+        <Button3 className="w-full" onClick={() => navigate("wing")}>
+          <p className="flex items-center gap-1">
+            <span>Select a wing</span>
+            <ArrowRightIcon className="w-5 h-5" />
+          </p>
+        </Button3>
+      </div>
+    </div>
+  );
+}
+
+export default SequenceSliderMobile;
diff --git a/client/src/components/complexWingPage/FloorSidebar/UnitPopup.tsx b/client/src/components/complexWingPage/FloorSidebar/UnitPopup.tsx
index 1078e87..a3a5ac8 100644
--- a/client/src/components/complexWingPage/FloorSidebar/UnitPopup.tsx
+++ b/client/src/components/complexWingPage/FloorSidebar/UnitPopup.tsx
@@ -1,6 +1,7 @@
 import IUnit from "../../../types/IUnit";
 import VirtualTourIcon from "../../icons/VirtualTourIcon";
 import unitTypes from "../../../data/unitTypes.json";
+import { useEffect } from "react";
 
 interface Props {
   unit: IUnit | undefined;
@@ -10,9 +11,13 @@ interface Props {
 }
 
 function UnitPopup({ unit, type, show, mousePos }: Props) {
+  useEffect(() => {
+    console.log(unit, type, show, mousePos);
+  }, []);
+
   return (
     <div
-      className={`absolute w-[344px] h-[156px] z-30 p-6 space-y-4 bg-white rounded-2xl shadow-lg pointer-events-none transition-opacity -translate-x-[calc(100%+16px)] -translate-y-[50%] ${
+      className={`absolute w-[344px] h-[156px] z-30 p-6 space-y-4 bg-white rounded-2xl shadow-lg pointer-events-none transition-opacity -translate-x-[calc(100%+16px)] -translate-y-[100%] ${
         show ? "opacity-100" : "opacity-0"
       }`}
       style={{ top: `${mousePos[1]}px`, left: `${mousePos[0]}px` }}
@@ -46,9 +51,7 @@ function UnitPopup({ unit, type, show, mousePos }: Props) {
                 "Unavailable"
               )}
             </p>
-            {unitTypes.some(
-              (unitType) => unitType.type === type && unitType.tourAvailable
-            ) && (
+            {unitTypes.some((unitType) => unitType.type === type && unitType.tourAvailable) && (
               <button className="bg-[#30B21614] text-xs text-[#30B216] font-semibold space-y-1 flex items-center gap-1 px-2 py-1 rounded-lg">
                 <VirtualTourIcon /> 3D tour
               </button>
diff --git a/client/src/components/complexWingPage/SequenceWing/MobileFloorDescription.tsx b/client/src/components/complexWingPage/SequenceWing/MobileFloorDescription.tsx
index f47d43d..44935f7 100644
--- a/client/src/components/complexWingPage/SequenceWing/MobileFloorDescription.tsx
+++ b/client/src/components/complexWingPage/SequenceWing/MobileFloorDescription.tsx
@@ -1,6 +1,6 @@
 import { IDesctiptionFloor } from "../../../types/descriptionFloor";
 import IUnit from "../../../types/IUnit";
-import Button from "../../Button";
+import Button3 from "../../Button3";
 import CrossIcon from "../../icons/CrossIcon";
 import RightArrowSliderIcon from "../../icons/RightArrowSliderIcon";
 
@@ -15,7 +15,6 @@ const MobileFloorDescription = ({
   descriptionFloor,
   floorApartments,
   isLeft,
-  onClick,
 }: MobileFloorDescriptionProps) => {
   return (
     <>
@@ -23,14 +22,14 @@ const MobileFloorDescription = ({
         className={`bg-white rounded-2xl p-6 flex flex-col gap-4 w-[344px] absolute left-[414px] transition-opacity duration-300 desc-shadow h-[328px]`}
       >
         <div className="relative">
-          <div className="flex justify-between border-b pb-4">
+          <div className="flex justify-between pb-4 border-b">
             <div className="flex flex-col">
               <p
                 className={`text-[#0D1922] font-semibold text-[20px] duration-300 ease-in-out text-subheadline-s`}
               >
                 {descriptionFloor?.floor} Floor
               </p>
-              <div className="flex gap-2 items-center">
+              <div className="flex items-center gap-2">
                 <p className="text-[#73787C] font-semibold text-caption-m">
                   {descriptionFloor?.wing}
                 </p>
@@ -40,13 +39,13 @@ const MobileFloorDescription = ({
                 </p>
               </div>
             </div>
-            <Button buttonType="tertiary" icon={<CrossIcon />} />
+            <Button3 variant="secondary" icon={<CrossIcon />} onlyIcon />
           </div>
           <div className="flex flex-col gap-4 pt-4">
             <div className="flex items-center justify-between gap-8">
-              <div className="flex gap-2 items-center">
+              <div className="flex items-center gap-2">
                 <div className="min-w-6 min-h-6 rounded-full bg-[#00BED7] text-white text-xs font-semibold">
-                  <p className="p-1 flex justify-center items-center">
+                  <p className="flex items-center justify-center p-1">
                     {
                       floorApartments.filter(
                         (apart) => apart.unitType === "Studio Flex"
@@ -59,9 +58,9 @@ const MobileFloorDescription = ({
               <p className="text-s text-[#0D1922] text-nowrap">Unavailable</p>
             </div>
             <div className="flex items-center justify-between gap-8">
-              <div className="flex gap-2 items-center">
+              <div className="flex items-center gap-2">
                 <div className="min-w-6 min-h-6 p-1 rounded-full bg-[#00BED7] text-white text-xs font-semibold">
-                  <p className="h-full w-full flex justify-center items-center">
+                  <p className="flex items-center justify-center w-full h-full">
                     {
                       floorApartments.filter(
                         (apart) => apart.unitType === "Studio Squared"
@@ -74,9 +73,9 @@ const MobileFloorDescription = ({
               <p className="text-s text-[#0D1922] text-nowrap">Unavailable</p>
             </div>
             <div className="flex items-center justify-between gap-8">
-              <div className="flex gap-2 items-center">
+              <div className="flex items-center gap-2">
                 <div className="min-w-6 min-h-6 p-1 rounded-full bg-[#00BED7] text-white text-xs font-semibold">
-                  <p className="h-full w-full flex justify-center items-center">
+                  <p className="flex items-center justify-center w-full h-full">
                     {
                       floorApartments.filter(
                         (apart) => apart.unitType === "1 BR Squared"
@@ -89,9 +88,9 @@ const MobileFloorDescription = ({
               <p className="text-s text-[#0D1922] text-nowrap">Unavailable</p>
             </div>
             <div className="flex items-center justify-between gap-8">
-              <div className="flex gap-2 items-center">
+              <div className="flex items-center gap-2">
                 <div className="min-w-6 min-h-6 p-1 rounded-full bg-[#00BED7] text-white text-xs font-semibold">
-                  <p className="h-full w-full flex justify-center items-center">
+                  <p className="flex items-center justify-center w-full h-full">
                     {
                       floorApartments.filter(
                         (apart) => apart.unitType === "2 BR Squared"
@@ -105,14 +104,9 @@ const MobileFloorDescription = ({
               </div>
               <p className="text-s text-[#0D1922] text-nowrap">Unavailable</p>
             </div>
-            <Button
-              onClick={onClick}
-              buttonType="cta"
-              className="justify-center"
-              text="Explore"
-              icon={<RightArrowSliderIcon />}
-              iconPos="right"
-            />
+            <Button3 className="justify-center" icon={<RightArrowSliderIcon />}>
+              Explore
+            </Button3>
           </div>
           <div
             className={`w-0 h-0 border-t-0 border-r-[6px] border-b-[14px] border-l-[6px] border-transparent border-b-white absolute ${
diff --git a/client/src/components/complexWingPage/SequenceWing/MobileSkygardenDescription.tsx b/client/src/components/complexWingPage/SequenceWing/MobileSkygardenDescription.tsx
index ad5ca5a..b3843ce 100644
--- a/client/src/components/complexWingPage/SequenceWing/MobileSkygardenDescription.tsx
+++ b/client/src/components/complexWingPage/SequenceWing/MobileSkygardenDescription.tsx
@@ -1,4 +1,4 @@
-import Button from "../../Button";
+import Button3 from "../../Button3";
 import CrossIcon from "../../icons/CrossIcon";
 import RightArrowSliderIcon from "../../icons/RightArrowSliderIcon";
 
@@ -8,7 +8,6 @@ interface MobileSkygardenDescriptionProps {
 }
 
 const MobileSkygardenDescription = ({
-  onClick,
   isLeft,
 }: MobileSkygardenDescriptionProps) => {
   return (
@@ -17,7 +16,7 @@ const MobileSkygardenDescription = ({
         className={`bg-white rounded-2xl p-6 flex flex-col gap-4 w-[344px] absolute left-[414px] transition-opacity duration-300 desc-shadow h-fit`}
       >
         <div className="relative">
-          <div className="flex justify-between border-b pb-4">
+          <div className="flex justify-between pb-4 border-b">
             <div className="flex flex-col items-start justify-start">
               <p
                 className={`text-[#0D1922] font-semibold text-[20px] duration-300 ease-in-out text-subheadline-s`}
@@ -25,22 +24,22 @@ const MobileSkygardenDescription = ({
                 Sky Garden
               </p>
             </div>
-            <Button buttonType="tertiary" icon={<CrossIcon />} />
+            <Button3 variant="secondary" icon={<CrossIcon />} onlyIcon />
           </div>
           <div className="flex flex-col gap-4 pt-4">
             <div className="flex items-center justify-between gap-8">
-              <div className="flex gap-2 items-center">
+              <div className="flex items-center gap-2">
                 <div className="min-w-6 min-h-6 rounded-full bg-[#00BED7] text-white text-xs font-semibold">
-                  <p className="p-1 flex justify-center items-center">8</p>
+                  <p className="flex items-center justify-center p-1">8</p>
                 </div>
                 <p className="text-s text-[#73787C] w-full">Indoor</p>
               </div>
               <p className="text-s text-[#0D1922] text-nowrap">3 amenities</p>
             </div>
             <div className="flex items-center justify-between gap-8">
-              <div className="flex gap-2 items-center">
+              <div className="flex items-center gap-2">
                 <div className="min-w-6 min-h-6 p-1 rounded-full bg-[#00BED7] text-white text-xs font-semibold">
-                  <p className="h-full w-full flex justify-center items-center">
+                  <p className="flex items-center justify-center w-full h-full">
                     8
                   </p>
                 </div>
@@ -49,14 +48,13 @@ const MobileSkygardenDescription = ({
               <p className="text-s text-[#0D1922] text-nowrap">14 amenities</p>
             </div>
 
-            <Button
-              onClick={onClick}
-              buttonType="cta"
-              className="justify-center"
-              text="Explore"
+            <Button3
               icon={<RightArrowSliderIcon />}
-              iconPos="right"
-            />
+              className="justify-center"
+              // onClick={onClick}
+            >
+              Explore
+            </Button3>
           </div>
           <div
             className={`w-0 h-0 border-t-0 border-r-[6px] border-b-[14px] border-l-[6px] border-transparent border-b-white absolute ${
diff --git a/client/src/components/complexWingPage/SidebarSlider.tsx b/client/src/components/complexWingPage/SidebarSlider.tsx
new file mode 100644
index 0000000..24dc8c0
--- /dev/null
+++ b/client/src/components/complexWingPage/SidebarSlider.tsx
@@ -0,0 +1,98 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import { useEffect, useRef, useState } from "react";
+import Button3 from "../Button3";
+import ArrowLeftIcon from "../icons/ArrowLeftIcon";
+import ArrowRightIcon from "../icons/ArrowRightIcon";
+import { useSwipeable } from "react-swipeable";
+
+// const images =
+
+interface Props {
+  images: string[];
+}
+
+const gap = 16; // px
+
+function SidebarSlider({ images }: Props) {
+  const ref = useRef<HTMLDivElement>(null);
+  const [width, setWidth] = useState<number>(0);
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const handlers = useSwipeable({
+    onSwipedLeft: next,
+    onSwipedRight: prev,
+    trackMouse: true,
+  });
+
+  function prev() {
+    if (selectedIndex === 0) return;
+    setSelectedIndex(selectedIndex - 1);
+  }
+
+  function next() {
+    if (selectedIndex === images.length - 1) return;
+    setSelectedIndex(selectedIndex + 1);
+  }
+
+  function handleResize() {
+    if (!ref.current) return;
+
+    setWidth(ref.current.clientWidth - 48);
+  }
+
+  useEffect(() => {
+    handleResize();
+
+    window.addEventListener("resize", handleResize);
+
+    return () => {
+      window.removeEventListener("resize", handleResize);
+    };
+  }, []);
+
+  return (
+    <div ref={ref} className="relative -mx-6 overflow-x-clip">
+      <div
+        className="flex px-6 transition-transform duration-300"
+        style={{
+          transform: `translateX(-${(width + gap) * selectedIndex}px)`,
+          gap: `${gap}px`,
+        }}
+      >
+        {images.map((image, index) => (
+          <img
+            key={index}
+            src={image}
+            alt=""
+            className="object-cover pointer-events-none rounded-2xl aspect-[20/9]"
+            style={{
+              minWidth: `${width}px`,
+            }}
+          />
+        ))}
+      </div>
+
+      <div {...handlers} className="absolute top-0 flex items-center justify-between w-full h-full">
+        <Button3
+          variant="secondary"
+          icon={<ArrowLeftIcon className="w-5 h-5" />}
+          onlyIcon
+          roundedFull
+          className="ml-4"
+          onClick={prev}
+          disabled={selectedIndex === 0}
+        />
+        <Button3
+          variant="secondary"
+          icon={<ArrowRightIcon className="w-5 h-5" />}
+          onlyIcon
+          roundedFull
+          className="mr-4"
+          onClick={next}
+          disabled={selectedIndex === images.length - 1}
+        />
+      </div>
+    </div>
+  );
+}
+
+export default SidebarSlider;
diff --git a/client/src/components/complexWingPage/SkygardenSidebar/ActivityCard.tsx b/client/src/components/complexWingPage/SkygardenSidebar/ActivityCard.tsx
index 4151ad1..138e01b 100644
--- a/client/src/components/complexWingPage/SkygardenSidebar/ActivityCard.tsx
+++ b/client/src/components/complexWingPage/SkygardenSidebar/ActivityCard.tsx
@@ -5,20 +5,9 @@ interface ActivityCardProps {
 
 const ActivityCard = ({ icon, title }: ActivityCardProps) => {
   return (
-    // <div className="flex flex-col p-3 bg-white rounded-2xl gap-9">
-    //   <div className="flex items-center gap-2">
-    //     <div className="w-3 h-3 bg-[#E2E2DC] rounded-full"></div>
-    //     <p className="text-m text-[#0D1922]">{title}</p>
-    //   </div>
-    //   <div className="w-14 h-14 rounded-lg bg-[#F3F3F2] self-end text-[#00BED7]">
-    //     {icon}
-    //   </div>
-    // </div>
     <div className="space-y-3">
-      <div className="w-10 h-10 rounded-full text-[#00BED7] overflow-hidden border border-[#00BED7]">
-        {icon}
-      </div>
-      <p className="lg:text-sm sm:text-xs text-[10px] font-semibold">{title}</p>
+      <div className="w-10 h-10 rounded-full text-[#00BED7] overflow-hidden border border-[#00BED7]">{icon}</div>
+      <p className="lg:text-sm sm:text-xs text-[10px] font-semibold whitespace-pre-line">{title}</p>
     </div>
   );
 };
diff --git a/client/src/components/complexWingPage/SkygardenSidebar/SkyGardenSlider.tsx b/client/src/components/complexWingPage/SkygardenSidebar/SkyGardenSlider.tsx
deleted file mode 100644
index 31ae042..0000000
--- a/client/src/components/complexWingPage/SkygardenSidebar/SkyGardenSlider.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useEffect, useRef, useState } from "react";
-import ArrowLeftIcon from "../../icons/ArrowLeftIcon";
-import ArrowRightIcon from "../../icons/ArrowRightIcon";
-
-const images = [
-  "/images/skyGardenSlider/1.jpg",
-  "/images/skyGardenSlider/2.jpg",
-  "/images/skyGardenSlider/3.jpg",
-  "/images/skyGardenSlider/4.jpg",
-];
-
-function SkyGardenSlider() {
-  const ref = useRef<HTMLDivElement>(null);
-  const [currentSlideIndex, setCurrentSlideIndex] = useState<number>(0);
-  const [isShowNextButton, setIsShowNextButton] = useState(true);
-  const [isShowPrevButton, setIsShowPrevButton] = useState(false);
-
-  function next() {
-    if (currentSlideIndex < 3) {
-      setCurrentSlideIndex((prev) => prev + 1);
-    }
-  }
-
-  function prev() {
-    if (currentSlideIndex > 0) {
-      setCurrentSlideIndex((prev) => prev - 1);
-    }
-  }
-
-  useEffect(() => {
-    if (currentSlideIndex === 0) {
-      setIsShowPrevButton(false);
-    } else if (currentSlideIndex === images.length - 1) {
-      setIsShowNextButton(false);
-    } else {
-      setIsShowPrevButton(true);
-      setIsShowNextButton(true);
-    }
-  }, [currentSlideIndex]);
-
-  return (
-    <div ref={ref} className="relative pb-4 overflow-x-clip">
-      {ref.current?.clientWidth && (
-        <>
-          <div
-            className="flex gap-4 px-6 transition-transform duration-300 max-sm:hidden"
-            style={{
-              transform: `translateX(calc(-${
-                ref.current.clientWidth * currentSlideIndex
-              }px + ${currentSlideIndex * 32}px))`,
-            }}
-          >
-            {images.map((image, index) => (
-              <img key={index} src={image} alt="" className="rounded-2xl" />
-            ))}
-          </div>
-          <div
-            className="flex gap-2 transition-transform duration-300 sm:hidden"
-            style={{
-              transform: `translateX(calc(-${
-                ref.current.clientWidth * currentSlideIndex
-              }px + ${currentSlideIndex * -8}px))`,
-            }}
-          >
-            {images.map((image, index) => (
-              <img key={index} src={image} alt="" className="rounded-2xl" />
-            ))}
-          </div>
-        </>
-      )}
-
-      <div className="absolute top-0 flex items-center justify-between w-full h-full px-4">
-        <button
-          className={`p-2.5 bg-[#FFFFFFCC] hover:bg-white hover:text-[#0D1922] rounded-full transition-all ${
-            isShowPrevButton ? "opacity-100" : "opacity-0 pointer-events-none"
-          }`}
-          onClick={prev}
-        >
-          <ArrowLeftIcon className="w-5 h-5" />
-        </button>
-        <button
-          className={`p-2.5 bg-[#FFFFFFCC] hover:bg-white hover:text-[#0D1922] rounded-full transition-all ${
-            isShowNextButton ? "opacity-100" : "opacity-0 pointer-events-none"
-          }`}
-          onClick={next}
-        >
-          <ArrowRightIcon className="w-5 h-5" />
-        </button>
-      </div>
-    </div>
-  );
-}
-
-export default SkyGardenSlider;
diff --git a/client/src/components/complexWingPage/SkygardenSidebar/SkygardenSidebar.tsx b/client/src/components/complexWingPage/SkygardenSidebar/SkygardenSidebar.tsx
index 402525f..ef9ba71 100644
--- a/client/src/components/complexWingPage/SkygardenSidebar/SkygardenSidebar.tsx
+++ b/client/src/components/complexWingPage/SkygardenSidebar/SkygardenSidebar.tsx
@@ -1,29 +1,28 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import AmphitheatreIcon from "../../icons/activities/AmphitheatreIcon";
-import BoulderingWallIcon from "../../icons/activities/BoulderingWallIcon";
-import ChangingRoomsIcon from "../../icons/activities/ChangingRoomsIcon";
-import ChessTablesIcon from "../../icons/activities/ChessTablesIcon";
-import ClimbingRoomIcon from "../../icons/activities/ClimbingRoomIcon";
-import CommunalDiningTablesIcon from "../../icons/activities/CommunalDiningTablesIcon";
-import IndoorLapPoolIcon from "../../icons/activities/IndoorLapPoolIcon";
-import LushLandscapeIcon from "../../icons/activities/LushLandscapeIcon";
-import MultiPurposeCourtIcon from "../../icons/activities/MultiPurposeCourtIcon";
-import OutdoorCinemaIcon from "../../icons/activities/OutdoorCinemaIcon";
-import OutdoorCoworkingSpaceIcon from "../../icons/activities/OutdoorCoworkingSpaceIcon";
-import PadelPongIcon from "../../icons/activities/PadelPongIcon";
-import PingPongInATableIcon from "../../icons/activities/PingPongInATableIcon";
-import RunningWheelIcon from "../../icons/activities/RunningWheelIcon";
-import SunLoungingDeckIcon from "../../icons/activities/SunLoungingDeckIcon";
-import SuspendedLoungingNetsIcon from "../../icons/activities/SuspendedLoungingNetsIcon";
-import WellnessFeaturesIcon from "../../icons/activities/WellnessFeaturesIcon";
+import AmphitheatreIcon from "../../icons/amenities/AmphitheatreIcon";
+import BoulderingWallIcon from "../../icons/amenities/BoulderingWallIcon";
+import ChangingRoomsIcon from "../../icons/amenities/ChangingRoomsIcon";
+import ChessTablesIcon from "../../icons/amenities/ChessTablesIcon";
+import ClimbingRoomIcon from "../../icons/amenities/ClimbingRoomIcon";
+import CommunalDiningTablesIcon from "../../icons/amenities/CommunalDiningTablesIcon";
+import IndoorLapPoolIcon from "../../icons/amenities/IndoorLapPoolIcon";
+import LushLandscapeIcon from "../../icons/amenities/LushLandscapeIcon";
+import MultiPurposeCourtIcon from "../../icons/amenities/MultiPurposeCourtIcon";
+import OutdoorCinemaIcon from "../../icons/amenities/OutdoorCinemaIcon";
+import OutdoorCoworkingSpaceIcon from "../../icons/amenities/OutdoorCoworkingSpaceIcon";
+import PadelPongIcon from "../../icons/amenities/PadelPongIcon";
+import PingPongInATableIcon from "../../icons/amenities/PingPongInATableIcon";
+import RunningWheelIcon from "../../icons/amenities/RunningWheelIcon";
+import SunLoungingDeckIcon from "../../icons/amenities/SunLoungingDeckIcon";
+import SuspendedLoungingNetsIcon from "../../icons/amenities/SuspendedLoungingNetsIcon";
+import WellnessFeaturesIcon from "../../icons/amenities/WellnessFeaturesIcon";
 import ActivityCard from "./ActivityCard";
 import LayoutSlider from "./LayoutSlider";
-import Button from "../../Button";
 import VideoIcon from "../../icons/VideoIcon";
 import useModal from "../../../store/useModal";
 import VirtualTourVideoModal from "../../modals/VirtualTourVideoModal";
 import CloseIcon from "../../icons/CloseIcon";
-import SkyGardenSlider from "./SkyGardenSlider";
+import Button3 from "../../Button3";
 
 interface ISkygardenSidebarProps {
   onMouseEnter: () => void;
@@ -41,31 +40,32 @@ const SkygardenSidebar = ({
       className="absolute h-full right-0 w-full z-30 bg-[#F3F3F2] flex flex-col top-[58px] space-y-6 overflow-y-scroll"
       onMouseOver={onMouseEnter}
     >
-      <div className="px-6 pt-6 flex justify-between">
+      <div className="flex justify-between px-6 pt-6">
         <div className="flex flex-col">
           <p className="text-2xl text-[#0D1922] font-semibold">Sky Garden</p>
           <p className="text-s text-[#73787C]">22-23 floor</p>
         </div>
-        <Button
-          buttonType="cta"
+        <Button3
           icon={<CloseIcon className="w-5 h-5" />}
+          onlyIcon
           onClick={onClick}
         />
       </div>
       <div className="px-6 space-y-8">
-        <div className="relative bg-white font-semibold text-caption-m rounded-2xl justify-center items-center flex flex-col gap-1">
+        <div className="relative flex flex-col items-center justify-center gap-1 font-semibold bg-white text-caption-m rounded-2xl">
           <LayoutSlider />
-          <Button
-            buttonType="secondary"
+          <Button3
+            variant="secondary"
             icon={<VideoIcon />}
-            text="Play video"
             className="absolute top-6 right-6 px-3.5 py-2.5 font-normal"
             onClick={() =>
               setModal(
                 <VirtualTourVideoModal videoHref="/videos/SkyGarden.mp4" />
               )
             }
-          />
+          >
+            Play video
+          </Button3>
         </div>
         <div className="space-y-6">
           <p className="text-xl text-[#0D1922] font-semibold">
@@ -136,7 +136,6 @@ const SkygardenSidebar = ({
         </div>
         {/* <ZoneSlider /> */}
       </div>
-      <SkyGardenSlider />
     </div>
   );
 };
diff --git a/client/src/components/complexWingPage/SkygardenSidebar/ZoneSlider.tsx b/client/src/components/complexWingPage/SkygardenSidebar/ZoneSlider.tsx
index 5c3a7dd..93556f4 100644
--- a/client/src/components/complexWingPage/SkygardenSidebar/ZoneSlider.tsx
+++ b/client/src/components/complexWingPage/SkygardenSidebar/ZoneSlider.tsx
@@ -2,10 +2,10 @@
 import { useSwipeable } from "react-swipeable";
 import { Image } from "../../../types/image";
 import { useLayoutEffect, useRef, useState } from "react";
-import Button from "../../Button";
 import LeftArrowSliderIcon from "../../icons/LeftArrowSliderIcon";
 import RightArrowSliderIcon from "../../icons/RightArrowSliderIcon";
 import { isMobile } from "react-device-detect";
+import Button3 from "../../Button3";
 
 const images: Image[] = [
   { id: "1", src: "/images/skyGardenSlider/1.jpg" },
@@ -78,22 +78,22 @@ const ZoneSlider = () => {
               src={image.src}
               alt=""
               // className="rounded-2xl sm:aspect-[6.6/3.7] object-cover pointer-events-none select-none"
-              className="rounded-2xl pointer-events-none select-none"
+              className="pointer-events-none select-none rounded-2xl"
             />
           ))}
         </div>
-        <Button
+        <Button3
           onClick={prev}
           icon={<LeftArrowSliderIcon />}
           className="absolute text-[#73787C] top-[calc(50%-22px)] left-8 hidden sm:block"
         />
-        <Button
+        <Button3
           onClick={next}
           icon={<RightArrowSliderIcon />}
           className="absolute text-[#73787C] top-[calc(50%-22px)] right-8 hidden sm:block"
         />
       </div>
-      <div className="self-center gap-1 sm:hidden flex">
+      <div className="flex self-center gap-1 sm:hidden">
         {images.map((image, index) => (
           <div
             key={image.id}
diff --git a/client/src/components/favoritesPage/FavoriteApartmentCard.tsx b/client/src/components/favoritesPage/FavoriteApartmentCard.tsx
index d204399..f88e0ca 100644
--- a/client/src/components/favoritesPage/FavoriteApartmentCard.tsx
+++ b/client/src/components/favoritesPage/FavoriteApartmentCard.tsx
@@ -1,17 +1,17 @@
 import { useNavigate } from "react-router-dom";
 // import { formatNumber } from "../../calc/formatNumber";
 import useModal from "../../store/useModal";
-import Button from "../Button";
 import BookingIcon from "../icons/BookingIcon";
 import HeartIcon from "../icons/Heart";
 import { SendEnquiryModal } from "../modals/SendEnquryModal";
 import { MobileModalWrapper } from "../modals/mobile/MobileModalWrapper";
 import SendEnquiryMobileModal from "../modals/mobile/SendEnquiryMobileModal";
 import { IAparmentRes } from "../../types/apartmentsRes";
-import useFavorites from "../../store/useFavorites";
+// import useFavorites from "../../store/useFavorites";
 import { apartmentRoutes } from "../../consts/apartmentsRoutes";
 import { apartmentLayoutImages } from "../../consts/apartmentLayoutsImages";
 import { unitTypeWithLayouts } from "../../consts/defaultApartmentTypes";
+import Button3 from "../Button3";
 
 interface FavoriteAppartmentCardProps {
   card: IAparmentRes;
@@ -21,7 +21,7 @@ const FavoriteAppartmentCard = ({ card }: FavoriteAppartmentCardProps) => {
   const { Floor, Unit_Type, Total_Area_Sqft, Unit_No } = card;
   const wing = Unit_No.split("-")[0] === "E" ? "East" : "West";
   const navigate = useNavigate();
-  const { setFavorites } = useFavorites();
+  // const { setFavorites } = useFavorites();
   const isLayoutType = unitTypeWithLayouts.some((type) => type === Unit_Type);
   const layoutImage = isLayoutType
     ? apartmentLayoutImages[Unit_Type]
@@ -45,67 +45,66 @@ const FavoriteAppartmentCard = ({ card }: FavoriteAppartmentCardProps) => {
     );
   };
 
-  const handleOnAddFavoriteClick = (
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent>
-  ) => {
-    e.stopPropagation();
-    const favorites = localStorage.getItem("Favorites");
+  // const handleOnAddFavoriteClick = (
+  //   e: React.MouseEvent<HTMLButtonElement, MouseEvent>
+  // ) => {
+  //   e.stopPropagation();
+  //   const favorites = localStorage.getItem("Favorites");
 
-    if (favorites) {
-      const _favorites = JSON.parse(favorites) as IAparmentRes[];
-      if (_favorites.some((apart) => apart.id === card.id)) {
-        const updatedFavorites = [..._favorites].filter(
-          (apart) => apart.id !== card.id
-        );
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      } else {
-        const updatedFavorites = [..._favorites, card];
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      }
-    }
-  };
+  //   if (favorites) {
+  //     const _favorites = JSON.parse(favorites) as IAparmentRes[];
+  //     if (_favorites.some((apart) => apart.id === card.id)) {
+  //       const updatedFavorites = [..._favorites].filter(
+  //         (apart) => apart.id !== card.id
+  //       );
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     } else {
+  //       const updatedFavorites = [..._favorites, card];
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     }
+  //   }
+  // };
 
   return (
     <>
       <div
-        className="bg-white flex flex-col p-4 rounded-2xl gap-4 cursor-pointer select-none"
+        className="flex flex-col gap-4 p-4 bg-white cursor-pointer select-none rounded-2xl"
         onClick={handleOnFavoriteCardClick}
       >
-        <div className="flex gap-4  justify-between">
-          <div className="flex gap-1 flex-col">
+        <div className="flex justify-between gap-4">
+          <div className="flex flex-col gap-1">
             <p className="text-[#00BED7] text-s leading-5">
               Rove Home {Unit_Type}
             </p>
             <div className="text-[#73787C] flex gap-2 items-center w-fit">
-              <p className="text-caption-m font-semibold leading-4">
+              <p className="font-semibold leading-4 text-caption-m">
                 {wing} Wing
               </p>
               <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-              <p className="text-caption-m font-semibold leading-4">
+              <p className="font-semibold leading-4 text-caption-m">
                 Floor {Floor}
               </p>
               <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-              <p className="text-caption-m font-semibold leading-4">
+              <p className="font-semibold leading-4 text-caption-m">
                 {Unit_No}
               </p>
             </div>
           </div>
-          <Button
-            onClick={handleOnAddFavoriteClick}
-            buttonType="favorite"
+          <Button3
             icon={<HeartIcon isFilled />}
-            isCircleRounded
+            roundedFull
+            // onClick={handleOnAddFavoriteClick}
           />
         </div>
-        <div className="w-full  aspect-square rounded-lg">
+        <div className="w-full rounded-lg aspect-square">
           <img
             src={layoutImage}
             alt=""
-            className="w-full aspect-square object-contain"
+            className="object-contain w-full aspect-square"
           />
         </div>
         <div className="flex flex-col gap-3">
@@ -118,18 +117,16 @@ const FavoriteAppartmentCard = ({ card }: FavoriteAppartmentCardProps) => {
               Unavailable
             </p>
           </div>
-          <Button
+          <Button3
             icon={<BookingIcon />}
-            text="Send Enquiry"
             className="justify-center hidden lg:flex"
-            buttonType="cta"
             onClick={handleOnSendEquiryClick}
-          />
-          <Button
+          >
+            Send Enquiry
+          </Button3>
+          <Button3
             icon={<BookingIcon />}
-            text="Send Enquiry"
-            className="justify-center lg:hidden flex"
-            buttonType="cta"
+            className="flex justify-center lg:hidden"
             onClick={handleOnMobileSendEquiryClick}
           />
         </div>
diff --git a/client/src/components/favoritesPage/FavoriteSlider.tsx b/client/src/components/favoritesPage/FavoriteSlider.tsx
index 72a30a8..88d1118 100644
--- a/client/src/components/favoritesPage/FavoriteSlider.tsx
+++ b/client/src/components/favoritesPage/FavoriteSlider.tsx
@@ -1,10 +1,11 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import { useState, useRef, useEffect } from "react";
 import FavoriteSliderCard from "./FavoriteSliderCard";
-import Button from "../Button";
 import RightArrowIcon from "../icons/RightArrowIcon";
 import LeftArrowIcon from "../icons/LeftArrowIcon";
 import { useSwipeable } from "react-swipeable";
 import useFavorites from "../../store/useFavorites";
+import Button3 from "../Button3";
 
 const FavoritesSlider = () => {
   const [offset, setOffset] = useState(0);
@@ -56,33 +57,33 @@ const FavoritesSlider = () => {
   return (
     <div className="w-[calc(100vw - 48px)] relative">
       <div
-        className="absolute -left-2 z-30"
+        className="absolute z-30 -left-2"
         style={{ top: `${buttonTopPos}px` }}
       >
-        <Button
-          buttonType="primary"
-          isCircleRounded
+        <Button3
           icon={<LeftArrowIcon />}
+          onlyIcon
+          roundedFull
           onClick={handleOnLeftBtnClick}
         />
       </div>
       <div
-        className="absolute -right-2 z-30"
+        className="absolute z-30 -right-2"
         style={{ top: `${buttonTopPos}px` }}
       >
-        <Button
-          buttonType="primary"
-          isCircleRounded
+        <Button3
           icon={<RightArrowIcon />}
+          onlyIcon
+          roundedFull
           onClick={handleOnRightBtnClick}
         />
       </div>
       <div className="w-full overflow-hidden" {...handlers}>
         <div
-          className="transition-all ease-in-out duration-300"
+          className="transition-all duration-300 ease-in-out"
           style={{ transform: `translateX(${offset * cardWidth}px)` }}
         >
-          <div className="flex w-fit gap-4">
+          <div className="flex gap-4 w-fit">
             {Array.from({ length: Math.ceil(favorites.length / cols) }).map(
               (_, index) => {
                 console.log("index", index);
diff --git a/client/src/components/favoritesPage/FavoriteSliderCard.tsx b/client/src/components/favoritesPage/FavoriteSliderCard.tsx
index 2d5652c..2b64ebb 100644
--- a/client/src/components/favoritesPage/FavoriteSliderCard.tsx
+++ b/client/src/components/favoritesPage/FavoriteSliderCard.tsx
@@ -2,9 +2,9 @@
 import { apartmentLayoutImages } from "../../consts/apartmentLayoutsImages";
 import { apartmentRoutes } from "../../consts/apartmentsRoutes";
 import { unitTypeWithLayouts } from "../../consts/defaultApartmentTypes";
-import useFavorites from "../../store/useFavorites";
+// import useFavorites from "../../store/useFavorites";
 import { IAparmentRes } from "../../types/apartmentsRes";
-import Button from "../Button";
+import Button3 from "../Button3";
 import BookingIcon from "../icons/BookingIcon";
 import HeartIcon from "../icons/Heart";
 
@@ -15,7 +15,7 @@ interface FavoriteSliderCardProps {
 
 const FavoriteSliderCard = ({ card, elementRef }: FavoriteSliderCardProps) => {
   const wing = card.Unit_No.split("-")[0] === "E" ? "East" : "West";
-  const { setFavorites } = useFavorites();
+  // const { setFavorites } = useFavorites();
   const isLayoutType = unitTypeWithLayouts.some(
     (type) => type === card.Unit_Type
   );
@@ -23,34 +23,34 @@ const FavoriteSliderCard = ({ card, elementRef }: FavoriteSliderCardProps) => {
     ? apartmentLayoutImages[card.Unit_Type]
     : apartmentRoutes.find((apr) => apr.type === card.Unit_Type)?.layout;
 
-  const handleOnAddFavoriteClick = (
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent>
-  ) => {
-    e.stopPropagation();
-    const favorites = localStorage.getItem("Favorites");
+  // const handleOnAddFavoriteClick = (
+  //   e: React.MouseEvent<HTMLButtonElement, MouseEvent>
+  // ) => {
+  //   e.stopPropagation();
+  //   const favorites = localStorage.getItem("Favorites");
 
-    if (favorites) {
-      const _favorites = JSON.parse(favorites) as IAparmentRes[];
-      if (_favorites.some((apart) => apart.id === card.id)) {
-        const updatedFavorites = [..._favorites].filter(
-          (apart) => apart.id !== card.id
-        );
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      } else {
-        const updatedFavorites = [..._favorites, card];
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      }
-    }
-  };
+  //   if (favorites) {
+  //     const _favorites = JSON.parse(favorites) as IAparmentRes[];
+  //     if (_favorites.some((apart) => apart.id === card.id)) {
+  //       const updatedFavorites = [..._favorites].filter(
+  //         (apart) => apart.id !== card.id
+  //       );
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     } else {
+  //       const updatedFavorites = [..._favorites, card];
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     }
+  //   }
+  // };
 
   return (
-    <div className="rounded-ss-2xl rounded-se-2xl flex flex-col overflow-clip gap-6 select-none">
+    <div className="flex flex-col gap-6 select-none rounded-ss-2xl rounded-se-2xl overflow-clip">
       <div
-        className="flex flex-col gap-4 bg-white p-4 rounded-2xl"
+        className="flex flex-col gap-4 p-4 bg-white rounded-2xl"
         ref={elementRef}
       >
         <div className="flex justify-between">
@@ -59,17 +59,17 @@ const FavoriteSliderCard = ({ card, elementRef }: FavoriteSliderCardProps) => {
               {card.Unit_Type}, {Number(card.Total_Area_Sqft).toFixed(2)} Sqft
             </h2>
           </div>
-          <Button
-            buttonType="favorite"
+          <Button3
             icon={<HeartIcon isFilled />}
-            isCircleRounded
-            onClick={handleOnAddFavoriteClick}
+            onlyIcon
+            roundedFull
+            // onClick={handleOnAddFavoriteClick}
           />
         </div>
         <img
           src={layoutImage}
           alt=""
-          className="w-full object-contain aspect-square pointer-events-none select-none"
+          className="object-contain w-full pointer-events-none select-none aspect-square"
         />
       </div>
       <div className="flex flex-col gap-1 pb-6 border-b">
@@ -81,7 +81,9 @@ const FavoriteSliderCard = ({ card, elementRef }: FavoriteSliderCardProps) => {
       </div>
       <div className="flex flex-col gap-1 pb-6 border-b">
         <p className="text-s text-[#73787C]">Total Area</p>
-        <p className="text-[#0D1922] text-m">{Number(card.Total_Area_Sqft).toFixed(2)} Sqft</p>
+        <p className="text-[#0D1922] text-m">
+          {Number(card.Total_Area_Sqft).toFixed(2)} Sqft
+        </p>
       </div>
       <div className="flex flex-col gap-1 pb-6 border-b">
         <p className="text-s text-[#73787C]">Project</p>
@@ -99,12 +101,9 @@ const FavoriteSliderCard = ({ card, elementRef }: FavoriteSliderCardProps) => {
         <p className="text-s text-[#73787C]">Number</p>
         <p className="text-[#0D1922] text-m">{card.Unit_No}</p>
       </div>
-      <Button
-        icon={<BookingIcon />}
-        text="Send Enquiry"
-        className="flex justify-center"
-        buttonType="cta"
-      />
+      <Button3 icon={<BookingIcon />} className="flex justify-center">
+        Send Enquiry
+      </Button3>
     </div>
   );
 };
diff --git a/client/src/components/header/Auth/Auth.tsx b/client/src/components/header/Auth/Auth.tsx
deleted file mode 100644
index 6d59e31..0000000
--- a/client/src/components/header/Auth/Auth.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { isMobile } from "react-device-detect";
-import AuthDesktop from "./AuthDesktop";
-import AuthMobile from "./AuthMobile";
-
-interface AuthProps {
-  isAuth?: boolean;
-}
-
-const Auth = ({ isAuth = false }: AuthProps) => {
-  const userName = "Full Name";
-
-  return (
-    <>
-      {isMobile ? (
-        <AuthMobile isAuth={isAuth} userName={userName} />
-      ) : (
-        <AuthDesktop isAuth={isAuth} userName={userName} />
-      )}
-    </>
-  );
-};
-
-export default Auth;
diff --git a/client/src/components/header/Auth/AuthDesktop.tsx b/client/src/components/header/Auth/AuthDesktop.tsx
deleted file mode 100644
index edc485f..0000000
--- a/client/src/components/header/Auth/AuthDesktop.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import useModal from "../../../store/useModal";
-import Button from "../../Button";
-import AuthIcon from "../../icons/AuthIcon";
-import LoginModal from "../../modals/auth/LoginModal";
-
-interface AuthProps {
-  isAuth: boolean;
-  userName: string;
-}
-
-const AuthDesktop = ({ isAuth, userName }: AuthProps) => {
-  const { setModal } = useModal();
-
-  const handleOnLoginBtnClick = () => {
-    setModal(<LoginModal />);
-  };
-
-  return (
-    <div className="flex gap-4 py-2 pr-6 text-black col-span-2 justify-end text-s">
-      {isAuth ? (
-        <>
-          <div>
-            <p className="">{userName}</p>
-            <p className="text-[#0D192266] text-caption-m font-semibold">
-              Company
-            </p>
-          </div>
-          <div className="rounded-full w-10 h-10 bg-[#E2E2DC] overflow-clip flex items-center justify-center font-semibold">
-            {/* <img src="" alt="avatar" className="bg-[#E2E2DC]" /> */}
-            FN
-          </div>
-        </>
-      ) : (
-        <Button
-          buttonType="cta"
-          text="Login"
-          onClick={handleOnLoginBtnClick}
-          icon={<AuthIcon />}
-        />
-      )}
-    </div>
-  );
-};
-
-export default AuthDesktop;
diff --git a/client/src/components/header/Auth/AuthMobile.tsx b/client/src/components/header/Auth/AuthMobile.tsx
deleted file mode 100644
index 8fb00ea..0000000
--- a/client/src/components/header/Auth/AuthMobile.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import Button from "../../Button";
-import AuthIcon from "../../icons/AuthIcon";
-
-interface AuthProps {
-  isAuth: boolean;
-  userName: string;
-}
-
-const AuthMobile = ({ isAuth, userName }: AuthProps) => {
-  return (
-    <>
-      {isAuth ? (
-        <div className="flex gap-4 text-black justify-start w-full items-center px-4 py-2 bg-white rounded-lg">
-          <p>{userName}</p>
-          <div className="rounded-full w-10 h-10 bg-[#E2E2DC] overflow-clip">
-            {/* <img src="" alt="avatar" className="bg-[#E2E2DC]" /> */}
-          </div>
-        </div>
-      ) : (
-        <div className="flex gap-4 text-black justify-center w-full items-center">
-          <Button
-            buttonType="cta"
-            text="Login"
-            icon={<AuthIcon />}
-            className="w-full justify-center"
-          />
-        </div>
-      )}
-    </>
-  );
-};
-
-export default AuthMobile;
diff --git a/client/src/components/header/Header/DesktopHeader.tsx b/client/src/components/header/Header/DesktopHeader.tsx
index 66ea59b..8d175e5 100644
--- a/client/src/components/header/Header/DesktopHeader.tsx
+++ b/client/src/components/header/Header/DesktopHeader.tsx
@@ -1,18 +1,15 @@
-import Auth from "../Auth/Auth";
+
 import Logo from "../../Logo";
 import Navbar from "../Navbar/Navbar";
 import Location from "../Location";
 
 const DesktopHeader = () => (
   <header className="bg-white fixed left-0 top-0 w-full z-[99999999] font-usual text-m select-none flex justify-between">
-    <div className="flex gap-4 col-span-2">
+    <div className="flex col-span-2 gap-4">
       <Logo />
       <Location />
     </div>
     <Navbar />
-    <div className="flex gap-5">
-      <Auth isAuth={false} />
-    </div>
   </header>
 );
 
diff --git a/client/src/components/header/Header/MobileHeader.tsx b/client/src/components/header/Header/MobileHeader.tsx
index f5204af..dcad246 100644
--- a/client/src/components/header/Header/MobileHeader.tsx
+++ b/client/src/components/header/Header/MobileHeader.tsx
@@ -1,13 +1,11 @@
 import { useState } from "react";
 import LogoIcon from "../../icons/LogoIcon";
-import Auth from "../Auth/Auth";
 import Navbar from "../Navbar/Navbar";
 import Location from "../Location";
 import BurgerMenuIcon from "../../icons/BurgerMenuIcon";
 
 const MobileHeader = () => {
   const [isToggled, setIsToggled] = useState(false);
-  const isAuth = false;
 
   const handleOnToggleClick = () => {
     setIsToggled((prev) => !prev);
@@ -31,16 +29,10 @@ const MobileHeader = () => {
         </div>
       </div>
       <div className="flex flex-col justify-between h-full items-end w-full p-4 bg-[#F3F3F2]">
-        {isAuth && (
-          <div className="pb-2 w-full">
-            <Auth isAuth={isAuth} />
-          </div>
-        )}
         <Navbar />
         <div className="py-3">
           <Location />
         </div>
-        {!isAuth && <Auth isAuth={isAuth} />}
       </div>
     </header>
   );
diff --git a/client/src/components/header/Navbar/NavbarTabDesktopBrochure.tsx b/client/src/components/header/Navbar/NavbarTabDesktopBrochure.tsx
index f9473f9..0572141 100644
--- a/client/src/components/header/Navbar/NavbarTabDesktopBrochure.tsx
+++ b/client/src/components/header/Navbar/NavbarTabDesktopBrochure.tsx
@@ -25,7 +25,7 @@ function NavbarTabDesktopBrochure({ tab }: Props) {
       {isShowMenu && (
         <div className="absolute top-[calc(100%+16px)] left-0 bg-[#F3F3F2] rounded-2xl p-4 flex flex-col gap-3 shadow-lg">
           <div className="space-y-2">
-            <div className="border-b pb-2">
+            <div className="pb-2 border-b">
               <p className="text-sm text-[#0D1922] text-left">
                 Rove Home Marasi Drive
               </p>
@@ -47,7 +47,7 @@ function NavbarTabDesktopBrochure({ tab }: Props) {
                 download
               >
                 <span className="text-xs font-semibold text-nowrap">
-                  Rove Amenties Brochure
+                  Rove Amenities Brochure
                 </span>
                 <DownloadIcon className="min-w-5 min-h-5" />
               </a>
@@ -64,7 +64,7 @@ function NavbarTabDesktopBrochure({ tab }: Props) {
             </div>
           </div>
           <div className="space-y-2">
-            <div className="border-b pb-2">
+            <div className="pb-2 border-b">
               <p className="text-sm text-[#0D1922] text-left">
                 Rove Home Downtown
               </p>
@@ -86,7 +86,7 @@ function NavbarTabDesktopBrochure({ tab }: Props) {
                 download
               >
                 <span className="text-xs font-semibold text-nowrap">
-                  Rove Amenties Brochure
+                  Rove Amenities Brochure
                 </span>
                 <DownloadIcon className="min-w-5 min-h-5" />
               </a>
diff --git a/client/src/components/icons/activities/CommunalDiningTablesIcon.tsx b/client/src/components/icons/activities/CommunalDiningTablesIcon.tsx
deleted file mode 100644
index e4bf82a..0000000
--- a/client/src/components/icons/activities/CommunalDiningTablesIcon.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-const CommunalDiningTablesIcon = () => {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      // width="56"
-      // height="56"
-      fill="none"
-      viewBox="0 0 56 56"
-    >
-      <path
-        fill="currentColor"
-        d="M10.194 26.768h35.6v-1.315L38.99 18.5H17.007l-6.803 6.953v1.315h-.01zm37.214 1.65H8.569v-3.654l7.754-7.924h23.321l7.754 7.924v3.654h.01z"
-      ></path>
-      <path
-        fill="currentColor"
-        d="M18.284 27.593H16.67v6.62h1.614v-6.62zM13.431 27.593h-1.614v11.578h1.614V27.593zM39.317 27.593h-1.614v6.62h1.614v-6.62zM44.169 27.593h-1.614v11.578h1.614V27.593z"
-      ></path>
-    </svg>
-  );
-};
-
-export default CommunalDiningTablesIcon;
diff --git a/client/src/components/icons/activities/AmphitheatreIcon.tsx b/client/src/components/icons/amenities/AmphitheatreIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/AmphitheatreIcon.tsx
rename to client/src/components/icons/amenities/AmphitheatreIcon.tsx
diff --git a/client/src/components/icons/amenities/AquaCyclingIcon.tsx b/client/src/components/icons/amenities/AquaCyclingIcon.tsx
new file mode 100644
index 0000000..b515feb
--- /dev/null
+++ b/client/src/components/icons/amenities/AquaCyclingIcon.tsx
@@ -0,0 +1,80 @@
+function AquaCyclingIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M28.4589 32.9829C28.4589 32.9829 28.4589 32.9715 28.4589 32.96C28.4589 32.9371 28.4589 32.9257 28.4589 32.9028C28.4589 32.8914 28.4589 32.8799 28.4589 32.8685C28.4589 32.857 28.4589 32.8341 28.4589 32.8227C28.4589 32.8112 28.4589 32.7884 28.4589 32.7769C28.4589 32.7655 28.4589 32.754 28.4589 32.7426C28.4589 32.7311 28.4589 32.7082 28.4589 32.6968C28.4589 32.6968 28.4589 32.6739 28.4589 32.6625C28.4589 32.6396 28.4589 32.6281 28.4589 32.6167C28.4589 32.6052 28.4589 32.5938 28.4589 32.5823C28.4589 32.5709 28.4589 32.548 28.4474 32.5365C28.4474 32.5251 28.4474 32.5137 28.436 32.5022C28.436 32.4908 28.436 32.4793 28.4246 32.4679C28.4246 32.4564 28.4131 32.4336 28.4016 32.4221C28.4016 32.4221 28.3902 32.3992 28.3788 32.3877C28.3788 32.3763 28.3559 32.3649 28.3559 32.342C28.3559 32.342 28.3444 32.3191 28.333 32.3077C28.3215 32.2962 28.3101 32.2848 28.2986 32.2733C28.2986 32.2733 28.2872 32.2504 28.2758 32.239C28.2758 32.2275 28.2529 32.2161 28.2414 32.2047C28.2414 32.2047 28.2185 32.1818 28.2071 32.1703C28.2071 32.1703 28.1842 32.1474 28.1728 32.1474C28.1613 32.136 28.1499 32.1245 28.127 32.1131C28.127 32.1131 28.1269 32.1131 28.1155 32.1016L23.0795 28.4849C22.4043 28.0042 22.0151 27.2259 22.0151 26.4018C22.0151 25.5892 22.4386 24.8223 23.1139 24.3416L30.4046 19.2713C30.8967 18.928 31.5034 18.8021 32.0985 18.928C32.6937 19.0539 33.2087 19.4087 33.5177 19.9237L36.6309 24.9826C36.6309 24.9826 36.6309 24.994 36.6423 25.0055C36.8598 25.3488 37.226 25.5549 37.6266 25.5778L43.5325 25.841C43.7957 25.8525 44.0246 26.0012 44.1391 26.2302C44.265 26.4591 44.2535 26.7452 44.1047 26.9626C43.9674 27.1915 43.727 27.3175 43.4638 27.306L36.4592 26.997C36.2418 26.997 36.0586 26.8711 35.9442 26.688L33.9641 23.4718C33.7924 23.1857 33.4948 22.9796 33.1515 22.911C32.8196 22.8423 32.4648 22.911 32.1901 23.1055L27.0625 26.6765C26.7306 26.9054 26.536 27.2717 26.536 27.6608C26.536 28.0614 26.7306 28.4391 27.0511 28.6794L30.5076 31.186C30.7708 31.3691 30.8967 31.6782 30.8395 31.9872L29.8781 37.252C30.5076 37.2292 31.1257 37.149 31.7437 37.0117L32.6021 32.2962C32.7852 31.3005 32.3847 30.3161 31.5606 29.721L28.7336 27.6722L32.728 24.891L34.4105 27.615C34.834 28.3018 35.5665 28.7367 36.3791 28.771L43.3837 29.08C44.2764 29.1144 45.1348 28.668 45.6155 27.9126C46.0963 27.1572 46.142 26.1843 45.73 25.3832C45.318 24.582 44.5053 24.0669 43.6126 24.0212L38.0044 23.7808L35.0514 18.9738C34.4791 18.0467 33.5406 17.3828 32.4648 17.1654C31.4004 16.9365 30.2787 17.1654 29.386 17.7949L22.0952 22.8652C20.9393 23.6664 20.2411 24.9826 20.2296 26.3789C20.2182 27.7753 20.8935 29.1144 22.038 29.927L26.6162 33.2233L25.9752 36.7485C26.5475 36.9202 27.1426 37.0575 27.7264 37.1376L28.4818 32.9829H28.4589Z"
+        fill="currentColor"
+      />
+      <path
+        d="M39.2402 13.7891C40.4076 13.8463 41.3118 14.8306 41.2546 15.9981C41.2088 17.1655 40.2131 18.0697 39.0457 18.0239C37.8782 17.9781 36.974 16.9824 37.0313 15.8149C37.077 14.6475 38.0728 13.7433 39.2402 13.7891ZM38.977 19.8094C41.1287 19.9009 42.96 18.2299 43.0516 16.0782C43.1431 13.9264 41.4721 12.0952 39.3203 12.0036C37.1686 11.912 35.3373 13.5831 35.2458 15.7348C35.1542 17.8865 36.8253 19.7178 38.977 19.8094Z"
+        fill="currentColor"
+      />
+      <path
+        d="M17.0698 31.2321C19.4733 31.3351 21.4648 32.9374 22.1744 35.1006C22.8611 35.3753 23.5364 35.6843 24.2003 36.0391C23.8111 32.4681 20.8467 29.6068 17.1499 29.4466C13.7391 29.2978 10.7519 31.4953 9.76758 34.597C10.5001 34.3681 11.2326 34.1964 11.9537 34.0591C12.9723 32.2965 14.9066 31.1405 17.0812 31.2435"
+        fill="currentColor"
+      />
+      <path
+        d="M34.6847 35.9588C35.4974 33.704 37.7063 32.1474 40.2243 32.2505C41.9869 32.3306 43.5206 33.2119 44.4934 34.5167C45.2603 34.6197 46.0271 34.7684 46.8054 34.963C45.7181 32.4221 43.2459 30.5795 40.3044 30.4536C36.4702 30.2819 33.1854 33.0745 32.6475 36.7829C33.3342 36.5768 34.0209 36.3021 34.6733 35.9702C34.6733 35.9702 34.6733 35.9702 34.6847 35.9702"
+        fill="currentColor"
+      />
+      <path
+        d="M48.7066 35.5354C48.0771 35.3065 47.4361 35.1234 46.8066 34.9631C47.1042 35.6613 47.2988 36.4167 47.3675 37.2065C47.5849 37.2751 47.8138 37.3438 48.0313 37.4239C48.5578 37.6071 49.1301 37.3324 49.3132 36.8059C49.4963 36.2794 49.2216 35.7071 48.6951 35.524"
+        fill="currentColor"
+      />
+      <path
+        d="M9.7569 34.5969C9.31053 34.7343 8.8756 34.883 8.42923 35.0433C8.33767 35.0776 8.24608 35.1119 8.15452 35.1463C7.63947 35.3523 7.38768 35.936 7.58225 36.4511C7.78826 36.9661 8.372 37.2179 8.88704 37.0233C8.96716 36.989 9.04728 36.9661 9.13884 36.9318C9.2304 36.8974 9.3105 36.8631 9.40206 36.8288C9.40206 36.7257 9.40206 36.6342 9.40206 36.5312C9.4364 35.8559 9.55087 35.215 9.74545 34.5969"
+        fill="currentColor"
+      />
+      <path
+        d="M39.205 34.597C37.9689 34.803 36.7328 35.1349 35.5081 35.5813H35.4623V35.6042C35.1991 35.7072 34.9473 35.8217 34.7069 35.959C34.5124 36.4855 34.3979 37.0463 34.375 37.63C34.375 37.8589 34.375 38.0879 34.3865 38.3168C34.8099 38.1451 35.2334 37.9505 35.6455 37.733C35.6569 37.733 35.6798 37.7102 35.6912 37.7102C35.8515 37.63 36.0117 37.5499 36.1719 37.4812H36.2063C37.305 37.0692 38.4381 36.7602 39.5369 36.577C41.4712 36.2566 43.4626 36.3024 45.4885 36.7144C45.3168 35.9018 44.9735 35.1578 44.5042 34.5169C42.7073 34.2765 40.9447 34.3109 39.2164 34.597"
+        fill="currentColor"
+      />
+      <path
+        d="M32.6488 36.7827C32.3512 36.8743 32.0536 36.9429 31.7446 37.0116L31.3555 39.129C31.7904 39.0603 32.2139 38.9802 32.6259 38.8772C32.5687 38.4423 32.5458 37.9959 32.5687 37.5381C32.5687 37.2863 32.603 37.0345 32.6373 36.7827"
+        fill="currentColor"
+      />
+      <path
+        d="M24.4759 36.1879C24.3843 36.1421 24.2928 36.0848 24.2012 36.0391C24.247 36.4168 24.2584 36.7945 24.2356 37.1836C24.2241 37.5384 24.1783 37.8818 24.1211 38.2251C24.6132 38.4312 25.1054 38.6029 25.5976 38.7402L25.9638 36.7487C25.4602 36.5999 24.9681 36.4053 24.4759 36.1879Z"
+        fill="currentColor"
+      />
+      <path
+        d="M15.5951 33.7385C14.3933 33.7156 13.1801 33.83 11.944 34.0589C11.5663 34.7228 11.3145 35.4667 11.2344 36.2679C12.6994 35.8902 14.153 35.7185 15.5722 35.7414C17.8155 35.7758 20.1618 36.348 22.428 37.401C22.428 37.298 22.4395 37.2064 22.4509 37.1034C22.4852 36.4053 22.3822 35.73 22.1762 35.1119C20.0016 34.242 17.7583 33.7728 15.6065 33.7385"
+        fill="currentColor"
+      />
+      <path
+        d="M27.7044 37.1377L27.3496 39.1177C27.8303 39.1864 28.311 39.2436 28.7917 39.255C29.0321 39.255 29.2724 39.2665 29.5128 39.2665L29.879 37.2407C29.158 37.275 28.4255 37.2407 27.7044 37.1262"
+        fill="currentColor"
+      />
+      <path
+        d="M29.877 37.2523L29.5107 39.2782C29.5107 39.2782 29.6023 39.2782 29.6595 39.2782C30.2318 39.2667 30.8041 39.2209 31.3649 39.1294L31.754 37.012C31.136 37.1379 30.518 37.218 29.8885 37.2523"
+        fill="currentColor"
+      />
+      <path
+        d="M27.7033 37.1379C27.1196 37.0464 26.5359 36.9205 25.9522 36.7488L25.5859 38.7403C26.1582 38.912 26.7534 39.0378 27.3371 39.1294L27.6919 37.1493L27.7033 37.1379Z"
+        fill="currentColor"
+      />
+      <path
+        d="M24.1997 36.0388C23.5359 35.684 22.8491 35.375 22.1738 35.1003C22.3798 35.7298 22.4714 36.3937 22.4485 37.0918C22.4485 37.1948 22.4485 37.2979 22.4256 37.3894C22.8033 37.5611 23.181 37.7557 23.5473 37.9617C23.5702 37.9617 23.5931 37.9846 23.6045 37.996C23.7762 38.0761 23.9364 38.1448 24.1081 38.2135C24.1653 37.8701 24.2111 37.5268 24.2226 37.172C24.234 36.7828 24.2226 36.4051 24.1882 36.0274"
+        fill="currentColor"
+      />
+      <path
+        d="M11.9435 34.0588C11.211 34.1962 10.49 34.3793 9.75745 34.5968C9.56287 35.2148 9.43695 35.8558 9.41406 36.5311C9.41406 36.6341 9.41406 36.7256 9.41406 36.8286C10.0207 36.6111 10.6273 36.428 11.2339 36.2678C11.314 35.4666 11.5658 34.7112 11.9435 34.0588Z"
+        fill="currentColor"
+      />
+      <path
+        d="M44.4932 34.5166C44.9739 35.1575 45.3173 35.913 45.4775 36.7141C46.107 36.84 46.7365 37.0003 47.366 37.2063C47.2973 36.4165 47.1027 35.6611 46.8052 34.963C46.0269 34.7684 45.26 34.6196 44.4932 34.5166Z"
+        fill="currentColor"
+      />
+      <path
+        d="M34.3649 37.6183C34.3877 37.0346 34.5022 36.4738 34.6968 35.9473C34.6968 35.9473 34.6968 35.9473 34.6853 35.9473C34.0329 36.2906 33.3462 36.5539 32.6595 36.7599C32.6251 37.0117 32.6022 37.2635 32.5908 37.5153C32.5679 37.9731 32.5908 38.408 32.648 38.843C33.2432 38.6942 33.8155 38.511 34.3877 38.2821C34.3648 38.0532 34.3648 37.8243 34.3763 37.5954"
+        fill="currentColor"
+      />
+      <path
+        d="M48.5228 39.8958C45.7415 38.8886 42.8573 38.5223 39.9501 38.8085C38.5538 38.9458 37.0659 39.3006 35.2804 39.9416C35.2804 39.9416 35.2804 39.9416 35.269 39.9416C35.269 39.9416 35.269 39.9416 35.2575 39.9416C35.0057 40.0446 34.7539 40.159 34.5135 40.2849C31.3546 42.0361 27.5319 42.1276 24.2928 40.5138C22.1983 39.3578 19.9893 38.6139 17.7002 38.2934C15.3654 37.9615 13.0077 38.0759 10.6842 38.6482C9.7915 38.8657 8.8873 39.1518 7.99456 39.4837C7.47952 39.6783 7.21626 40.262 7.41083 40.7771C7.6054 41.2921 8.18913 41.5554 8.70417 41.3608C9.51679 41.0518 10.3408 40.7885 11.1535 40.5939C15.2967 39.5868 19.5201 40.1705 23.3543 42.2993C23.3886 42.3222 23.4229 42.3336 23.4573 42.3451C25.0825 43.1463 26.8451 43.5812 28.6077 43.6613C30.9655 43.7643 33.3347 43.2264 35.4521 42.0475C35.6123 41.9559 35.784 41.8758 35.9557 41.8072C37.5809 41.2234 38.9086 40.903 40.1333 40.7885C42.7428 40.5367 45.3295 40.8572 47.8246 41.7728C48.3396 41.9674 48.9233 41.6927 49.1064 41.1777C49.2896 40.6512 49.0263 40.0789 48.4998 39.8958"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default AquaCyclingIcon;
diff --git a/client/src/components/icons/amenities/ArcadeGamesIcon.tsx b/client/src/components/icons/amenities/ArcadeGamesIcon.tsx
new file mode 100644
index 0000000..e7b7a89
--- /dev/null
+++ b/client/src/components/icons/amenities/ArcadeGamesIcon.tsx
@@ -0,0 +1,75 @@
+function ArcadeGamesIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M41.13 39.0698H15V43.1398H41.13V39.0698Z"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M39.1198 16.07H18.7698H17.0098V12H39.1198V16.07Z"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M38.1505 16.0698H17.9805V31.1098H38.1505V16.0698Z"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M40.2304 38.4L38.1504 31.03"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M15.8604 38.4L17.9804 31.03"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M32.3604 35.5099V32.8499"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M34.1103 31.0898C34.1103 32.0698 33.3203 32.8598 32.3403 32.8598C31.3603 32.8598 30.5703 32.0698 30.5703 31.0898C30.5703 30.1098 31.3603 29.3198 32.3403 29.3198C33.3203 29.3198 34.1103 30.1098 34.1103 31.0898Z"
+        fill="white"
+      />
+      <path
+        d="M34.1103 31.0898C34.1103 32.0698 33.3203 32.8598 32.3403 32.8598C31.3603 32.8598 30.5703 32.0698 30.5703 31.0898C30.5703 30.1098 31.3603 29.3198 32.3403 29.3198C33.3203 29.3198 34.1103 30.1098 34.1103 31.0898Z"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M22.4902 35.0798H23.2602"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M26.1104 35.0798H26.8804"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+export default ArcadeGamesIcon;
diff --git a/client/src/components/icons/amenities/BBQTerraceIcon.tsx b/client/src/components/icons/amenities/BBQTerraceIcon.tsx
new file mode 100644
index 0000000..9db1827
--- /dev/null
+++ b/client/src/components/icons/amenities/BBQTerraceIcon.tsx
@@ -0,0 +1,32 @@
+function BBQTerraceIcon() {
+  return (
+    <svg
+      viewBox="0 0 56 56"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M41.38 22.9001H14.79C15.04 30.2401 20.97 36.0901 28.09 36.0901C35.21 36.0901 41.14 30.2301 41.39 22.9001M39.45 24.6302C38.43 30.1302 33.66 34.3502 28.1 34.3502C22.54 34.3502 17.77 30.1302 16.75 24.6302H39.46H39.45Z"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M24.2809 34.1629L22.3259 39.972L20.6768 39.417L22.6317 33.6079L24.2809 34.1629ZM33.6116 33.6489L36.5199 44.8228L34.836 45.2611L33.7659 41.1496L23.0071 41.1283L23.0105 39.3883L33.3128 39.4087L31.9277 34.0872L33.6116 33.6489Z"
+        fill="currentColor"
+      />
+      <path
+        d="M21.2996 38.8901C19.3696 38.8901 17.8096 40.4401 17.8096 42.3601C17.8096 44.2801 19.3696 45.8301 21.2996 45.8301C23.2296 45.8301 24.7896 44.2801 24.7896 42.3601C24.7896 40.4401 23.2196 38.8901 21.2996 38.8901ZM21.2996 40.6201C22.2596 40.6201 23.0396 41.4001 23.0396 42.3501C23.0396 43.3001 22.2596 44.0801 21.2996 44.0801C20.3396 44.0801 19.5596 43.3001 19.5596 42.3501C19.5596 41.4001 20.3396 40.6201 21.2996 40.6201Z"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M24.6401 11.2838L24.0382 11.912C23.0713 12.9213 22.9052 13.5088 22.9066 13.8314C22.908 14.1694 23.0809 14.4736 23.4722 15.0031C23.4994 15.04 23.5282 15.0785 23.5581 15.1185C23.8973 15.5718 24.3853 16.2242 24.5142 17.0482C24.6663 18.0205 24.3165 19.0352 23.3998 20.1831L22.857 20.8629L21.4973 19.7771L22.0402 19.0973C22.7885 18.1602 22.8437 17.6274 22.7951 17.3171C22.7351 16.9334 22.4966 16.6107 22.0793 16.046L22.0728 16.0372C21.7067 15.5417 21.1708 14.8135 21.1666 13.8389C21.1623 12.849 21.6938 11.844 22.7818 10.7083L23.3836 10.0801L24.6401 11.2838ZM33.6801 11.2838L33.0782 11.912C32.1113 12.9213 31.9452 13.5088 31.9466 13.8314C31.948 14.1694 32.1209 14.4736 32.5122 15.0031C32.5394 15.04 32.5682 15.0785 32.5982 15.1185C32.9373 15.5718 33.4253 16.2242 33.5543 17.0482C33.7063 18.0205 33.3565 19.0352 32.4398 20.1831L31.897 20.8629L30.5373 19.7771L31.0802 19.0973C31.8285 18.1602 31.8837 17.6274 31.8352 17.3171C31.7751 16.9334 31.5366 16.6107 31.1193 16.046L31.1128 16.0372C30.7467 15.5417 30.2108 14.8135 30.2066 13.8389C30.2023 12.849 30.7338 11.844 31.8218 10.7083L32.4237 10.0801L33.6801 11.2838ZM29.16 11.2823L28.559 11.9113C27.5947 12.9202 27.4292 13.5077 27.4308 13.8308C27.4325 14.1695 27.6056 14.4741 27.9963 15.0037C28.0234 15.0404 28.052 15.0786 28.0817 15.1184C28.4204 15.572 28.9078 16.2247 29.0358 17.0492C29.1866 18.0211 28.8363 19.0354 27.9198 20.1831L27.3769 20.8629L26.0173 19.7771L26.5602 19.0973C27.3087 18.1599 27.3646 17.6267 27.3164 17.3161C27.2568 16.932 27.0185 16.6091 26.6011 16.0434L26.5962 16.0367C26.2306 15.5412 25.6957 14.8134 25.6908 13.8395C25.6858 12.8501 26.2153 11.8451 27.301 10.7091L27.9021 10.0801L29.16 11.2823ZM9 23.4202H13.52V25.1602H9V23.4202ZM42.1 23.4202H46.62V25.1602H42.1V23.4202Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default BBQTerraceIcon;
diff --git a/client/src/components/icons/activities/BoulderingWallIcon.tsx b/client/src/components/icons/amenities/BoulderingWallIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/BoulderingWallIcon.tsx
rename to client/src/components/icons/amenities/BoulderingWallIcon.tsx
diff --git a/client/src/components/icons/activities/BurgerIcon.tsx b/client/src/components/icons/amenities/BurgerIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/BurgerIcon.tsx
rename to client/src/components/icons/amenities/BurgerIcon.tsx
diff --git a/client/src/components/icons/amenities/CabanasWithDaybedsIcon.tsx b/client/src/components/icons/amenities/CabanasWithDaybedsIcon.tsx
new file mode 100644
index 0000000..685b5e2
--- /dev/null
+++ b/client/src/components/icons/amenities/CabanasWithDaybedsIcon.tsx
@@ -0,0 +1,52 @@
+function CabanasWithDaybedsIcon() {
+  return (
+    <svg
+      viewBox="0 0 56 56"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M41.0201 44.0449H14.6901C14.3501 44.0449 14.0801 43.7649 14.0801 43.4149V22.9049C14.0801 22.5549 14.3501 22.2749 14.6901 22.2749C15.0301 22.2749 15.3001 22.5549 15.3001 22.9049V42.7849H40.4101V22.9049C40.4101 22.5549 40.6801 22.2749 41.0201 22.2749C41.3601 22.2749 41.6301 22.5549 41.6301 22.9049V43.4149C41.6301 43.7649 41.3601 44.0449 41.0201 44.0449Z"
+        fill="currentColor"
+      />
+      <path
+        d="M13.22 22.275H42.49V21.675C42.49 20.975 41.94 20.405 41.26 20.405H14.45C13.77 20.405 13.22 20.975 13.22 21.675V22.275ZM43.1 23.535H12.61C12.27 23.535 12 23.255 12 22.905V21.675C12 20.275 13.1 19.145 14.45 19.135H41.26C42.61 19.135 43.71 20.275 43.71 21.675V22.905C43.71 23.255 43.44 23.535 43.1 23.535Z"
+        fill="currentColor"
+      />
+      <path
+        d="M41.0199 20.405C40.8999 20.405 40.7799 20.365 40.6799 20.295L30.1599 12.895C28.9599 12.045 26.7699 12.045 25.5699 12.895L15.0499 20.295C14.7799 20.495 14.3999 20.425 14.1999 20.145C13.9999 19.865 14.0699 19.465 14.3399 19.265C14.3399 19.265 14.3499 19.265 14.3599 19.255L24.8799 11.855C26.4999 10.715 29.2299 10.715 30.8499 11.855L41.3699 19.255C41.6499 19.455 41.7199 19.845 41.5299 20.135C41.4199 20.305 41.2299 20.405 41.0299 20.405H41.0199Z"
+        fill="currentColor"
+      />
+      <path
+        d="M16.4602 40.5049C15.7702 40.5049 15.0902 40.3349 14.4202 39.9749C14.1202 39.8249 14.0002 39.4449 14.1402 39.1349C14.2902 38.8249 14.6602 38.6948 14.9602 38.8448C14.9602 38.8448 14.9603 38.8448 14.9703 38.8448C15.7603 39.2648 16.5502 39.3448 17.3802 39.0948L14.1702 33.4749C14.0002 33.1749 14.0902 32.7849 14.3802 32.6149C14.4502 32.5749 14.5202 32.5449 14.6002 32.5349C18.3602 31.9649 21.0102 30.1649 22.4802 27.1949C23.5802 24.9749 23.5802 22.9248 23.5802 22.9048C23.5802 22.5548 23.8503 22.2749 24.1903 22.2649C24.5303 22.2649 24.8002 22.5449 24.8002 22.8849C24.8002 22.9849 24.8002 25.2649 23.5702 27.7549C22.8602 29.2049 21.8302 30.4549 20.5702 31.4249C19.2102 32.4649 17.5603 33.1949 15.6603 33.6049L18.7803 39.0749C18.9503 39.3749 18.8503 39.7649 18.5603 39.9349C18.5503 39.9349 18.5302 39.9548 18.5202 39.9648C17.8202 40.3148 17.1302 40.4849 16.4502 40.4849"
+        fill="currentColor"
+      />
+      <path
+        d="M39.2601 40.5049C38.5701 40.5049 37.8802 40.3349 37.1902 39.9849C36.8902 39.8349 36.7602 39.455 36.9102 39.145C36.9102 39.125 36.9201 39.1149 36.9301 39.0949L40.0501 33.6249C38.1401 33.2249 36.5001 32.4949 35.1401 31.4449C33.8801 30.4749 32.8501 29.2149 32.1401 27.7749C30.9101 25.2849 30.9102 23.0049 30.9102 22.9049C30.9102 22.5549 31.1801 22.2849 31.5201 22.2849C31.8601 22.2849 32.1301 22.5749 32.1201 22.9149C32.1201 22.9449 32.1201 25.0349 33.2401 27.2449C34.7101 30.1849 37.3601 31.9649 41.1001 32.5349C41.4301 32.5849 41.6601 32.9049 41.6101 33.2449C41.6001 33.3249 41.5702 33.4049 41.5302 33.4749L38.3201 39.0949C39.1401 39.3449 39.9301 39.2649 40.7301 38.8449C41.0301 38.6849 41.4001 38.8049 41.5501 39.1149C41.7001 39.4249 41.5901 39.8049 41.2901 39.9649C41.2901 39.9649 41.2902 39.9649 41.2802 39.9649C40.6102 40.3149 39.9301 40.4949 39.2401 40.4949"
+        fill="currentColor"
+      />
+      <path
+        d="M35.2001 44.0448C34.8601 44.0448 34.5901 43.7648 34.5901 43.4148V38.6848H21.1301V43.4148C21.1301 43.7648 20.8601 44.0448 20.5201 44.0448C20.1801 44.0448 19.9102 43.7648 19.9102 43.4148V38.0548C19.9102 37.7048 20.1801 37.4248 20.5201 37.4248H35.1902C35.5302 37.4248 35.8001 37.7048 35.8001 38.0548V43.4148C35.8001 43.7648 35.5302 44.0448 35.1902 44.0448"
+        fill="currentColor"
+      />
+      <path
+        d="M26.32 38.6848C25.98 38.6848 25.71 38.4048 25.71 38.0548V36.2948C25.71 35.8648 25.55 35.4448 25.26 35.1348C24.99 34.8348 24.61 34.6648 24.21 34.6648C23.39 34.6648 22.72 35.3948 22.72 36.2848V38.0448C22.72 38.3948 22.45 38.6748 22.11 38.6748C21.77 38.6748 21.5 38.3948 21.5 38.0448V36.2848C21.5 34.6948 22.72 33.4048 24.21 33.4048C24.94 33.4048 25.63 33.7148 26.14 34.2548C26.65 34.8048 26.93 35.5248 26.93 36.2848V38.0448C26.93 38.3948 26.66 38.6748 26.32 38.6748"
+        fill="currentColor"
+      />
+      <path
+        d="M33.6 38.6848C33.26 38.6848 32.9901 38.4048 32.9901 38.0548V36.2948C32.9901 35.8648 32.83 35.4448 32.55 35.1348C32.28 34.8348 31.9001 34.6648 31.5001 34.6648C30.6801 34.6648 30.01 35.3948 30.01 36.2848V38.0448C30.01 38.3948 29.7401 38.6748 29.4001 38.6748C29.0601 38.6748 28.79 38.3948 28.79 38.0448V36.2848C28.79 34.6948 30.0101 33.4048 31.5001 33.4048C32.2301 33.4048 32.92 33.7148 33.42 34.2548C33.93 34.8048 34.2101 35.5248 34.2101 36.2848V38.0448C34.2101 38.3948 33.94 38.6748 33.6 38.6748"
+        fill="currentColor"
+      />
+      <path
+        d="M27.86 26.705C27.52 26.705 27.25 26.425 27.25 26.075V22.9049C27.25 22.5549 27.52 22.2749 27.86 22.2749C28.2 22.2749 28.47 22.5549 28.47 22.9049V26.075C28.47 26.425 28.2 26.705 27.86 26.705Z"
+        fill="currentColor"
+      />
+      <path
+        d="M27.8601 26.7051C27.4401 26.7051 27.0901 27.0651 27.0901 27.4951C27.0901 27.9351 27.4301 28.285 27.8601 28.285C28.2901 28.285 28.6301 27.9351 28.6301 27.4951C28.6301 27.0551 28.2801 26.7051 27.8601 26.6951M27.8601 29.545C26.7601 29.545 25.8701 28.6251 25.8701 27.4951C25.8701 26.3551 26.7601 25.4351 27.8601 25.4351C28.9601 25.4351 29.8501 26.355 29.8501 27.485C29.8501 28.615 28.9601 29.535 27.8601 29.535"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default CabanasWithDaybedsIcon;
diff --git a/client/src/components/icons/activities/ChangingRoomsIcon.tsx b/client/src/components/icons/amenities/ChangingRoomsIcon.tsx
similarity index 93%
rename from client/src/components/icons/activities/ChangingRoomsIcon.tsx
rename to client/src/components/icons/amenities/ChangingRoomsIcon.tsx
index 0752193..a71d4db 100644
--- a/client/src/components/icons/activities/ChangingRoomsIcon.tsx
+++ b/client/src/components/icons/amenities/ChangingRoomsIcon.tsx
@@ -2,8 +2,6 @@ function ChangingRoomsIcon() {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      // width="56"
-      // height="56"
       fill="none"
       viewBox="0 0 56 56"
     >
diff --git a/client/src/components/icons/activities/ChessTablesIcon.tsx b/client/src/components/icons/amenities/ChessTablesIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/ChessTablesIcon.tsx
rename to client/src/components/icons/amenities/ChessTablesIcon.tsx
diff --git a/client/src/components/icons/activities/ClimbingRoomIcon.tsx b/client/src/components/icons/amenities/ClimbingRoomIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/ClimbingRoomIcon.tsx
rename to client/src/components/icons/amenities/ClimbingRoomIcon.tsx
diff --git a/client/src/components/icons/amenities/ClimbingWallIcon.tsx b/client/src/components/icons/amenities/ClimbingWallIcon.tsx
new file mode 100644
index 0000000..a310eaa
--- /dev/null
+++ b/client/src/components/icons/amenities/ClimbingWallIcon.tsx
@@ -0,0 +1,14 @@
+function ClimbingWallIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M40.6975 13.4952C40.3704 13.4952 40.1125 13.7555 40.1125 14.0783C40.1125 14.3974 40.3765 14.6614 40.6975 14.6614H42.0975C42.4245 14.6614 42.6825 14.4011 42.6825 14.0783C42.6825 13.7591 42.4186 13.4952 42.0975 13.4952H40.6975ZM38.4825 14.0783C38.4825 12.8564 39.469 11.8652 40.6975 11.8652H42.0975C43.3125 11.8652 44.3125 12.8527 44.3125 14.0783C44.3125 15.3001 43.326 16.2914 42.0975 16.2914H40.6975C39.4824 16.2914 38.4825 15.3038 38.4825 14.0783ZM18.3169 14.8933C17.9899 14.8933 17.7319 15.1535 17.7319 15.4764C17.7319 15.7955 17.9959 16.0594 18.3169 16.0594H21.1169C21.438 16.0594 21.7019 15.7955 21.7019 15.4764C21.7019 15.1572 21.4379 14.8933 21.1169 14.8933H18.3169ZM21.8201 17.5748C22.695 17.281 23.3319 16.4545 23.3319 15.4764C23.3319 14.2508 22.332 13.2633 21.1169 13.2633H18.3169C17.0884 13.2633 16.1019 14.2545 16.1019 15.4764C16.1019 16.4545 16.7389 17.281 17.6138 17.5748C17.5412 17.7942 17.5019 18.0287 17.5019 18.2724V21.9679C17.5019 23.8706 18.5712 25.5997 20.2763 26.4512C20.2762 26.4512 20.2763 26.4513 20.2763 26.4512L24.5019 28.5626V30.0353L21.7255 28.183C21.7253 28.1829 21.7256 28.1831 21.7255 28.183C19.3239 26.5777 16.1117 28.3106 16.1117 31.1872V37.8451C16.1117 38.0505 16.1395 38.2493 16.1917 38.438C14.9749 38.4514 14.002 39.4375 14.002 40.651C14.002 41.8765 15.0018 42.864 16.2169 42.864H19.7169C20.9454 42.864 21.9319 41.8729 21.9319 40.651C21.9319 39.675 21.2978 38.85 20.4259 38.5544C20.501 38.3317 20.5417 38.0932 20.5417 37.8451V33.0187L23.1927 34.6741C23.1926 34.674 23.1928 34.6741 23.1927 34.6741C24.4299 35.4488 25.8632 35.864 27.3294 35.864H28.7019V44.8353C28.7019 46.0572 29.6885 47.0483 30.9169 47.0483C32.1454 47.0483 33.1319 46.0572 33.1319 44.8353V28.5528L37.3576 26.4414L37.3594 26.4405C39.0507 25.5902 40.1319 23.8636 40.1319 21.9582V18.2627C40.1319 17.0408 39.1453 16.0496 37.9169 16.0496C37.8672 16.0496 37.8179 16.0542 37.7694 16.0631C36.6129 16.1296 35.6825 17.0902 35.6825 18.2724V22.3004C35.6825 22.5218 35.5534 22.7277 35.3638 22.8233C35.3637 22.8234 35.364 22.8232 35.3638 22.8233L32.1148 24.4476H25.5093L22.2591 22.8228L22.2548 22.8206C22.0586 22.724 21.9319 22.5197 21.9319 22.3004V18.2724C21.9319 18.0287 21.8927 17.7942 21.8201 17.5748ZM19.7169 17.6894C19.3898 17.6894 19.1319 17.9496 19.1319 18.2724V21.9679C19.1319 23.2524 19.8515 24.4172 21.0047 24.993L25.6812 27.3297C25.9574 27.4677 26.1319 27.75 26.1319 28.0588V31.5587C26.1319 31.8594 25.9664 32.1356 25.7014 32.2774C25.4363 32.4192 25.1147 32.4035 24.8646 32.2367L20.8202 29.5384C19.5079 28.661 17.7417 29.6059 17.7417 31.1872V37.8451C17.7417 38.1679 17.9996 38.4281 18.3267 38.4281C18.6537 38.4281 18.9117 38.1679 18.9117 37.8451V31.549C18.9117 31.2528 19.0724 30.9799 19.3314 30.8363C19.5905 30.6926 19.9071 30.7008 20.1583 30.8577L24.0579 33.2926C25.0373 33.906 26.1708 34.234 27.3294 34.234H29.5169C29.9671 34.234 30.3319 34.5989 30.3319 35.049V44.8353C30.3319 45.1581 30.5898 45.4183 30.9169 45.4183C31.244 45.4183 31.5019 45.1581 31.5019 44.8353V28.049C31.5019 27.7402 31.6764 27.4579 31.9527 27.3199L36.6272 24.9842C36.627 24.9844 36.6275 24.9841 36.6272 24.9842C37.7744 24.4071 38.5019 23.2397 38.5019 21.9582V18.2627C38.5019 17.9645 38.2819 17.7197 37.9905 17.6841C37.9597 17.6876 37.9286 17.6894 37.8975 17.6894C37.5764 17.6894 37.3125 17.9533 37.3125 18.2724V22.3004C37.3125 23.1346 36.8389 23.9061 36.0955 24.2799L32.6717 25.9916C32.5585 26.0482 32.4337 26.0776 32.3072 26.0776H25.3169C25.1904 26.0776 25.0656 26.0482 24.9525 25.9916L21.5346 24.2829C21.5338 24.2825 21.533 24.2821 21.5322 24.2817C20.777 23.9086 20.3019 23.136 20.3019 22.3004V18.2724C20.3019 17.9496 20.044 17.6894 19.7169 17.6894ZM28.4572 15.5972C26.777 15.5972 25.4222 16.9541 25.4222 18.6244C25.4222 20.2947 26.777 21.6516 28.4572 21.6516C30.1374 21.6516 31.4922 20.2947 31.4922 18.6244C31.4922 16.9541 30.1374 15.5972 28.4572 15.5972ZM23.7922 18.6244C23.7922 16.0517 25.879 13.9672 28.4572 13.9672C31.0354 13.9672 33.1222 16.0517 33.1222 18.6244C33.1222 21.1971 31.0354 23.2816 28.4572 23.2816C25.879 23.2816 23.7922 21.1971 23.7922 18.6244ZM34.4672 40.0057C34.4672 38.7801 35.4672 37.7926 36.6822 37.7926H39.4822C40.7107 37.7926 41.6972 38.7838 41.6972 40.0057C41.6972 41.2313 40.6973 42.2187 39.4822 42.2187H36.6822C35.4537 42.2187 34.4672 41.2276 34.4672 40.0057ZM36.6822 39.4226C36.3611 39.4226 36.0972 39.6866 36.0972 40.0057C36.0972 40.3285 36.3551 40.5887 36.6822 40.5887H39.4822C39.8033 40.5887 40.0672 40.3248 40.0672 40.0057C40.0672 39.6829 39.8093 39.4226 39.4822 39.4226H36.6822ZM16.2169 40.0679C15.8899 40.0679 15.632 40.3281 15.632 40.651C15.632 40.9701 15.8959 41.234 16.2169 41.234H19.7169C20.044 41.234 20.3019 40.9738 20.3019 40.651C20.3019 40.3318 20.0379 40.0679 19.7169 40.0679H16.2169Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default ClimbingWallIcon;
diff --git a/client/src/components/icons/amenities/CommunalDiningTablesIcon.tsx b/client/src/components/icons/amenities/CommunalDiningTablesIcon.tsx
new file mode 100644
index 0000000..2112a67
--- /dev/null
+++ b/client/src/components/icons/amenities/CommunalDiningTablesIcon.tsx
@@ -0,0 +1,24 @@
+const CommunalDiningTablesIcon = () => {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M28.0798 28.3701C20.0498 28.3701 11.5098 26.3501 11.5098 22.6101C11.5098 18.8701 20.0498 16.8501 28.0798 16.8501C36.1098 16.8501 44.6498 18.8701 44.6498 22.6101C44.6498 24.2401 43.0298 25.6601 39.9598 26.7101L39.4898 25.3501C41.8198 24.5501 43.2098 23.5201 43.2098 22.6101C43.2098 20.8101 37.4498 18.2901 28.0798 18.2901C18.7098 18.2901 12.9498 20.8101 12.9498 22.6101C12.9498 24.4101 18.7098 26.9301 28.0798 26.9301C30.5698 26.9301 32.9498 26.7501 35.1498 26.3901L35.3798 27.8101C33.0998 28.1801 30.6498 28.3601 28.0798 28.3601"
+        fill="currentColor"
+      />
+      <path
+        d="M28.0796 41.3301C25.6696 41.3301 21.5996 40.8001 21.5996 38.8101C21.5996 36.8201 25.4196 36.4401 26.5896 36.3501L26.7096 37.7901C24.3296 37.9801 23.2696 38.5701 23.0696 38.8201C23.3296 39.1601 25.0396 39.9001 28.0896 39.9001C31.1396 39.9001 32.8496 39.1601 33.1096 38.8201C32.9096 38.5701 31.8496 37.9801 29.4696 37.7901L29.5896 36.3501C30.7596 36.4401 34.5796 36.9001 34.5796 38.8101C34.5796 40.7201 30.4996 41.3301 28.0996 41.3301"
+        fill="currentColor"
+      />
+      <path
+        d="M28.0798 31.2501C20.0498 31.2501 11.5098 29.2301 11.5098 25.4901V22.6101H12.9498V25.4901C12.9498 27.3001 18.7098 29.8101 28.0798 29.8101C37.4498 29.8101 43.2098 27.2901 43.2098 25.4901V22.6101H44.6498V25.4901C44.6498 29.2301 36.1098 31.2501 28.0798 31.2501Z"
+        fill="currentColor"
+      />
+      <path
+        d="M30.2399 38.45H28.7999V31.2501H27.3599V38.45H25.9199V29.8101H30.2399V38.45Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+};
+
+export default CommunalDiningTablesIcon;
diff --git a/client/src/components/icons/amenities/ConvenienceStoreIcon.tsx b/client/src/components/icons/amenities/ConvenienceStoreIcon.tsx
new file mode 100644
index 0000000..6dc38d2
--- /dev/null
+++ b/client/src/components/icons/amenities/ConvenienceStoreIcon.tsx
@@ -0,0 +1,29 @@
+function ConvenienceStoreIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M47.0295 23.9801C47.0295 23.9801 47.0295 23.9701 47.0295 23.9601C47.0295 23.9501 47.0295 23.9401 47.0295 23.9201C47.0295 23.9201 47.0295 23.9101 47.0295 23.9001C47.0295 23.8901 47.0295 23.8801 47.0295 23.8701C47.0295 23.8601 47.0295 23.8501 47.0295 23.8401C47.0295 23.8301 47.0295 23.8201 47.0295 23.8201C47.0295 23.8101 47.0295 23.8001 47.0195 23.7901C47.0195 23.7901 47.0195 23.7901 47.0195 23.7801L43.4495 14.2001C43.4495 14.2001 43.4495 14.2001 43.4495 14.1901C43.4495 14.1801 43.4495 14.1701 43.4395 14.1601C43.4395 14.1601 43.4395 14.1501 43.4395 14.1401C43.4395 14.1401 43.4294 14.1201 43.4194 14.1101C43.4194 14.1101 43.4194 14.0901 43.4094 14.0901C43.4094 14.0901 43.3994 14.0701 43.3894 14.0701C43.3894 14.0701 43.3796 14.0501 43.3696 14.0501C43.3696 14.0501 43.3596 14.0401 43.3496 14.0301C43.3496 14.0301 43.3396 14.0101 43.3296 14.0101C43.3296 14.0101 43.3196 14.0001 43.3096 13.9901C43.3096 13.9901 43.2995 13.9801 43.2896 13.9701C43.2896 13.9701 43.2795 13.9601 43.2695 13.9501C43.2695 13.9501 43.2595 13.9401 43.2495 13.9301C43.2495 13.9301 43.2295 13.9201 43.2295 13.9101C43.2295 13.9101 43.2195 13.9101 43.2095 13.9001C43.2095 13.9001 43.1894 13.8901 43.1794 13.8801C43.1794 13.8801 43.1694 13.8801 43.1594 13.8801C43.1494 13.8801 43.1394 13.8801 43.1294 13.8701C43.1294 13.8701 43.1196 13.8701 43.1096 13.8701C43.1096 13.8701 43.0896 13.8701 43.0796 13.8701H43.0596C43.0596 13.8701 43.0395 13.8701 43.0295 13.8701C43.0195 13.8701 43.0095 13.8701 42.9995 13.8701H42.9795C42.9695 13.8701 42.9595 13.8701 42.9395 13.8701H13.7095C13.7095 13.8701 13.6894 13.8701 13.6694 13.8701H13.6494C13.6394 13.8701 13.6296 13.8701 13.6196 13.8701C13.6096 13.8701 13.5996 13.8701 13.5896 13.8701H13.5696C13.5596 13.8701 13.5496 13.8701 13.5396 13.8701C13.5396 13.8701 13.5295 13.8701 13.5195 13.8701C13.5095 13.8701 13.4995 13.8701 13.4895 13.8801C13.4895 13.8801 13.4795 13.8801 13.4695 13.8801C13.4695 13.8801 13.4495 13.8801 13.4395 13.9001C13.4395 13.9001 13.4294 13.9001 13.4194 13.9101C13.4194 13.9101 13.3994 13.9201 13.3994 13.9301C13.3994 13.9301 13.3794 13.9401 13.3794 13.9501C13.3794 13.9501 13.3696 13.9601 13.3596 13.9701C13.3596 13.9701 13.3396 13.9801 13.3396 13.9901C13.3396 13.9901 13.3296 14.0001 13.3196 14.0101C13.3196 14.0101 13.3096 14.0301 13.2996 14.0301C13.2996 14.0301 13.2895 14.0401 13.2795 14.0501C13.2795 14.0501 13.2695 14.0701 13.2595 14.0701C13.2595 14.0701 13.2495 14.0801 13.2395 14.0901C13.2395 14.0901 13.2295 14.1001 13.2295 14.1101C13.2295 14.1101 13.2195 14.1301 13.2095 14.1401C13.2095 14.1401 13.2095 14.1501 13.2095 14.1601C13.2095 14.1701 13.1995 14.1801 13.1895 14.1901C13.1895 14.1901 13.1895 14.1901 13.1895 14.2001L9.60962 23.7801C9.60962 23.7801 9.60962 23.7801 9.60962 23.7901C9.60962 23.8001 9.60961 23.8101 9.59961 23.8201V23.8401C9.59961 23.8501 9.59961 23.8601 9.59961 23.8701C9.59961 23.8701 9.59961 23.8901 9.59961 23.9001V23.9201C9.59961 23.9301 9.59961 23.9401 9.59961 23.9601C9.59961 23.9601 9.59961 23.9601 9.59961 23.9701C9.59961 23.9701 9.59961 23.9801 9.59961 23.9901C9.61961 25.9301 11.2295 27.4901 13.2095 27.4901C14.4795 27.4901 15.5995 26.8501 16.2395 25.8801C16.8795 26.8501 17.9995 27.4901 19.2695 27.4901C20.5395 27.4901 21.6496 26.8501 22.2996 25.8801C22.9396 26.8501 24.0596 27.4901 25.3296 27.4901C26.5996 27.4901 27.7096 26.8501 28.3596 25.8801C28.9996 26.8501 30.1194 27.4901 31.3894 27.4901C32.6594 27.4901 33.7794 26.8501 34.4194 25.8801C35.0594 26.8501 36.1795 27.4901 37.4495 27.4901C38.7195 27.4901 39.8395 26.8501 40.4795 25.8801C41.1195 26.8501 42.2395 27.4901 43.5095 27.4901C45.4895 27.4901 47.1096 25.9201 47.1196 24.0001L47.0295 23.9801ZM13.1196 26.3501C11.7996 26.3501 10.7294 25.3301 10.6794 24.0601L14.0796 14.9501H17.6694L15.5896 23.8301C15.5896 23.8401 15.5896 23.8501 15.5896 23.8601V23.8801C15.5896 23.8801 15.5896 23.9001 15.5896 23.9101C15.5896 23.9201 15.5896 23.9301 15.5896 23.9401C15.5896 25.2601 14.4894 26.3301 13.1394 26.3301L13.1196 26.3501ZM19.1794 26.3501C17.8494 26.3501 16.7695 25.3101 16.7295 24.0201L18.8496 14.9501H22.2996L21.6196 23.9201C21.6196 23.9201 21.6196 23.9301 21.6196 23.9401C21.6196 23.9401 21.6196 23.9501 21.6196 23.9601C21.6196 25.2801 20.5194 26.3501 19.1694 26.3501H19.1794ZM25.2395 26.3501C23.8995 26.3501 22.7996 25.2901 22.7896 23.9801L23.4695 14.9501H27.6794V23.9601C27.6794 25.2801 26.5795 26.3501 25.2295 26.3501H25.2395ZM31.2996 26.3501C29.9496 26.3501 28.8496 25.2801 28.8496 23.9601V14.9501H33.0596L33.7395 23.9801C33.7395 25.2901 32.6396 26.3501 31.2896 26.3501H31.2996ZM37.3596 26.3501C36.0096 26.3501 34.9094 25.2801 34.9094 23.9601V23.9401V23.9201L34.2295 14.9501H37.6794L39.7996 24.0201C39.7696 25.3101 38.6796 26.3501 37.3496 26.3501H37.3596ZM43.4194 26.3501C42.0694 26.3501 40.9695 25.2801 40.9695 23.9601C40.9695 23.9501 40.9695 23.9401 40.9695 23.9301C40.9695 23.9301 40.9695 23.9101 40.9695 23.9001V23.8801C40.9695 23.8701 40.9695 23.8601 40.9695 23.8501L38.8894 14.9701H42.4795L45.8794 24.0801C45.8294 25.3501 44.7495 26.3701 43.4395 26.3701L43.4194 26.3501Z"
+        fill="currentColor"
+        stroke="currentColor"
+        strokeWidth={0.64}
+        strokeMiterlimit={10}
+      />
+      <path
+        d="M43.4092 28.26C43.0892 28.26 42.8293 28.52 42.8293 28.83V41.12H13.6892V28.81C13.6892 28.5 13.4294 28.24 13.1094 28.24C12.7894 28.24 12.5293 28.5 12.5293 28.81V42.26H43.9993V28.83C43.9993 28.52 43.7392 28.26 43.4192 28.26H43.4092Z"
+        fill="currentColor"
+        stroke="currentColor"
+        strokeWidth={0.64}
+        strokeMiterlimit={10}
+      />
+      <path
+        d="M36.6897 37.39C36.9697 37.39 37.1897 37.17 37.1897 36.9V29.95C37.1897 29.68 36.9697 29.46 36.6897 29.46H19.5898C19.3098 29.46 19.0898 29.68 19.0898 29.95V36.9C19.0898 37.17 19.3098 37.39 19.5898 37.39H36.6897ZM20.0898 30.44H36.1897V36.41H20.0898V30.44Z"
+        fill="currentColor"
+        stroke="currentColor"
+        strokeWidth={0.64}
+        strokeMiterlimit={10}
+      />
+    </svg>
+  );
+}
+
+export default ConvenienceStoreIcon;
diff --git a/client/src/components/icons/amenities/FirepitIcon.tsx b/client/src/components/icons/amenities/FirepitIcon.tsx
new file mode 100644
index 0000000..fd9b44a
--- /dev/null
+++ b/client/src/components/icons/amenities/FirepitIcon.tsx
@@ -0,0 +1,16 @@
+function FirepitIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M24.0204 47.1301C23.7604 47.1301 23.5004 47.0101 23.3404 46.7801C20.7004 43.1901 21.4304 40.5101 22.0704 38.1401C22.4804 36.6501 22.8604 35.2401 22.5104 33.5601C22.4404 33.2201 22.5804 32.8801 22.8504 32.6801C23.1304 32.4801 23.5004 32.4701 23.7804 32.6501C26.3904 34.2801 26.9104 36.3601 27.4204 38.3701L27.4404 38.4701C27.8704 40.1701 29.2404 41.5601 30.5004 41.5801C32.2304 41.6101 33.0104 39.7201 33.2404 38.9201C33.3504 38.5501 33.6704 38.3001 34.0704 38.3101C34.4504 38.3101 34.7804 38.5901 34.8804 38.9601C35.8504 42.8901 34.3704 45.0901 32.6204 46.8901C32.2904 47.2301 31.7504 47.2301 31.4204 46.8901C31.0904 46.5601 31.0804 46.0101 31.4104 45.6801C32.3404 44.7201 33.2304 43.6501 33.4304 42.0301C32.6304 42.8701 31.5904 43.3201 30.4704 43.3101C28.4204 43.2901 26.4104 41.3901 25.7804 38.9101L25.7604 38.8101C25.4304 37.4801 25.1404 36.3501 24.3104 35.3501C24.2504 36.5501 23.9504 37.6201 23.6904 38.6101C23.0704 40.8901 22.5304 42.8501 24.6804 45.7701C24.9604 46.1501 24.8804 46.6901 24.5104 46.9701C24.3604 47.0901 24.1804 47.1401 24.0004 47.1401"
+        fill="currentColor"
+      />
+      <path
+        d="M36.8801 46.27C36.6501 46.27 36.4201 46.1801 36.2501 45.9901C35.9301 45.6401 35.9601 45.1 36.3001 44.78C39.5401 41.77 41.1201 38.88 41.1201 35.96C41.1201 32.52 39.7901 29.37 37.6001 27.4C37.6501 28.81 37.1001 30.1501 36.0001 31.2401C34.8901 32.3301 32.5101 32.68 30.8101 32.02C29.4201 31.48 28.5901 30.3401 28.4901 28.8101C28.3801 27.0401 29.0401 26.12 29.7401 25.15C30.4601 24.16 31.2801 23.0301 31.7201 20.4401C32.3501 16.8001 30.0501 13.1401 27.0101 10.8701C27.1601 11.3801 27.2401 11.9201 27.2601 12.4801C27.3701 15.7401 25.3201 19.6201 21.3401 23.6801C17.1601 27.9401 14.7901 30.5601 14.7901 35.1001C14.7901 38.4901 17.8801 43.3401 20.2801 44.6201C20.6901 44.8401 20.8501 45.36 20.6301 45.78C20.4101 46.2 19.9001 46.36 19.4801 46.14C16.6001 44.6 13.0801 39.2001 13.0801 35.1001C13.0801 29.6301 16.1901 26.47 20.1201 22.46C23.7201 18.8 25.6401 15.2801 25.5501 12.5401C25.5001 11.1801 24.9501 10.0201 23.9201 9.11006C23.6101 8.83006 23.5401 8.37003 23.7501 8.01003C23.9701 7.65003 24.4001 7.51005 24.7901 7.66005C29.6701 9.62005 34.3401 15.1801 33.3801 20.7401C32.8601 23.7301 31.8401 25.1401 31.0901 26.1701C30.4401 27.0601 30.0901 27.55 30.1601 28.7C30.2101 29.55 30.6201 30.1101 31.3901 30.4101C32.6301 30.8901 34.2801 30.5001 34.7901 30.0001C35.4801 29.3201 36.4901 27.86 35.4201 25.78C35.2501 25.45 35.3101 25.05 35.5701 24.78C35.8301 24.52 36.2301 24.4501 36.5601 24.6201C40.3501 26.5701 42.7901 31.01 42.7901 35.95C42.7901 39.38 41.0301 42.6801 37.4201 46.0401C37.2601 46.1901 37.0501 46.27 36.8501 46.27"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default FirepitIcon;
diff --git a/client/src/components/icons/amenities/FullyEquippedGymIcon.tsx b/client/src/components/icons/amenities/FullyEquippedGymIcon.tsx
new file mode 100644
index 0000000..2f79401
--- /dev/null
+++ b/client/src/components/icons/amenities/FullyEquippedGymIcon.tsx
@@ -0,0 +1,12 @@
+function FullyEquippedGymIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M11.426 32.4478C10.9053 32.4478 10.4438 32.0061 10.4438 31.4172V23.8589C10.4438 23.3067 10.9053 22.8282 11.426 22.8282C11.9467 22.8282 12.4083 23.3067 12.4083 23.8589V31.4172C12.4083 31.9693 11.9941 32.4478 11.426 32.4478ZM44.5858 32.4478C44.0651 32.4478 43.6035 32.0061 43.6035 31.4172V23.8589C43.6035 23.3067 44.0177 22.8282 44.5858 22.8282C45.1065 22.8282 45.568 23.3067 45.568 23.8589V31.4172C45.568 31.9693 45.1183 32.4478 44.5858 32.4478ZM15.9704 37.0981C14.9882 37.0981 14.1834 36.2515 14.1834 35.2208V20.7669C14.1834 19.7362 14.9882 18.8896 15.9704 18.8896C16.9527 18.8896 17.7574 19.7362 17.7574 20.7669V35.2208C17.7574 36.2515 16.9527 37.0981 15.9704 37.0981ZM40.0414 37.0981C39.0592 37.0981 38.2544 36.2515 38.2544 35.2208V20.7669C38.2544 19.7362 39.0592 18.8896 40.0414 18.8896C41.0237 18.8896 41.8284 19.7362 41.8284 20.7669V35.2208C41.8284 36.2515 41.0237 37.0981 40.0414 37.0981ZM15.9467 17C13.9822 17 12.4083 18.681 12.4083 20.7669V21.135C12.0888 21.0246 11.7811 20.9509 11.426 20.9509C9.88757 20.9509 8.63314 22.2761 8.63314 23.8589V27.0245H5V28.9386H8.66864V31.4417C8.66864 33.0614 9.92308 34.362 11.4615 34.362C11.8166 34.362 12.1243 34.2883 12.4438 34.1779V35.2454C12.4438 37.3068 14.0533 39 16.0059 39C17.9586 39 19.568 37.3068 19.568 35.2454V28.9755H36.4675V35.2454C36.4675 37.3068 38.0769 39 40.0296 39C41.9823 39 43.6035 37.3068 43.6035 35.2454V34.1779C43.9231 34.2883 44.2308 34.362 44.5858 34.362C46.1243 34.362 47.3905 33.0368 47.3905 31.4417V28.9386H51V27.0245H47.3905V23.8589C47.3905 22.2393 46.1361 20.9509 44.5858 20.9509C44.2426 20.9509 43.9231 21.0246 43.6035 21.135V20.7669C43.6035 18.7055 41.9941 17 40.0296 17C38.0651 17 36.4675 18.6933 36.4675 20.7669V27.0368H19.568V20.7669C19.568 18.7055 17.9586 17 16.0059 17C15.9823 17 15.9586 17 15.9467 17Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default FullyEquippedGymIcon;
diff --git a/client/src/components/icons/amenities/GamingLoungeIcon.tsx b/client/src/components/icons/amenities/GamingLoungeIcon.tsx
new file mode 100644
index 0000000..7c09340
--- /dev/null
+++ b/client/src/components/icons/amenities/GamingLoungeIcon.tsx
@@ -0,0 +1,28 @@
+function GamingLoungeIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M16.396 23.6309C16.5568 23.6309 16.7176 23.6998 16.8324 23.8146C16.9932 23.9754 17.0506 24.2166 16.9817 24.4348L15.0639 30.4296C15.0639 30.4296 15.0639 30.4296 15.0639 30.4411C14.7653 31.3139 15.0983 32.267 15.8793 32.7493C17.7741 33.9207 21.8281 35.8961 27.6161 35.8961C33.4041 35.8961 37.9749 33.8863 40.1454 32.6919C40.9837 32.2325 41.3742 31.2334 41.0526 30.3262L38.8706 24.0443C38.7328 23.6539 38.3423 23.4242 37.9404 23.4816C37.4925 23.5505 37.171 23.941 37.2054 24.3889C37.2054 24.3889 37.2054 24.3889 37.2054 24.4004L37.4695 29.9128C37.5155 30.5214 37.2973 31.1301 36.8839 31.5665C36.4704 32.0144 35.8732 32.2785 35.2646 32.2785H22.5286C21.7821 32.2785 21.0701 31.9569 20.5648 31.4057C20.071 30.8544 19.8183 30.108 19.8987 29.373C19.8987 29.3385 19.8987 29.3156 19.9102 29.2811C19.9676 29.0744 21.2079 24.2395 21.5065 23.2864L21.7706 22.2413C22.0807 21.001 21.8396 19.6918 21.0931 18.6583C20.3696 17.6476 19.2441 17.016 18.0153 16.9126C17.9694 16.9126 17.9234 16.9126 17.8775 16.9126C16.0171 16.8322 14.3404 17.8658 13.5939 19.5655C12.8934 21.1618 11.6645 22.4021 10.1142 23.0567L9.57442 23.2864C9.50552 23.3093 9.47107 23.3897 9.48255 23.4586L9.56294 24.0099C9.65482 24.607 10.0912 25.0894 10.6769 25.2387C10.8262 25.2731 10.987 25.2731 11.1478 25.2272L16.2238 23.6883C16.2812 23.6654 16.3386 23.6653 16.396 23.6653M27.6161 37.1363C21.5295 37.1363 17.2459 35.0577 15.2361 33.8059C13.9614 33.025 13.4216 31.4861 13.904 30.0736L15.4658 25.1928L11.5153 26.3986C11.1478 26.5134 10.7573 26.5249 10.3898 26.433C9.32177 26.1689 8.52936 25.2961 8.36858 24.2051L8.28819 23.6539C8.19632 23.0337 8.54085 22.4251 9.11506 22.1839L9.65481 21.9542C10.9066 21.4259 11.9172 20.4153 12.4914 19.1061C13.4446 16.9356 15.5807 15.6149 17.9579 15.7183C18.0153 15.7183 18.0727 15.7183 18.1416 15.7183C19.7265 15.8446 21.185 16.66 22.1152 17.9692C23.0684 19.3013 23.3899 20.978 22.988 22.5628L22.7238 23.6194C22.7238 23.6194 22.7238 23.6424 22.7238 23.6539C22.4597 24.4692 21.2883 29.0285 21.1505 29.5453C21.116 29.9357 21.2424 30.3032 21.5065 30.5903C21.7821 30.8889 22.1496 31.0612 22.5631 31.0612H35.299C35.5747 31.0612 35.8388 30.9463 36.0225 30.7511C36.2063 30.5444 36.2982 30.2803 36.2867 30.0047C36.2867 30.0047 36.2867 30.0046 36.2867 29.9932L36.0225 24.4808C35.9422 23.4012 36.7231 22.4365 37.8026 22.2757C38.7902 22.1264 39.7434 22.7121 40.065 23.6424L42.247 29.9243C42.7523 31.3942 42.1321 33.002 40.777 33.7484C38.5031 35.0002 33.7831 37.1134 27.662 37.1134"
+        fill="currentColor"
+      />
+      <path
+        d="M27.4201 42.6604C22.4474 42.6604 18.0604 41.7073 14.397 39.8353C11.2733 38.239 9.30947 36.2867 8.21847 34.9316C7.79356 34.4033 7.64426 33.6912 7.83949 33.0366C8.02324 32.382 8.52855 31.8653 9.17166 31.6356C9.18315 31.6356 9.19463 31.6356 9.20611 31.6241L14.1673 30.2575C14.4888 30.1656 14.8334 30.3608 14.9252 30.6824C15.0171 31.0039 14.8219 31.337 14.5003 31.4289L9.55064 32.7955C9.2865 32.8874 9.09127 33.1056 9.01088 33.3697C8.93049 33.6453 8.98791 33.9324 9.17166 34.1621C11.3537 36.8724 16.6364 41.4316 27.4201 41.4316C32.3238 41.4316 36.6993 40.4899 40.4087 38.6294C43.4865 37.0905 45.4388 35.2531 46.5527 33.9783C46.725 33.7716 46.8054 33.5075 46.7595 33.2434C46.7135 33.0022 46.5642 32.784 46.3575 32.6577L41.5916 31.1647C41.27 31.0613 41.0863 30.7168 41.1896 30.3953C41.293 30.0737 41.6375 29.9015 41.9591 29.9934L46.7824 31.5093C46.7824 31.5093 46.8628 31.5322 46.8973 31.5552C47.46 31.8538 47.8505 32.3936 47.9653 33.0137C48.0801 33.6453 47.9079 34.2769 47.483 34.7593C46.3001 36.1144 44.2214 38.0782 40.9714 39.709C37.0898 41.6498 32.5305 42.6375 27.4315 42.6375"
+        fill="currentColor"
+      />
+      <path
+        d="M21.9658 24.8253C21.7016 24.8253 21.4605 24.653 21.3801 24.4004C21.2767 24.0788 21.4605 23.7343 21.782 23.6424L24.1248 22.9074C24.1363 22.9074 24.1593 22.9074 24.1707 22.8615C24.1707 22.827 24.1593 22.8155 24.1478 22.8041L22.1266 21.3111C21.9888 21.2078 21.8969 21.047 21.8739 20.8632C21.8624 20.691 21.9313 20.5072 22.0577 20.3809L23.608 18.842C23.608 18.842 23.631 18.819 23.6195 18.7731C23.608 18.7386 23.5851 18.7387 23.5621 18.7387L21.5638 18.8305C21.3801 18.8305 21.1963 18.7616 21.07 18.6238C20.9437 18.486 20.8977 18.2907 20.9322 18.107L21.4375 15.6034L19.8068 16.9586C19.646 17.0849 19.4393 17.1309 19.244 17.0735C19.0488 17.016 18.8995 16.8667 18.8306 16.6715L18.0267 14.1679C17.9808 14.0301 17.8659 14.0072 17.8085 14.0072C17.7396 14.0072 17.6362 14.0301 17.5903 14.1679L16.729 16.6945C16.6256 17.016 16.2696 17.1883 15.9595 17.0735C15.638 16.9701 15.4657 16.6141 15.5806 16.304L16.4419 13.7775C16.6486 13.1803 17.1884 12.7898 17.8085 12.7898H17.82C18.4516 12.7898 18.9914 13.1917 19.1866 13.8004L19.7149 15.4427L20.6681 14.6503C21.07 14.3173 21.6098 14.2713 22.0577 14.5354C22.5055 14.7996 22.7237 15.3048 22.6204 15.8101L22.2644 17.5788L23.4817 17.5214C24.01 17.4984 24.4923 17.7969 24.7105 18.2793C24.9287 18.7616 24.8139 19.3243 24.4349 19.7033L23.3898 20.7369L24.8368 21.8049C25.2273 22.092 25.4225 22.5743 25.3307 23.0567C25.2503 23.539 24.9057 23.9181 24.4349 24.0559L22.0921 24.7793C22.0347 24.8023 21.9658 24.8023 21.9084 24.8023"
+        fill="currentColor"
+      />
+      <path
+        d="M16.5221 19.8984C16.4302 19.8984 16.3498 19.9788 16.3498 20.0707C16.3498 20.1626 16.4302 20.243 16.5221 20.243C16.614 20.243 16.6944 20.1626 16.6944 20.0707C16.6944 19.9788 16.614 19.8984 16.5221 19.8984ZM16.5221 21.0928C15.9594 21.0928 15.5 20.6334 15.5 20.0707C15.5 19.508 15.9594 19.0486 16.5221 19.0486C17.0848 19.0486 17.5442 19.508 17.5442 20.0707C17.5442 20.6334 17.0848 21.0928 16.5221 21.0928Z"
+        fill="currentColor"
+      />
+      <path
+        d="M27.8683 40.5355C21.9654 40.5355 17.6474 38.9392 15.0749 37.5956C12.2613 36.1256 10.8487 34.6671 10.7913 34.5982C10.5616 34.357 10.5731 33.9666 10.8143 33.7369C11.0554 33.5072 11.4459 33.5186 11.6756 33.7598C11.6871 33.7713 13.0307 35.1609 15.6951 36.539C18.1412 37.8023 22.241 39.3182 27.8683 39.3182C33.4956 39.3182 37.6184 37.8023 40.0875 36.539C42.7748 35.1609 44.1414 33.7713 44.1529 33.7598C44.3826 33.5186 44.773 33.5071 45.0142 33.7483C45.2554 33.978 45.2669 34.3684 45.0372 34.6096C44.9798 34.667 43.5442 36.1371 40.7076 37.5956C38.1007 38.9392 33.7712 40.5355 27.8683 40.5355Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default GamingLoungeIcon;
diff --git a/client/src/components/icons/amenities/GuestRoomsIcon.tsx b/client/src/components/icons/amenities/GuestRoomsIcon.tsx
new file mode 100644
index 0000000..1bc7c72
--- /dev/null
+++ b/client/src/components/icons/amenities/GuestRoomsIcon.tsx
@@ -0,0 +1,15 @@
+function GuestRoomsIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M14.0389 13H27.7124V35.0924H22.5625H31.991V40.391H37.5095V46H44M22.5625 39.604L13 32.6426V13.0111L22.5625 19.9725V39.604Z"
+        stroke="currentColor"
+        strokeWidth={1.8}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+export default GuestRoomsIcon;
diff --git a/client/src/components/icons/amenities/HammockMovieLoungeIcon.tsx b/client/src/components/icons/amenities/HammockMovieLoungeIcon.tsx
new file mode 100644
index 0000000..6de54ca
--- /dev/null
+++ b/client/src/components/icons/amenities/HammockMovieLoungeIcon.tsx
@@ -0,0 +1,12 @@
+function HammockMovieLoungeIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M19.2605 37.1475H20.8337H19.2605ZM21.8124 37.1475H37.8297H21.8124ZM38.8083 37.1475H39.7993H38.8083ZM40.778 37.1475H41.8061H40.778ZM23.4475 28.4523L22.4565 26.9544L21.2673 28.2209C21.961 28.3062 22.6919 28.3914 23.4475 28.4523ZM31.9827 32.7025V29.39C30.5085 29.5118 29.0963 29.5605 27.746 29.5605C26.5568 29.5605 25.4172 29.524 24.3271 29.4509C20.6355 29.2073 17.6253 28.6106 15.5194 28.0626C15.4574 28.0504 15.4079 28.0382 15.346 28.0139C16.1883 28.5497 17.105 29.0978 18.0341 29.6336C20.1152 30.8149 22.3698 31.9109 24.4509 32.5929C25.8384 33.0557 27.1515 33.3236 28.2787 33.3114C29.2698 33.3114 30.5333 33.1044 31.9579 32.6903M38.5853 26.6499C38.5853 26.1994 38.3995 25.8097 38.0898 25.5174C37.7801 25.2251 37.3589 25.0424 36.8882 25.0424C36.4175 25.0424 35.9963 25.2251 35.6866 25.5174C35.3769 25.8097 35.1911 26.2115 35.1911 26.6499C35.1911 27.198 35.476 27.6851 35.922 27.9652C36.0458 27.953 36.1821 27.9286 36.306 27.9043C36.9625 27.7947 37.6315 27.6729 38.3004 27.5268C38.4862 27.271 38.5853 26.9666 38.5853 26.6378M42.0415 27.5755C41.2982 27.7825 40.5674 27.9652 39.8489 28.1235C39.8489 28.1235 39.8365 28.1235 39.8241 28.1235C39.4401 28.2087 39.0561 28.294 38.6844 28.3671C37.9288 28.5254 37.1979 28.6593 36.467 28.7811C36.2812 28.8177 36.083 28.842 35.8972 28.8664C35.8972 28.8664 35.8848 28.8664 35.8724 28.8664C35.4636 28.9273 35.0548 28.9881 34.646 29.0369V31.6795C36.9378 30.7296 39.4772 29.3535 42.0415 27.539M32.5649 28.3671C32.5649 28.3671 32.602 28.3671 32.6268 28.3793C32.6516 28.3793 32.664 28.3914 32.6764 28.4036C32.6888 28.4036 32.7012 28.4158 32.7135 28.4279C32.7259 28.4279 32.7383 28.4401 32.7507 28.4523C32.7507 28.4523 32.7507 28.4523 32.7631 28.4645L32.7879 28.4889C32.8003 28.501 32.8127 28.5254 32.8374 28.5375C32.8374 28.5497 32.8498 28.5619 32.8622 28.5741C32.8746 28.5985 32.887 28.6228 32.8993 28.6593C32.8993 28.6715 32.8993 28.6837 32.8993 28.7081C32.8993 28.7081 32.8993 28.7324 32.8993 28.7446C32.8993 28.7689 32.8993 28.7811 32.8993 28.8055V33.8838C32.8993 33.9812 32.9365 34.0665 33.0108 34.1274C33.0728 34.1882 33.1719 34.2248 33.271 34.2248C33.3701 34.2248 33.4692 34.1882 33.5311 34.1274C33.6055 34.0665 33.6426 33.9812 33.6426 33.8838V28.5497C33.6426 28.2453 33.5064 27.9774 33.3082 27.7825C33.0976 27.5877 32.8126 27.4659 32.5153 27.478C32.4286 27.478 32.3295 27.4781 32.2428 27.5024L27.6965 28.5497C29.1707 28.5497 30.7315 28.4889 32.3543 28.3427C32.3667 28.3427 32.3915 28.3427 32.4038 28.3427C32.4286 28.3427 32.4534 28.3427 32.4658 28.3427C32.4658 28.3427 32.5029 28.3427 32.5153 28.3427M26.755 28.5254C26.4454 28.4401 26.1728 28.2575 25.9746 28.0139L23.2617 24.7502C23.0387 24.4944 22.729 24.3604 22.4193 24.3604C22.1096 24.3604 21.8123 24.4822 21.6017 24.7258L18.8888 27.7704C19.2605 27.8312 19.6445 27.9043 20.0409 27.9652L21.7628 26.1506C21.9362 25.968 22.1716 25.8705 22.4069 25.8827C22.5432 25.8827 22.6919 25.9193 22.8158 25.9802C22.9396 26.041 23.0635 26.1385 23.1378 26.2724L24.5748 28.4645C25.2809 28.5132 26.0118 28.5376 26.755 28.5497M42.6981 37.0744H44.8411L45.8693 25.7244C45.4853 26.0532 45.1013 26.3698 44.7297 26.6743L44.7049 26.6987C44.7049 26.6987 44.6925 26.6986 44.6801 26.7108C41.2363 29.4631 37.7182 31.436 34.6336 32.666V33.8716C34.6336 34.2248 34.485 34.5414 34.2372 34.7728C33.9895 35.0042 33.655 35.1503 33.2834 35.1503C32.9117 35.1503 32.5773 35.0042 32.3295 34.7728C32.0818 34.5414 31.9331 34.2248 31.9331 33.8716V33.5793C30.5457 33.969 29.3069 34.1639 28.254 34.1639C26.9656 34.1639 25.5534 33.8716 24.1041 33.3845C22.6547 32.9095 21.1434 32.2519 19.6817 31.509C16.7458 30.0233 13.9585 28.2088 11.9889 26.857C11.9765 26.857 11.9641 26.8448 11.9517 26.8326C11.1713 26.2968 10.5271 25.8218 10.0688 25.4808L11.1093 37.0623H18.2447M44.5686 26.7595C44.5686 26.7595 44.5314 26.7717 44.5066 26.7717C44.519 26.7717 44.5438 26.7717 44.5562 26.7717C44.5562 26.7717 44.5562 26.7717 44.5686 26.7717M44.0979 25.9802C44.0979 25.9802 44.1722 25.9314 44.2094 25.9192C44.197 25.9192 44.1722 25.9193 44.1598 25.9314C44.7792 25.4321 45.3986 24.9085 46.018 24.3604L46.4639 19.4283C46.4887 19.1726 46.7241 18.9899 46.9966 19.0021C47.2691 19.0264 47.4674 19.2456 47.4426 19.5014L45.8693 37.0744H47.5169C47.7894 37.0744 48 37.2815 48 37.5372C48 37.793 47.777 38 47.5169 38H8.48314C8.21061 38 8 37.793 8 37.5372C8 37.2815 8.223 37.0744 8.48314 37.0744H10.1307L8.54506 19.5014C8.52029 19.2456 8.71851 19.0264 8.99104 19.0021C9.26357 18.9777 9.49893 19.1726 9.5237 19.4283L9.95728 24.2265C9.95728 24.2265 10.0192 24.2752 10.0688 24.3118C10.1926 24.4092 10.3661 24.5431 10.6014 24.7136C11.0598 25.0546 11.7163 25.5296 12.5092 26.0776C12.7445 26.175 13.8842 26.6134 15.7423 27.1005C16.3617 27.2588 17.0555 27.4294 17.8235 27.5755L20.8709 24.1534C21.2797 23.6907 21.8619 23.4593 22.4441 23.4593C23.0387 23.4593 23.6457 23.715 24.0545 24.2021L26.7674 27.4659C26.8913 27.612 27.0647 27.6851 27.2629 27.6851C27.3001 27.6851 27.3373 27.6851 27.3744 27.6851L32.0074 26.6134C32.1809 26.5769 32.3543 26.5525 32.5153 26.5525C33.0852 26.5525 33.6179 26.7717 34.0019 27.1249C34.2868 27.3807 34.485 27.7216 34.5717 28.0991C34.6213 28.0991 34.6584 28.0991 34.6956 28.087C34.3735 27.6729 34.1753 27.1493 34.1753 26.5891C34.1753 25.8949 34.4726 25.2495 34.9557 24.7989C35.4388 24.3361 36.1078 24.056 36.851 24.056C37.5943 24.056 38.2632 24.3361 38.7464 24.7989C39.2295 25.2616 39.5268 25.8949 39.5268 26.5891C39.5268 26.8083 39.502 27.0153 39.4401 27.2223C39.4772 27.2223 39.502 27.2102 39.5392 27.198C39.5392 27.198 39.5516 27.198 39.564 27.198C41.0505 26.857 42.5742 26.4429 44.135 25.9314C44.1103 25.9436 44.0979 25.968 44.0731 25.9802"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default HammockMovieLoungeIcon;
diff --git a/client/src/components/icons/activities/IndoorLapPoolIcon.tsx b/client/src/components/icons/amenities/IndoorLapPoolIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/IndoorLapPoolIcon.tsx
rename to client/src/components/icons/amenities/IndoorLapPoolIcon.tsx
diff --git a/client/src/components/icons/amenities/IndoorLoungeIcon.tsx b/client/src/components/icons/amenities/IndoorLoungeIcon.tsx
new file mode 100644
index 0000000..65be6bf
--- /dev/null
+++ b/client/src/components/icons/amenities/IndoorLoungeIcon.tsx
@@ -0,0 +1,20 @@
+function IndoorLoungeIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M28.0634 36.0299C28.4634 36.0299 28.8734 36.0299 29.2734 36.0299C29.5834 36.0299 29.7434 35.8999 29.7334 35.5699C29.7334 35.2599 29.5734 35.1399 29.2934 35.1399C28.4834 35.1399 27.6734 35.1399 26.8634 35.1399C26.5734 35.1399 26.4334 35.2699 26.4234 35.5699C26.4234 35.8999 26.5834 36.0199 26.8934 36.0199C27.2834 36.0199 27.6734 36.0199 28.0534 36.0199M28.5234 30.2899C28.5234 29.3899 28.5234 28.4899 28.5234 27.5899C28.5234 27.2699 28.5234 26.9599 28.0634 26.9699C27.6334 26.9699 27.6334 27.2699 27.6334 27.5699C27.6334 29.3699 27.6334 31.1699 27.6334 32.9799C27.6334 33.2799 27.6334 33.5699 28.0634 33.5699C28.5234 33.5699 28.5134 33.2599 28.5234 32.9499C28.5234 32.0699 28.5234 31.1799 28.5234 30.2999M28.0734 25.4099C29.8134 25.4099 31.5534 25.4099 33.2934 25.4099C33.4634 25.4099 33.6334 25.4099 33.8034 25.3999C34.2834 25.3499 34.5934 25.0199 34.6034 24.5699C34.6034 24.0999 34.2934 23.7599 33.7834 23.7099C33.6334 23.6999 33.4834 23.6999 33.3234 23.6999C29.8234 23.6999 26.3334 23.6999 22.8334 23.6999C22.6434 23.6999 22.4634 23.6999 22.2734 23.7199C21.8334 23.7899 21.5434 24.1299 21.5534 24.5599C21.5534 24.9899 21.8434 25.3299 22.2934 25.3899C22.4734 25.4199 22.6634 25.4099 22.8534 25.4099C24.5934 25.4099 26.3334 25.4099 28.0734 25.4099ZM25.5434 37.6299C25.0134 37.3499 24.8434 36.8999 24.8634 36.3199C24.8934 35.7799 24.8634 35.2299 24.8634 34.6899C24.8734 33.9999 25.0434 33.7599 25.6934 33.5999C25.9934 33.5299 26.0734 33.3699 26.0734 33.0999C26.0734 31.2299 26.0734 29.3599 26.0734 27.4899C26.0734 27.0799 25.8634 26.9699 25.5034 26.9699C24.5234 26.9699 23.5434 26.9899 22.5634 26.9699C21.1434 26.9299 20.1934 26.0999 20.0434 24.8099C19.9034 23.6399 20.6934 22.5199 21.8434 22.2599C22.1934 22.1799 22.5434 22.1499 22.9034 22.1499C26.3534 22.1499 29.8034 22.1499 33.2434 22.1499C33.5634 22.1499 33.8834 22.1799 34.2034 22.2399C35.3334 22.4499 36.1134 23.3999 36.1234 24.5399C36.1334 25.6999 35.3334 26.6799 34.1834 26.8799C33.0934 27.0699 31.9934 26.9399 30.8934 26.9599C30.0834 26.9799 30.0634 26.9799 30.0634 27.7799C30.0634 29.4799 30.0634 31.1799 30.0634 32.8799C30.0634 33.2799 30.1234 33.5499 30.6034 33.6199C31.0734 33.6899 31.2734 34.0599 31.2834 34.5099C31.2934 35.2099 31.2834 35.9099 31.2834 36.5999C31.2834 37.0799 31.0134 37.3899 30.6234 37.6099H25.5534L25.5434 37.6299Z"
+        fill="currentColor"
+      />
+      <path
+        d="M22.0835 35.5C21.9635 33.86 21.8335 32.21 21.7235 30.57C21.6335 29.19 21.0535 28.61 19.6735 28.61C17.2935 28.61 14.9035 28.61 12.5235 28.61C11.6835 28.61 11.5335 28.5 11.3035 27.7C10.6435 25.45 9.99353 23.19 9.33352 20.94C9.24353 20.65 9.16352 20.35 9.03352 20.08C8.86352 19.72 8.53352 19.57 8.14352 19.65C7.74352 19.73 7.52352 20 7.49352 20.39C7.47352 20.57 7.50352 20.76 7.53352 20.95C7.99352 24.22 8.44353 27.48 8.90353 30.75C9.13353 32.37 9.37352 33.98 9.59352 35.6C9.64352 35.99 9.86352 36.14 10.2135 36.1C10.5635 36.06 11.0335 36.25 11.1735 35.69C11.4435 34.6 11.8335 34.28 12.9435 34.28C14.7135 34.28 16.4935 34.32 18.2635 34.26C19.4835 34.22 20.4735 34.38 20.8335 35.81C20.9535 36.28 21.4535 36.1 21.8135 36.06C22.1335 36.02 22.1335 35.77 22.1135 35.52M8.39352 18.01C8.49352 18.05 8.58353 18.1 8.67353 18.12C9.70353 18.34 10.3135 19 10.5935 20C11.2035 22.11 11.8135 24.21 12.4335 26.32C12.6635 27.12 12.6735 27.13 13.5135 27.13C15.6235 27.13 17.7335 27.13 19.8435 27.13C21.8135 27.13 23.0535 28.36 23.1735 30.34C23.2635 31.92 23.4135 33.49 23.5435 35.07C23.5435 35.14 23.5535 35.21 23.5635 35.27C23.6735 36.72 23.4935 37.03 22.1835 37.63H20.7635C19.9935 37.4 19.4635 36.93 19.2835 36.12C19.2235 35.87 19.0535 35.76 18.8035 35.76C16.8935 35.76 14.9835 35.76 13.0835 35.76C12.8935 35.76 12.6735 35.78 12.6535 36.02C12.5735 36.92 12.0035 37.35 11.2335 37.62H9.61353C8.81353 37.38 8.24352 36.95 8.12352 36.03C7.45352 31.19 6.76353 26.35 6.09353 21.5C5.79353 19.32 6.14352 18.76 8.20352 18H8.40353L8.39352 18.01Z"
+        fill="currentColor"
+      />
+      <path
+        d="M40.054 28.6098C38.804 28.6098 37.554 28.6098 36.304 28.6098C35.224 28.6198 34.584 29.1898 34.484 30.2698C34.324 32.0298 34.214 33.7898 34.074 35.5598C34.064 35.7498 34.074 35.9298 34.284 36.0298C34.734 36.2398 35.324 35.9798 35.494 35.4998C35.814 34.5998 36.234 34.2698 37.184 34.2698C39.224 34.2698 41.274 34.2698 43.314 34.2698C44.344 34.2698 44.784 34.6498 45.014 35.6498C45.054 35.8398 45.104 35.9998 45.314 36.0698C46.044 36.3098 46.564 35.9998 46.674 35.2298C47.244 31.1498 47.804 27.0798 48.374 23.0098C48.484 22.2198 48.604 21.4298 48.694 20.6298C48.754 20.1298 48.484 19.7398 48.084 19.6398C47.644 19.5298 47.254 19.7598 47.064 20.2598C46.974 20.4998 46.914 20.7498 46.834 20.9898C46.174 23.2398 45.524 25.4998 44.874 27.7498C44.664 28.4498 44.474 28.5998 43.754 28.6098C42.524 28.6098 41.284 28.6098 40.054 28.6098ZM33.974 37.6298C33.774 37.5398 33.564 37.4798 33.374 37.3698C32.804 37.0498 32.534 36.5398 32.584 35.8898C32.694 34.2598 32.814 32.6398 32.944 31.0098C32.974 30.5498 32.994 30.0898 33.084 29.6398C33.374 28.1698 34.574 27.1598 36.064 27.1398C38.274 27.1198 40.494 27.1398 42.704 27.1298C43.484 27.1298 43.504 27.1098 43.724 26.3698C44.284 24.4498 44.894 22.5298 45.384 20.5898C45.724 19.2498 46.364 18.2898 47.774 18.0198H47.974C48.054 18.0498 48.124 18.0898 48.214 18.1098C49.754 18.5498 50.374 19.4598 50.154 21.0698C49.484 25.9298 48.774 30.7898 48.114 35.6498C47.974 36.6698 47.584 37.3798 46.554 37.6398H44.934C44.264 37.3798 43.644 37.0498 43.564 36.2398C43.524 35.8098 43.294 35.6998 42.924 35.7098C42.014 35.7298 41.104 35.7598 40.194 35.7698C39.284 35.7798 38.374 35.7698 37.464 35.7698C37.194 35.7698 36.944 35.8098 36.874 36.1298C36.694 36.9498 36.164 37.4098 35.394 37.6398H33.974V37.6298Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default IndoorLoungeIcon;
diff --git a/client/src/components/icons/amenities/IntegratedLapPoolIcon.tsx b/client/src/components/icons/amenities/IntegratedLapPoolIcon.tsx
new file mode 100644
index 0000000..e68a830
--- /dev/null
+++ b/client/src/components/icons/amenities/IntegratedLapPoolIcon.tsx
@@ -0,0 +1,16 @@
+function IntegratedLapPoolIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M44.75 28.69C43.63 28.69 42.66 28.38 41.78 27.75C41.04 27.22 40.48 26.54 39.93 25.88C39.43 25.28 38.95 24.71 38.39 24.3C37.8 23.87 37.17 23.68 36.4 23.68C35.63 23.68 35 23.88 34.41 24.3C33.84 24.71 33.37 25.28 32.87 25.88C32.32 26.54 31.76 27.21 31.02 27.75C30.14 28.38 29.17 28.69 28.05 28.69C26.93 28.69 25.96 28.38 25.08 27.75C24.34 27.22 23.78 26.54 23.23 25.88C22.73 25.28 22.25 24.71 21.69 24.3C21.1 23.87 20.47 23.68 19.7 23.68C18.93 23.68 18.3 23.88 17.71 24.3C17.14 24.71 16.67 25.28 16.17 25.88C15.62 26.54 15.06 27.21 14.32 27.75C13.44 28.38 12.47 28.69 11.35 28.69C10.23 28.69 9.26 28.38 8.38 27.75C7.64 27.22 7.08 26.54 6.53 25.88C6.03 25.28 5.55 24.71 4.99 24.3C4.4 23.87 3.77 23.68 3 23.68V22C4.12 22 5.09 22.31 5.97 22.94C6.71 23.47 7.27 24.15 7.82 24.81C8.32 25.41 8.79 25.98 9.36 26.39C9.95 26.82 10.58 27.01 11.35 27.01C12.12 27.01 12.75 26.81 13.34 26.39C13.91 25.98 14.38 25.41 14.88 24.81C15.43 24.15 15.99 23.48 16.73 22.94C17.61 22.31 18.58 22 19.7 22C20.82 22 21.79 22.31 22.67 22.94C23.41 23.47 23.97 24.15 24.52 24.81C25.02 25.41 25.49 25.98 26.06 26.39C26.65 26.82 27.28 27.01 28.05 27.01C28.82 27.01 29.45 26.81 30.04 26.39C30.61 25.98 31.08 25.41 31.58 24.81C32.13 24.15 32.69 23.48 33.43 22.94C34.31 22.31 35.28 22 36.4 22C37.52 22 38.49 22.31 39.37 22.94C40.11 23.47 40.67 24.15 41.22 24.81C41.72 25.41 42.2 25.98 42.76 26.39C43.35 26.82 43.98 27.01 44.75 27.01C45.52 27.01 46.15 26.81 46.74 26.39C47.31 25.98 47.78 25.41 48.28 24.81C48.83 24.15 49.39 23.48 50.13 22.94C51.01 22.31 51.98 22 53.1 22V23.68C52.34 23.68 51.7 23.88 51.11 24.3C50.54 24.71 50.07 25.28 49.57 25.88C49.02 26.54 48.46 27.21 47.72 27.75C46.84 28.38 45.87 28.69 44.75 28.69Z"
+        fill="#00BED7"
+      />
+      <path
+        d="M44.75 38.0201C43.63 38.0201 42.66 37.7101 41.78 37.0801C41.04 36.5501 40.48 35.8701 39.93 35.2101C39.43 34.6101 38.95 34.0401 38.39 33.6301C37.8 33.2001 37.17 33.0101 36.4 33.0101C35.63 33.0101 35 33.2101 34.41 33.6301C33.84 34.0401 33.37 34.6101 32.87 35.2101C32.32 35.8701 31.76 36.5401 31.02 37.0801C30.14 37.7101 29.17 38.0201 28.05 38.0201C26.93 38.0201 25.96 37.7101 25.08 37.0801C24.34 36.5501 23.78 35.8701 23.23 35.2101C22.73 34.6101 22.25 34.0401 21.69 33.6301C21.1 33.2001 20.47 33.0101 19.7 33.0101C18.93 33.0101 18.3 33.2101 17.71 33.6301C17.14 34.0401 16.67 34.6101 16.17 35.2101C15.62 35.8701 15.06 36.5401 14.32 37.0801C13.44 37.7101 12.47 38.0201 11.35 38.0201C10.23 38.0201 9.26 37.7101 8.38 37.0801C7.64 36.5501 7.08 35.8701 6.53 35.2101C6.03 34.6101 5.55 34.0401 4.99 33.6301C4.4 33.2001 3.77 33.0101 3 33.0101V31.3301C4.12 31.3301 5.09 31.6401 5.97 32.2701C6.71 32.8001 7.27 33.4801 7.82 34.1401C8.32 34.7401 8.79 35.3101 9.36 35.7201C9.95 36.1501 10.58 36.3401 11.35 36.3401C12.12 36.3401 12.75 36.1401 13.34 35.7201C13.91 35.3101 14.38 34.7401 14.88 34.1401C15.43 33.4801 15.99 32.8101 16.73 32.2701C17.61 31.6401 18.58 31.3301 19.7 31.3301C20.82 31.3301 21.79 31.6401 22.67 32.2701C23.41 32.8001 23.97 33.4801 24.52 34.1401C25.02 34.7401 25.49 35.3101 26.06 35.7201C26.65 36.1501 27.28 36.3401 28.05 36.3401C28.82 36.3401 29.45 36.1401 30.04 35.7201C30.61 35.3101 31.08 34.7401 31.58 34.1401C32.13 33.4801 32.69 32.8101 33.43 32.2701C34.31 31.6401 35.28 31.3301 36.4 31.3301C37.52 31.3301 38.49 31.6401 39.37 32.2701C40.11 32.8001 40.67 33.4801 41.22 34.1401C41.72 34.7401 42.2 35.3101 42.76 35.7201C43.35 36.1501 43.98 36.3401 44.75 36.3401C45.52 36.3401 46.15 36.1401 46.74 35.7201C47.31 35.3101 47.78 34.7401 48.28 34.1401C48.83 33.4801 49.39 32.8101 50.13 32.2701C51.01 31.6401 51.98 31.3301 53.1 31.3301V33.0101C52.34 33.0101 51.7 33.2101 51.11 33.6301C50.54 34.0401 50.07 34.6101 49.57 35.2101C49.02 35.8701 48.46 36.5401 47.72 37.0801C46.84 37.7101 45.87 38.0201 44.75 38.0201Z"
+        fill="#00BED7"
+      />
+    </svg>
+  );
+}
+
+export default IntegratedLapPoolIcon;
diff --git a/client/src/components/icons/amenities/JacuzziIcon.tsx b/client/src/components/icons/amenities/JacuzziIcon.tsx
new file mode 100644
index 0000000..8ba3107
--- /dev/null
+++ b/client/src/components/icons/amenities/JacuzziIcon.tsx
@@ -0,0 +1,35 @@
+function JacuzziIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M49.0502 27.2249H7M7 36.1273C7 40.0713 10.2487 43.2971 14.2155 43.2971H41.8347C45.8015 43.2971 49.0502 40.0713 49.0502 36.1273V26.9399C49.0502 25.5378 47.9103 24.3979 46.4969 24.3979H9.55335C8.1399 24.3979 7 25.5378 7 26.9399V36.1273Z"
+        stroke="currentColor"
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M30.3193 18.682C30.3193 19.5255 29.6239 20.2209 28.769 20.2209C27.9141 20.2209 27.2302 19.5369 27.2302 18.682C27.2302 17.8271 27.9255 17.1432 28.769 17.1432C29.6125 17.1432 30.3193 17.8271 30.3193 18.682ZM35.6083 17.8385C35.6083 18.5111 35.0612 19.0582 34.3886 19.0582C33.7161 19.0582 33.169 18.5111 33.169 17.8385C33.169 17.166 33.7161 16.6189 34.3886 16.6189C35.0612 16.6189 35.6083 17.166 35.6083 17.8385ZM35.3347 12.6179C35.3347 13.1422 34.913 13.564 34.3886 13.564C33.8643 13.564 33.4311 13.1422 33.4311 12.6179C33.4311 12.0935 33.8643 11.6718 34.3886 11.6718C34.913 11.6718 35.3347 12.0935 35.3347 12.6179ZM25.0416 14.3961C25.0416 14.9205 24.6199 15.3422 24.0955 15.3422C23.5712 15.3422 23.1494 14.9205 23.1494 14.3961C23.1494 13.8718 23.5712 13.45 24.0955 13.45C24.6199 13.45 25.0416 13.8718 25.0416 14.3961ZM30.3193 12.6179C30.3193 13.3246 29.7379 13.8946 29.0312 13.8946C28.3245 13.8946 27.7431 13.3246 27.7431 12.6179C27.7431 11.9111 28.3245 11.3298 29.0312 11.3298C29.7379 11.3298 30.3193 11.8997 30.3193 12.6179Z"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M15.1729 16.7526C16.5065 16.1143 17.0537 14.5299 16.4153 13.2076C15.777 11.8853 14.1812 11.3268 12.8589 11.9651C11.5366 12.6035 10.9781 14.1879 11.6164 15.5101C12.2548 16.8324 13.8506 17.3795 15.1729 16.7526ZM24.0069 19.9443C23.8815 19.078 23.2432 18.736 21.9323 19.0894C19.9603 19.6137 18.1252 19.4769 16.3925 18.3598C16.0962 18.1661 15.7542 18.0521 15.4236 17.9153C13.4744 17.0376 11.605 18.1547 11.4341 20.2862C11.3543 21.3007 11.2517 23.3266 11.1719 24.3411H16.5863C16.5863 24.3411 16.5863 24.2841 16.5863 24.2499C16.6433 23.5546 16.7003 21.8593 16.7573 21.0842C17.1904 21.2893 17.521 21.4945 17.8744 21.5971C18.3531 21.7225 18.8775 21.8707 19.3676 21.8251C20.3707 21.7225 21.3624 21.5173 22.3541 21.3349C23.6194 21.107 24.1095 20.6966 23.9955 19.9443H24.0069Z"
+        stroke="currentColor"
+        strokeWidth={2}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M44.1117 30.903C44.1117 30.8171 44.1813 30.7476 44.2671 30.7476V30.7476C44.3529 30.7476 44.4225 30.8171 44.4225 30.903V37.7619C44.4225 37.8478 44.3529 37.9174 44.2671 37.9174V37.9174C44.1813 37.9174 44.1117 37.8478 44.1117 37.7619V30.903ZM39.5293 30.903C39.5293 30.8171 39.5989 30.7476 39.6848 30.7476V30.7476C39.7706 30.7476 39.8402 30.8171 39.8402 30.903V37.7619C39.8402 37.8478 39.7706 37.9174 39.6848 37.9174V37.9174C39.5989 37.9174 39.5293 37.8478 39.5293 37.7619V30.903ZM34.9584 30.903C34.9584 30.8171 35.028 30.7476 35.1139 30.7476V30.7476C35.1997 30.7476 35.2693 30.8171 35.2693 30.903V37.7619C35.2693 37.8478 35.1997 37.9174 35.1139 37.9174V37.9174C35.028 37.9174 34.9584 37.8478 34.9584 37.7619V30.903ZM30.3875 30.903C30.3875 30.8171 30.4571 30.7476 30.5429 30.7476V30.7476C30.6288 30.7476 30.6984 30.8171 30.6984 30.903V37.7619C30.6984 37.8478 30.6288 37.9174 30.5429 37.9174V37.9174C30.4571 37.9174 30.3875 37.8478 30.3875 37.7619V30.903ZM25.8166 30.903C25.8166 30.8171 25.8862 30.7476 25.972 30.7476V30.7476C26.0579 30.7476 26.1274 30.8171 26.1274 30.903V37.7619C26.1274 37.8478 26.0579 37.9174 25.972 37.9174V37.9174C25.8862 37.9174 25.8166 37.8478 25.8166 37.7619V30.903ZM21.2343 30.903C21.2343 30.8171 21.3039 30.7476 21.3897 30.7476V30.7476C21.4756 30.7476 21.5451 30.8171 21.5451 30.903V37.7619C21.5451 37.8478 21.4756 37.9174 21.3897 37.9174V37.9174C21.3039 37.9174 21.2343 37.8478 21.2343 37.7619V30.903ZM16.6634 30.903C16.6634 30.8171 16.7329 30.7476 16.8188 30.7476V30.7476C16.9046 30.7476 16.9742 30.8171 16.9742 30.903V37.7619C16.9742 37.8478 16.9046 37.9174 16.8188 37.9174V37.9174C16.7329 37.9174 16.6634 37.8478 16.6634 37.7619V30.903ZM12.0811 30.903C12.0811 30.8171 12.1506 30.7476 12.2365 30.7476V30.7476C12.3223 30.7476 12.3919 30.8171 12.3919 30.903V37.7619C12.3919 37.8478 12.3223 37.9174 12.2365 37.9174V37.9174C12.1506 37.9174 12.0811 37.8478 12.0811 37.7619V30.903Z"
+        stroke="currentColor"
+        strokeWidth={1.5}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+export default JacuzziIcon;
diff --git a/client/src/components/icons/amenities/KaraokeRoomIcon.tsx b/client/src/components/icons/amenities/KaraokeRoomIcon.tsx
new file mode 100644
index 0000000..afa8fa0
--- /dev/null
+++ b/client/src/components/icons/amenities/KaraokeRoomIcon.tsx
@@ -0,0 +1,16 @@
+function KaraokeRoomIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M18.9205 37.2114C19.1205 37.2314 19.2304 37.0914 19.3604 36.9814C21.1504 35.4414 22.9405 33.9014 24.7305 32.3614C26.6305 30.7314 28.5205 29.0914 30.4205 27.4714C30.7005 27.2314 30.6905 27.1214 30.3505 26.9614C29.8405 26.7214 29.3605 26.4214 28.9105 26.0814C27.7905 25.2114 26.8905 24.1714 26.2805 22.8914C26.1405 22.5914 26.0105 22.5814 25.8305 22.8414C25.8005 22.8814 25.7505 22.9214 25.7205 22.9614C22.6705 26.4514 19.6304 29.9414 16.5804 33.4414C15.8504 34.2814 15.8305 34.5414 16.4305 35.4814C16.5605 35.6814 16.6904 35.8814 16.8604 36.0514C17.4204 36.6514 18.0905 37.0714 18.9105 37.2114M34.3805 26.3014C38.4405 26.3214 41.7705 23.0414 41.7905 19.0114C41.8105 14.9214 38.5305 11.6214 34.4205 11.6014C30.3305 11.5814 26.9705 14.8214 26.9505 18.8214C26.9305 23.0114 30.1705 26.2814 34.3805 26.3014ZM43.3705 18.8614C43.3805 23.4314 40.0705 27.2114 35.5605 27.8314C34.7005 27.9514 33.8505 27.9514 32.9905 27.7914C32.6905 27.7414 32.4605 27.7914 32.2205 28.0014C28.4305 31.2714 24.6405 34.5414 20.8505 37.8014C20.7705 37.8614 20.6905 37.9214 20.6205 37.9914C19.6405 39.0314 18.5305 38.9314 17.3805 38.3614C15.8105 37.5814 14.8005 36.3614 14.4505 34.6314C14.3305 34.0214 14.4705 33.4714 14.8905 32.9914C17.7805 29.6814 20.6705 26.3714 23.5605 23.0514C24.1505 22.3714 24.7405 21.6914 25.3405 21.0214C25.4905 20.8514 25.5305 20.6814 25.5005 20.4514C25.0605 17.4914 25.8305 14.8914 27.9205 12.7214C29.4305 11.1614 31.2905 10.2914 33.4705 10.0514C37.8705 9.57136 42.1305 12.5014 43.1605 16.9314C43.3105 17.5914 43.4105 18.2514 43.3805 18.8514"
+        fill="currentColor"
+      />
+      <path
+        d="M18.8803 43.9314C19.5503 43.9214 20.4403 43.5514 21.1703 42.8214C22.6403 41.3514 24.1203 39.8914 25.6003 38.4214C27.1503 36.8914 29.0003 36.4714 31.0503 37.1814C33.0703 37.8814 34.2603 39.3714 34.5903 41.4714C34.9003 43.4514 34.1603 45.0314 32.5903 46.2614C32.4203 46.3914 32.3003 46.4114 32.1603 46.2414C32.1603 46.2314 32.1403 46.2214 32.1303 46.2114C31.8903 45.9214 31.5003 45.6614 31.4403 45.3414C31.3703 44.9814 31.8903 44.8314 32.1303 44.5714C33.0803 43.5714 33.2703 42.3914 32.9003 41.1314C32.4903 39.7514 31.5303 38.8614 30.1003 38.5414C28.8203 38.2514 27.7003 38.5814 26.7703 39.5114C25.2703 40.9914 23.7903 42.4914 22.2803 43.9614C20.7903 45.4114 19.0003 45.8614 17.0203 45.2914C14.9903 44.7014 13.7803 43.2814 13.3503 41.2314C13.0903 40.0014 13.3303 38.8414 13.9203 37.7414C14.0603 37.4814 14.1503 37.4314 14.3903 37.6914C14.9403 38.2514 15.1703 38.7414 14.9403 39.6314C14.3703 41.8414 16.2103 43.9514 18.8903 43.9514"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default KaraokeRoomIcon;
diff --git a/client/src/components/icons/amenities/LoungingSpaceIcon.tsx b/client/src/components/icons/amenities/LoungingSpaceIcon.tsx
new file mode 100644
index 0000000..9a92313
--- /dev/null
+++ b/client/src/components/icons/amenities/LoungingSpaceIcon.tsx
@@ -0,0 +1,20 @@
+function LoungingSpaceIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M48.5095 32.2808C48.5814 32.2808 48.6473 32.3121 48.6856 32.3583L48.6848 32.359C48.7336 32.4127 48.7521 32.4776 48.7424 32.5456C48.7424 32.5457 48.7424 32.5457 48.7424 32.5458L47.4583 41.4839L47.4583 41.4839L47.4577 41.4886C47.4437 41.6003 47.3429 41.6899 47.2254 41.6899H38.8533C38.7358 41.6899 38.635 41.6003 38.621 41.4886L38.621 41.4886L38.6204 41.4839L37.3363 32.5458C37.3363 32.5458 37.3362 32.5458 37.3362 32.5457C37.3263 32.4763 37.3457 32.4061 37.3924 32.349C37.4306 32.3023 37.4968 32.2706 37.5692 32.2706H38.8836H39.1588L39.1379 31.9962C39.0267 30.541 38.5095 25.1715 36.3871 21.3163L36.3871 21.3163L36.3866 21.3154C36.3401 21.2318 36.3523 21.125 36.4171 21.0502L36.4172 21.0503L36.4223 21.044C36.479 20.9742 36.5829 20.9446 36.6816 20.9806C36.7512 21.0068 37.7853 21.4072 38.8601 22.4234L39.4279 22.9602L39.2861 22.1918L38.5583 18.2496C38.5434 18.1636 38.5745 18.0797 38.6313 18.0277C38.6918 17.9722 38.7708 17.9507 38.8481 17.972C38.8503 17.9727 38.8527 17.9735 38.8554 17.9744C39.0978 18.0558 41.2698 18.785 42.3491 21.3658L42.5872 21.9353L42.8204 21.3637C43.3283 20.1189 44.2652 18.5189 45.8503 17.7907C45.9548 17.7491 46.0437 17.7656 46.0971 17.8077L46.2544 17.6076L46.0972 17.8077C46.1638 17.86 46.2009 17.9485 46.1945 18.0324C46.1931 18.0397 46.1924 18.0445 46.1924 18.0446C46.1905 18.0556 46.1883 18.0694 46.1859 18.0851C46.181 18.1168 46.1746 18.161 46.1668 18.2164C46.1512 18.3275 46.1296 18.4865 46.103 18.6872C46.0498 19.0886 45.9765 19.6579 45.8905 20.346L45.8139 20.958L46.3003 20.5787C46.7856 20.2001 47.4104 19.8442 48.147 19.7509C48.2249 19.7413 48.3053 19.7703 48.362 19.8321C48.4144 19.8893 48.4338 19.9628 48.4138 20.0428L48.4138 20.0428C48.3455 20.3142 46.8493 26.6475 46.8794 32.0272L46.8808 32.2808H47.1344H48.5095ZM47.7578 20.7446L47.863 20.2544L47.4049 20.458C46.9148 20.6759 46.5095 20.9967 46.2293 21.2597C46.0884 21.3919 45.977 21.5116 45.9001 21.5999C45.8775 21.6258 45.8576 21.6492 45.8408 21.6697H45.7235L45.698 21.8961C45.3642 24.8596 44.9883 28.9485 45.0392 32.03L45.0433 32.2808H45.2941H46.1334H46.3895L46.3884 32.0246C46.3683 27.6557 47.3437 22.6736 47.7578 20.7446ZM45.5773 19.0257L45.6616 18.3856L45.1627 18.7953C44.3574 19.4566 43.8016 20.3724 43.4348 21.1654C43.0667 21.9613 42.88 22.653 42.8223 22.8841L42.8084 22.9395L42.8196 22.9956C43.4296 26.0657 43.3003 30.6366 43.2496 32.0164L43.2399 32.2808H43.5044H44.3134H44.572L44.5683 32.0222C44.508 27.7256 45.2536 21.4839 45.5773 19.0257ZM42.5135 32.2808H42.7574L42.7683 32.0372C42.7988 31.3554 42.847 29.7491 42.8 27.9418C42.7546 26.194 42.6199 24.2407 42.2881 22.7534L42.2991 22.7423L42.2662 22.6037C41.751 20.438 40.463 19.3346 39.5888 18.8229L39.1092 18.5421L39.2091 19.0888L40.0888 23.9017L40.0972 23.9478L40.1214 23.9879C40.6008 24.7803 41.0034 25.7606 41.2001 26.9804C41.5916 29.4298 41.6216 31.2657 41.6216 32.0258V32.2808H41.8766H42.5135ZM37.8843 22.2265L37.1176 21.6496L37.4967 22.531C39.127 26.3216 39.5396 30.765 39.62 32.0418L39.6351 32.2808H39.8745H40.8856H41.1406V32.0258C41.1406 31.2995 41.1099 29.4651 40.7229 27.0613C40.3157 24.5136 38.9443 23.0241 37.8843 22.2265ZM46.7906 41.219H47.0116L47.043 41.0003L48.1856 33.0428L48.2274 32.7515H47.9332H38.1354H37.8412L37.883 33.0428L39.0256 41.0003L39.057 41.219H39.278H46.7906Z"
+        stroke="currentColor"
+        strokeWidth={0.51}
+        strokeMiterlimit={10}
+      />
+      <path
+        d="M15.6276 29.4858H15.9433H27.4903H27.806L27.7396 29.7944L27.3352 31.6749C27.2492 32.0766 26.8815 32.3719 26.4691 32.3719H21.7269H21.7067H16.9646C16.5522 32.3719 16.1846 32.0766 16.0985 31.675L15.6276 29.4858ZM15.6276 29.4858L15.694 29.7944L16.0984 31.6749L15.6276 29.4858ZM33.2335 23.8279H33.4393C34.4671 23.9297 35.2636 24.7856 35.2636 25.8277C35.2636 26.9385 34.3588 27.8376 33.2335 27.8376H32.4752H32.2678L32.2255 28.0407L31.296 32.5065C31.2959 32.507 31.2958 32.5075 31.2957 32.508C31.0267 33.7163 30.3068 34.7448 29.3342 35.4381L29.2218 35.5182L29.2275 35.6562L29.4901 42.0607C29.4891 42.1411 29.46 42.2031 29.4233 42.2399L29.423 42.2396L29.414 42.2496C29.3772 42.2905 29.3181 42.3169 29.2497 42.3169H26.9039C26.7954 42.3169 26.6927 42.2349 26.6705 42.1075L26.2058 38.9153L26.174 38.6971H25.9534H17.4802H17.2597L17.2279 38.9153L16.7628 42.1105L16.7627 42.1105L16.7621 42.1156C16.7481 42.2273 16.6473 42.3169 16.5298 42.3169H14.184C14.1156 42.3169 14.0564 42.2905 14.0196 42.2496L14.0199 42.2494L14.0104 42.2399C13.968 42.1975 13.9445 42.1381 13.9436 42.0608L14.2062 35.6562L14.2118 35.5182L14.0994 35.4381C13.1248 34.7433 12.3966 33.7243 12.1382 32.5087L12.138 32.508L11.1673 28.0086L11.122 27.7985L10.9073 27.8076L10.1949 27.8376C9.07281 27.8348 8.17004 26.9274 8.17004 25.8277C8.17004 24.7263 9.07561 23.8178 10.2002 23.8178H10.9585C11.2613 23.8178 11.5654 23.8557 11.851 23.9224L12.264 24.0187L12.1555 23.6088C11.8831 22.5799 11.4506 20.8493 11.163 19.1781C11.0192 18.3422 10.9127 17.5267 10.8797 16.8242C10.8463 16.1126 10.8906 15.5507 11.0247 15.2012L11.0249 15.2006C11.228 14.6669 11.5073 14.2927 11.8498 14.0286C12.1939 13.7633 12.617 13.5976 13.1249 13.5054C14.1541 13.3184 15.4712 13.4413 17.0614 13.5942C18.4168 13.7257 19.9644 13.8684 21.7168 13.8684C23.4691 13.8684 25.0165 13.7257 26.3719 13.5943C27.9621 13.4464 29.2792 13.326 30.3088 13.5129C30.8169 13.6052 31.2401 13.7705 31.5843 14.0346C31.9266 14.2974 32.2056 14.6696 32.4086 15.2001C32.5407 15.553 32.5835 16.1174 32.5497 16.8299C32.5163 17.534 32.41 18.3506 32.2668 19.1871C31.9805 20.8597 31.5505 22.5904 31.2782 23.6189L31.1706 24.0255L31.5809 23.9329C31.8788 23.8656 32.1733 23.8279 32.4752 23.8279H33.2335ZM16.9989 14.0774L16.9984 14.0774C15.3877 13.9269 14.1756 13.8256 13.2953 13.9631C12.8482 14.0329 12.4671 14.1665 12.1552 14.4002C11.8837 14.6035 11.6789 14.8719 11.5265 15.2087H11.5112L11.4484 15.3725C11.3101 15.7331 11.2918 16.3017 11.3333 16.9501C11.3757 17.6123 11.4845 18.4033 11.6313 19.2377C11.925 20.9072 12.3745 22.7709 12.7655 24.1674L12.7957 24.2752L12.8955 24.326C14.0037 24.8896 14.8412 25.9198 15.1074 27.1749L15.1076 27.1758L15.4615 28.8139L15.505 29.015H15.7108H27.6825H27.8882L27.9317 28.8139L28.2854 27.1767C28.2854 27.1766 28.2855 27.1764 28.2855 27.1763C28.5615 25.9207 29.3995 24.899 30.5001 24.3248L30.5981 24.2736L30.6278 24.1672C31.0187 22.7658 31.4682 20.9022 31.7632 19.2341C31.9106 18.4004 32.0203 17.6105 32.0642 16.9492C32.1071 16.3016 32.0906 15.7343 31.9556 15.3742L31.9552 15.3731C31.7975 14.9581 31.5725 14.6356 31.2583 14.4002C30.9464 14.1665 30.5653 14.0329 30.1181 13.9631C29.2378 13.8256 28.0257 13.9269 26.415 14.0774L26.4145 14.0774L26.3745 14.0813C25.0085 14.2119 23.4655 14.3594 21.7067 14.3594C19.9479 14.3594 18.405 14.2119 17.0389 14.0813L16.9989 14.0774ZM27.0863 41.6279L27.1181 41.8461H27.3387H28.734H28.7542H29.0195L29.009 41.5811L28.7967 36.1918L28.7821 35.8215L28.4415 35.9675C27.8304 36.2293 27.1669 36.3917 26.4792 36.3917H16.9848C16.2971 36.3917 15.6336 36.2293 15.0226 35.9675L14.6819 35.8215L14.6673 36.1918L14.4549 41.5811L14.4445 41.8461H14.7097H16.1051H16.3257L16.3574 41.6279L16.8226 38.4327L16.8226 38.4327L16.8233 38.4276C16.8372 38.3159 16.9381 38.2263 17.0556 38.2263H26.3882C26.4968 38.2263 26.5994 38.3083 26.6217 38.4357L27.0863 41.6279ZM32.4752 27.377H33.2133H33.2335V27.3769C34.0705 27.366 34.7625 26.6823 34.7625 25.8378C34.7625 24.9879 34.0707 24.2987 33.2133 24.2987H32.4549C30.6787 24.2987 29.1169 25.5434 28.7475 27.2708L27.7771 31.7691C27.7771 31.7693 27.7771 31.7695 27.777 31.7697C27.6407 32.39 27.0776 32.8427 26.4388 32.8427H16.9443C16.3054 32.8427 15.7422 32.3899 15.6061 31.7695C15.606 31.7693 15.606 31.7692 15.606 31.7691L14.6356 27.2708L14.3862 27.3242L14.6355 27.2704L14.6355 27.2706C14.266 25.5432 12.7044 24.2987 10.9282 24.2987H10.1698C9.3238 24.2987 8.62059 24.9866 8.62059 25.8378C8.62059 26.6878 9.31239 27.377 10.1698 27.377H10.9282C11.2567 27.377 11.5441 27.6102 11.6091 27.9135L11.6091 27.9139L12.5798 32.4134L12.5798 32.4134C13.0201 34.4538 14.8646 35.9209 16.9544 35.9209H26.4489C28.5498 35.9209 30.3833 34.4428 30.8235 32.4137L30.8235 32.4134L31.7936 27.9167C31.8689 27.6055 32.1519 27.377 32.4752 27.377Z"
+        stroke="currentColor"
+        strokeWidth={0.51}
+        strokeMiterlimit={10}
+      />
+    </svg>
+  );
+}
+
+export default LoungingSpaceIcon;
diff --git a/client/src/components/icons/activities/LushLandscapeIcon.tsx b/client/src/components/icons/amenities/LushLandscapeIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/LushLandscapeIcon.tsx
rename to client/src/components/icons/amenities/LushLandscapeIcon.tsx
diff --git a/client/src/components/icons/amenities/MonkeyBarsIcon.tsx b/client/src/components/icons/amenities/MonkeyBarsIcon.tsx
new file mode 100644
index 0000000..0e1a286
--- /dev/null
+++ b/client/src/components/icons/amenities/MonkeyBarsIcon.tsx
@@ -0,0 +1,12 @@
+function MonkeyBarsIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M42.8304 41.6099C42.4804 41.5899 42.1204 41.6099 41.7704 41.6099C41.3804 41.6099 41.0004 41.6099 40.6104 41.6099C40.4204 41.6099 40.3504 41.5299 40.3404 41.3499C40.3204 40.7499 40.3104 40.7499 40.9104 40.7499C41.5604 40.7499 42.2204 40.7499 42.8704 40.7499C43.1204 40.7499 43.2304 40.8299 43.2004 41.0799C43.2004 41.1299 43.2004 41.1899 43.2004 41.2399C43.2404 41.5199 43.1304 41.6399 42.8304 41.6199M40.2704 14.6199C40.2504 14.6799 40.1704 14.6899 40.1004 14.6899C40.0104 14.6899 39.9304 14.6899 39.8404 14.6899C35.2904 14.6899 30.7404 14.6899 26.1904 14.6899C26.0404 14.6899 25.8304 14.7799 25.7604 14.5899C25.6804 14.3899 25.7004 14.1499 25.7604 13.9399C25.7904 13.8099 25.9304 13.8399 26.0404 13.8399C26.4804 13.8399 26.9204 13.8399 27.3604 13.8399H33.0604C35.3404 13.8399 37.6104 13.8399 39.8904 13.8399C40.0304 13.8399 40.2404 13.7599 40.2904 13.9399C40.3604 14.1599 40.3504 14.3999 40.2904 14.6199M36.5104 16.1499C36.5104 15.8699 36.6638 15.7299 36.9704 15.7299C37.2771 15.7299 37.4304 15.8766 37.4304 16.1699C37.4304 16.4632 37.2771 16.6032 36.9704 16.5899C36.6638 16.5766 36.5104 16.4266 36.5104 16.1399M38.3904 24.0599C38.4004 24.8099 37.7604 25.4499 36.9804 25.4499C36.2004 25.4499 35.5604 24.8399 35.5504 24.0899C35.5304 23.3399 36.1804 22.6999 36.9504 22.6999C37.7304 22.6999 38.3704 23.2999 38.3904 24.0699M28.6504 16.1499C28.6504 15.8699 28.8038 15.7299 29.1104 15.7299C29.4171 15.7299 29.5704 15.8799 29.5704 16.1799C29.5704 16.4599 29.4171 16.5999 29.1104 16.5999C28.8038 16.5999 28.6504 16.4499 28.6504 16.1499ZM30.5304 24.0699C30.5304 24.8199 29.8904 25.4599 29.1204 25.4599C28.3404 25.4599 27.7004 24.8499 27.6904 24.0899C27.6904 23.3399 28.3304 22.7099 29.1004 22.6999C29.8804 22.6999 30.5204 23.3099 30.5304 24.0699ZM25.1404 41.6099C24.4904 41.6099 23.8304 41.6099 23.1804 41.6099C22.9304 41.6099 22.8404 41.5299 22.8504 41.2799C22.8504 40.7399 22.8504 40.7399 23.3904 40.7399H24.2904C24.6804 40.7399 25.0604 40.7399 25.4504 40.7399C25.6404 40.7399 25.7104 40.8099 25.7204 40.9999C25.7404 41.5999 25.7504 41.5999 25.1504 41.5999M22.7604 19.9999C22.7004 20.1099 22.5404 20.0599 22.4304 20.0599C21.2004 20.0599 19.9604 20.0599 18.7304 20.0599C18.2204 20.0599 17.9504 20.2299 17.9404 20.5699C17.9404 20.9099 18.2104 21.0999 18.7404 21.0999C19.9704 21.0999 21.2104 21.0999 22.4404 21.0999C22.7104 21.0999 22.8204 21.1699 22.8104 21.4499C22.7904 22.0399 22.7904 22.6299 22.8104 23.2199C22.8104 23.4699 22.7204 23.5499 22.4704 23.5499C21.2904 23.5499 20.1104 23.5499 18.9304 23.5499C17.7504 23.5499 16.6304 23.5499 15.4804 23.5499C15.2004 23.5499 15.1004 23.4699 15.1104 23.1899C15.1304 22.6099 15.1304 22.0299 15.1104 21.4499C15.1004 21.1599 15.2104 21.0699 15.4804 21.0999C15.6904 21.1199 15.9104 21.1099 16.1204 21.0999C16.4704 21.0799 16.7004 20.8599 16.7004 20.5799C16.7004 20.2999 16.4604 20.0899 16.1104 20.0699C15.8704 20.0599 15.6404 20.0599 15.4004 20.0699C15.2004 20.0699 15.0904 20.0099 15.1104 19.7999C15.1104 19.7899 15.1104 19.7799 15.1104 19.7699C15.0971 19.3966 15.2771 19.2099 15.6504 19.2099C17.9004 19.2099 20.1604 19.2099 22.4104 19.2099C22.5404 19.2099 22.7304 19.1399 22.7704 19.3199C22.8104 19.5399 22.8504 19.7899 22.7404 19.9999M22.4104 25.4599C21.2504 25.4399 20.0904 25.4599 18.9304 25.4599C17.7704 25.4599 16.6304 25.4399 15.4904 25.4599C15.1204 25.4599 15.1104 25.2899 15.1004 25.0199C15.1004 24.7299 15.1404 24.5799 15.4904 24.5899C17.8004 24.6099 20.1004 24.6099 22.4104 24.5899C22.7804 24.5899 22.7904 24.7599 22.8004 25.0299C22.8004 25.3199 22.7604 25.4699 22.4104 25.4699M15.1104 26.8099C15.1104 26.5799 15.1904 26.4999 15.4304 26.4999C17.7804 26.4999 20.1304 26.4999 22.4804 26.4999C22.7404 26.4999 22.8104 26.5999 22.8104 26.8399C22.8004 27.4299 22.7904 28.0199 22.8104 28.6099C22.8104 28.8699 22.7204 28.9599 22.4604 28.9499C21.2904 28.9499 20.1204 28.9499 18.9504 28.9499C17.7804 28.9499 16.6504 28.9499 15.5004 28.9499C15.2204 28.9499 15.1004 28.8899 15.1104 28.5799C15.1304 27.9899 15.1304 27.3999 15.1104 26.8099ZM22.4104 30.8599C21.2504 30.8399 20.0904 30.8599 18.9304 30.8599C17.7704 30.8599 16.6304 30.8499 15.4804 30.8599C15.1104 30.8599 15.1004 30.6899 15.1004 30.4199C15.1004 30.1299 15.1404 29.9799 15.5004 29.9899C17.8104 30.0099 20.1104 30.0099 22.4204 29.9899C22.7904 29.9899 22.8004 30.1599 22.8004 30.4299C22.8004 30.7199 22.7604 30.8699 22.4104 30.8599ZM22.8004 34.0199C22.8004 34.2399 22.7504 34.3499 22.5004 34.3399C20.1404 34.3399 17.7804 34.3399 15.4204 34.3399C15.1704 34.3399 15.1104 34.2399 15.1104 34.0199C15.1204 33.4199 15.1204 32.8199 15.1104 32.2199C15.1104 31.9599 15.2004 31.8899 15.4504 31.8899C16.6204 31.8899 17.7904 31.8899 18.9604 31.8899C20.1304 31.8899 21.2804 31.8899 22.4404 31.8899C22.7204 31.8899 22.8204 31.9599 22.8104 32.2499C22.7904 32.8399 22.8004 33.4299 22.8104 34.0199M22.8104 35.7899C22.8104 36.0499 22.8304 36.2599 22.4404 36.2499C21.2804 36.2299 20.1204 36.2499 18.9604 36.2499C17.8004 36.2499 16.6404 36.2299 15.4804 36.2499C15.1004 36.2499 15.1104 36.0599 15.1104 35.7999C15.1104 35.5299 15.1204 35.3699 15.4804 35.3799C17.8004 35.3899 20.1204 35.3899 22.4304 35.3799C22.7704 35.3799 22.8204 35.5199 22.8004 35.7999M22.8004 17.8799C22.8004 18.0999 22.7504 18.2099 22.5004 18.2099C20.1404 18.2099 17.7804 18.2099 15.4204 18.2099C15.1704 18.2099 15.1104 18.1099 15.1104 17.8899C15.1204 17.2899 15.1204 16.6899 15.1104 16.0899C15.1104 15.8399 15.2004 15.7599 15.4504 15.7599C16.6204 15.7599 17.7904 15.7599 18.9604 15.7599C20.1304 15.7599 21.2804 15.7599 22.4404 15.7599C22.7204 15.7599 22.8204 15.8299 22.8104 16.1199C22.7904 16.7099 22.8004 17.2999 22.8104 17.8899M15.4804 13.8599C16.6504 13.8799 17.8204 13.8599 18.9904 13.8599C20.1604 13.8599 21.2904 13.8699 22.4404 13.8599C22.7804 13.8599 22.8304 13.9999 22.8204 14.2799C22.8104 14.5299 22.8504 14.7399 22.4504 14.7399C20.1304 14.7199 17.8204 14.7199 15.5004 14.7399C15.1204 14.7399 15.1204 14.5599 15.1204 14.2899C15.1204 14.0299 15.1204 13.8599 15.4804 13.8599ZM23.9104 12.9499C24.1404 12.8599 24.4004 12.8999 24.6404 12.9499C24.7304 12.9699 24.7304 13.0599 24.7304 13.1299C24.7304 13.2299 24.7304 13.3199 24.7304 13.4199C24.7304 17.7299 24.7304 22.0299 24.7304 26.3399C24.7304 30.6699 24.7304 34.9999 24.7304 39.3199C24.7304 39.4599 24.8204 39.6799 24.6104 39.7299C24.3804 39.7799 24.1204 39.7899 23.8804 39.7099C23.8204 39.6899 23.8204 39.6099 23.8204 39.5399C23.8204 39.4499 23.8204 39.3699 23.8204 39.2899C23.8204 30.6599 23.8204 22.0199 23.8204 13.3899C23.8204 13.2399 23.7304 13.0299 23.9104 12.9599M14.7204 41.6599C14.3604 41.6399 13.9904 41.6599 13.6304 41.6599C13.2704 41.6599 12.8804 41.6599 12.5004 41.6599C12.2904 41.6599 12.2004 41.5799 12.2204 41.3799C12.2204 41.3499 12.2204 41.3199 12.2204 41.2799C12.2204 40.9532 12.3804 40.7899 12.7004 40.7899C13.3904 40.7899 14.0704 40.7899 14.7604 40.7899C15.0004 40.7899 15.1004 40.8699 15.0704 41.0999C15.0704 41.1599 15.0704 41.2299 15.0704 41.2899C15.1104 41.5599 15.0004 41.6799 14.7104 41.6599M13.3004 12.9399C13.5404 12.8899 13.7904 12.8799 14.0304 12.9599C14.0904 12.9799 14.0904 13.0699 14.0904 13.1299C14.0904 13.2199 14.0904 13.2999 14.0904 13.3799C14.0904 22.0099 14.0904 30.6499 14.0904 39.2799C14.0904 39.4299 14.1804 39.6399 13.9904 39.7099C13.7604 39.7899 13.5004 39.7599 13.2604 39.7099C13.1904 39.6999 13.1704 39.6199 13.1704 39.5599C13.1704 39.4599 13.1704 39.3499 13.1704 39.2399V26.2899C13.1704 21.9699 13.1704 17.6499 13.1704 13.3399C13.1704 13.1999 13.0804 12.9799 13.2904 12.9299M43.6104 39.7999C43.2604 39.7399 43.2404 39.5599 43.2404 39.2799C43.2404 30.5099 43.2404 21.7299 43.2504 12.9599C43.2504 12.4599 43.1104 12.0999 42.6404 11.8899H40.9004C40.5804 12.0599 40.3104 12.2699 40.2904 12.6799C40.2904 12.7799 40.2104 12.8199 40.1204 12.8299C40.0204 12.8299 39.9304 12.8299 39.8304 12.8299C35.2804 12.8299 30.7404 12.8299 26.1904 12.8299C25.9004 12.8299 25.7104 12.8099 25.6804 12.4599C25.6504 12.1599 25.3604 12.0299 25.1204 11.8899H23.3804C23.0604 12.0599 22.7904 12.2699 22.7704 12.6799C22.7604 12.8599 22.5904 12.8299 22.4704 12.8299C21.6904 12.8299 20.9104 12.8299 20.1204 12.8299C18.5704 12.8299 17.0104 12.8299 15.4604 12.8299C15.2304 12.8299 15.0904 12.7999 15.0604 12.5199C15.0304 12.1899 14.7504 12.0399 14.4804 11.8899H12.7404C12.2704 12.0999 12.1304 12.4599 12.1304 12.9599C12.1404 21.7199 12.1304 30.4799 12.1404 39.2399C12.1404 39.5399 12.1404 39.7599 11.7404 39.8099C11.4804 39.8399 11.3404 40.0699 11.1904 40.2699V42.1699C11.3804 42.4499 11.6204 42.6799 11.9904 42.6799C13.0604 42.6799 14.1404 42.6999 15.2104 42.6799C15.7204 42.6799 16.0304 42.3199 16.0404 41.8099C16.0404 41.4299 16.0404 41.0499 16.0404 40.6699C16.0404 40.1499 15.8304 39.8799 15.3204 39.7699C15.1104 39.7299 15.0704 39.6299 15.0704 39.4499C15.0704 38.8399 15.0804 38.2299 15.0704 37.6099C15.0704 37.3699 15.1504 37.2999 15.3904 37.2999C17.7404 37.2999 20.0904 37.2999 22.4404 37.2999C22.6704 37.2999 22.7704 37.3699 22.7604 37.6099C22.7504 38.2199 22.7504 38.8399 22.7604 39.4499C22.7604 39.6599 22.6904 39.7399 22.4804 39.7799C22.0104 39.8799 21.8004 40.1699 21.7904 40.6399C21.7904 41.0299 21.7904 41.4199 21.7904 41.8099C21.7904 42.3099 22.1104 42.6699 22.6204 42.6799C23.6904 42.6999 24.7704 42.6999 25.8404 42.6799C26.3504 42.6799 26.6604 42.3199 26.6704 41.8099C26.6704 41.3999 26.6704 40.9899 26.6704 40.5699C26.6704 40.1799 26.4604 39.8699 26.0804 39.7999C25.7404 39.7399 25.7004 39.5699 25.7004 39.2799C25.7004 31.5899 25.7004 23.9099 25.7004 16.2199C25.7004 16.1499 25.7004 16.0699 25.7004 15.9999C25.6904 15.8199 25.7804 15.7599 25.9504 15.7599C26.4104 15.7599 26.8704 15.7599 27.3304 15.7599C27.5304 15.7599 27.5904 15.8499 27.5804 16.0299C27.5804 16.2699 27.5804 16.5199 27.5804 16.7599C27.5804 17.2399 27.8004 17.5299 28.2604 17.6199C28.5204 17.6699 28.5504 17.7999 28.5504 18.0099C28.5504 19.0899 28.5304 20.1599 28.5504 21.2399C28.5504 21.5799 28.4704 21.7499 28.1204 21.8799C26.9704 22.3299 26.3704 23.5299 26.6804 24.6999C26.9704 25.8199 28.1104 26.6299 29.2404 26.5099C30.4104 26.3799 31.3504 25.5199 31.4804 24.4399C31.6204 23.2699 30.9904 22.2399 29.8404 21.8299C29.6204 21.7499 29.5504 21.6399 29.5504 21.4199C29.5504 20.2899 29.5504 19.1599 29.5504 18.0299C29.5504 17.7999 29.5904 17.6699 29.8604 17.6199C30.3104 17.5299 30.5104 17.2299 30.5204 16.7699C30.5204 16.5499 30.5404 16.3199 30.5204 16.1099C30.4904 15.8199 30.6204 15.7399 30.8904 15.7599C31.2304 15.7799 31.5804 15.7599 31.9204 15.7599C32.9804 15.7599 34.0404 15.7599 35.1104 15.7599C35.3604 15.7599 35.4604 15.8399 35.4404 16.0899C35.4204 16.3199 35.4404 16.5499 35.4404 16.7899C35.4404 17.2399 35.6604 17.5399 36.1104 17.6299C36.3604 17.6799 36.4104 17.7899 36.4104 18.0099C36.4004 19.0099 36.3804 20.0199 36.4104 21.0199C36.4304 21.5099 36.3604 21.8599 35.8104 21.9599C35.7804 21.9599 35.7504 21.9899 35.7304 21.9999C34.7004 22.5699 34.2204 23.7699 34.5804 24.8499C34.9404 25.9299 36.0804 26.6599 37.1504 26.5099C38.3304 26.3499 39.2204 25.4899 39.3404 24.4199C39.4704 23.2399 38.8404 22.2399 37.6804 21.8199C37.4604 21.7399 37.4104 21.6299 37.4104 21.4199C37.4104 20.2799 37.4104 19.1399 37.4104 17.9999C37.4104 17.7799 37.4504 17.6599 37.7104 17.6099C38.1604 17.5199 38.3704 17.2199 38.3804 16.7699C38.3804 16.5299 38.3904 16.2799 38.3804 16.0399C38.3704 15.8199 38.4504 15.7299 38.6804 15.7399C39.0604 15.7499 39.4304 15.7399 39.8104 15.7399C40.1238 15.7399 40.2804 15.8966 40.2804 16.2099V36.0099C40.2804 36.1399 40.2804 36.2599 40.2804 36.3899C40.3204 36.6599 40.5004 36.7999 40.7604 36.8199C41.0004 36.8399 41.2404 36.6399 41.2704 36.3899C41.2904 36.2499 41.2704 36.1199 41.2704 35.9799V13.3999C41.2704 13.2999 41.2704 13.1899 41.2704 13.0799C41.2704 12.9999 41.2704 12.9099 41.3604 12.8899C41.6004 12.8399 41.8604 12.8199 42.0904 12.8899C42.2804 12.9499 42.1904 13.1699 42.1904 13.3199C42.1904 21.9099 42.1904 30.5099 42.1904 39.0999C42.1904 39.7199 42.1904 39.7199 41.5504 39.6999C41.3504 39.6999 41.2604 39.6299 41.2604 39.4199C41.2704 39.1099 41.2604 38.8099 41.2604 38.4999C41.2504 38.1999 41.0304 37.9899 40.7504 37.9899C40.4804 37.9899 40.2604 38.1999 40.2504 38.5099C40.2504 38.7899 40.2404 39.0799 40.2504 39.3599C40.2604 39.5799 40.2004 39.6699 39.9604 39.7199C39.5004 39.8199 39.2804 40.1099 39.2804 40.5799C39.2804 40.9699 39.2804 41.3599 39.2804 41.7499C39.2804 42.2499 39.6004 42.5999 40.1104 42.6099C41.1804 42.6299 42.2604 42.6299 43.3304 42.6099C43.8204 42.6099 44.1404 42.2499 44.1504 41.7699C44.1504 41.3499 44.1504 40.9199 44.1504 40.4999C44.1504 40.1099 43.9404 39.8099 43.5504 39.7399"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default MonkeyBarsIcon;
diff --git a/client/src/components/icons/amenities/MultiBallInteractiveGamingIcon.tsx b/client/src/components/icons/amenities/MultiBallInteractiveGamingIcon.tsx
new file mode 100644
index 0000000..65d3072
--- /dev/null
+++ b/client/src/components/icons/amenities/MultiBallInteractiveGamingIcon.tsx
@@ -0,0 +1,233 @@
+function MultiBallInteractiveGamingIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M33.55 26.09C32.07 26.09 31.04 25.09 31.04 23.54V19.79H32.3V23.56C32.3 24.38 32.81 24.87 33.55 24.87C34.29 24.87 34.8 24.38 34.8 23.56V19.79H36.06V23.54C36.06 25.09 35.01 26.09 33.55 26.09Z"
+        fill="currentColor"
+      />
+      <path d="M37.3701 19.79H38.6301V24.78H41.2701V25.99H37.3701V19.79Z" fill="currentColor" />
+      <path d="M42.4596 21H40.8096V19.79H45.3896V21H43.7196V25.99H42.4596V21Z" fill="currentColor" />
+      <path d="M47.5198 19.79H46.2598V25.99H47.5198V19.79Z" fill="currentColor" />
+      <path
+        d="M30.7498 28.26H31.8698L34.5398 34.45H33.2198L32.6198 33.04H29.9899L29.3898 34.45H28.0898L30.7498 28.26ZM32.1599 31.93L31.3098 29.91L30.4599 31.93H32.1599Z"
+        fill="currentColor"
+      />
+      <path d="M35.2305 28.26H36.5005V33.25H39.1405V34.45H35.2305V28.26Z" fill="currentColor" />
+      <path d="M40.0303 28.26H41.2903V33.25H43.9303V34.45H40.0303V28.26Z" fill="currentColor" />
+      <path
+        d="M28.5702 19.79L26.5702 23.05L24.5602 19.79H23.4102V20.4C23.8902 20.95 24.3102 21.55 24.6702 22.19L26.1501 24.61H26.9801L28.4501 22.21V25.99H29.7102V19.8H28.5602L28.5702 19.79Z"
+        fill="currentColor"
+      />
+      <path
+        d="M27.0202 31.16C27.3402 30.88 27.5101 30.48 27.5101 30.05C27.5101 29.15 26.8302 28.38 25.9402 28.27C25.9002 28.66 25.8401 29.05 25.7601 29.43C26.0701 29.51 26.2802 29.78 26.2802 30.1C26.2802 30.48 25.9802 30.79 25.5502 30.79H25.3701C25.2401 31.16 25.0902 31.51 24.9102 31.86H25.9301C26.4001 31.86 26.7001 32.17 26.7001 32.57C26.7001 32.97 26.3901 33.28 25.9301 33.28H24.6702V32.32C24.3102 32.96 23.8902 33.56 23.4102 34.11V34.44H26.0202C27.1202 34.44 27.9301 33.65 27.9301 32.62C27.9301 31.92 27.5602 31.42 27.0202 31.15"
+        fill="currentColor"
+      />
+      <path
+        d="M17.7204 32.86C18.0504 32.86 18.4404 33.0401 18.4604 33.4201C18.4804 33.7901 18.1404 34.08 17.8304 34.21C17.5104 34.35 17.1004 34.39 16.8004 34.21C16.6604 34.13 16.5604 33.99 16.5304 33.83C16.5004 33.65 16.5704 33.47 16.6804 33.33C16.9204 33.02 17.3304 32.85 17.7204 32.86Z"
+        fill="currentColor"
+      />
+      <path
+        d="M20.12 33.6801C20.26 33.6301 20.4201 33.6001 20.5701 33.6301C20.7101 33.6601 20.8 33.7701 20.78 33.9101C20.76 34.0601 20.6701 34.2001 20.5701 34.3101C20.4601 34.4301 20.34 34.5401 20.2 34.6301C20.06 34.7201 19.91 34.8001 19.76 34.8601C19.61 34.9201 19.45 34.9401 19.28 34.9301C19.15 34.9101 19.04 34.8301 19.04 34.6901C19.04 34.5301 19.13 34.3801 19.23 34.2701C19.46 33.9901 19.77 33.7801 20.12 33.6701"
+        fill="currentColor"
+      />
+      <path
+        d="M22.8003 21.98C22.8703 22.07 22.9503 22.16 23.0403 22.24C23.0803 22.28 23.1203 22.31 23.1703 22.34C23.2003 22.37 23.2503 22.38 23.2903 22.38C23.3803 22.35 23.3103 22.18 23.2903 22.13C23.2503 22.03 23.2003 21.93 23.1403 21.84C23.0203 21.64 22.8703 21.45 22.7003 21.29C22.6303 21.23 22.5503 21.15 22.4603 21.12C22.3303 21.09 22.3803 21.26 22.4003 21.33C22.4803 21.57 22.6403 21.8 22.8003 22"
+        fill="currentColor"
+      />
+      <path
+        d="M18.41 25.9101C18.64 26.0001 18.9 26.0101 19.14 25.9401C19.37 25.8701 19.57 25.7101 19.69 25.5101C19.96 25.0801 19.8901 24.5201 19.6001 24.1201C19.3201 23.7401 18.83 23.5001 18.36 23.6101C18.14 23.6601 17.94 23.7801 17.79 23.9601C17.63 24.1601 17.54 24.4001 17.54 24.6501C17.54 25.1401 17.8 25.6001 18.23 25.8401C18.29 25.8701 18.34 25.9001 18.4 25.9201"
+        fill="currentColor"
+      />
+      <path
+        d="M21.7704 26.8299C21.9504 26.9499 22.1804 26.9799 22.3904 26.9099C22.5804 26.8399 22.7204 26.6699 22.8004 26.4899C22.9804 26.0899 22.9404 25.5899 22.7604 25.1899C22.5904 24.8199 22.2204 24.4199 21.7704 24.5099C21.3204 24.6099 21.1504 25.1399 21.1504 25.5499C21.1504 25.9799 21.3204 26.4399 21.6404 26.7299C21.6804 26.7699 21.7304 26.7999 21.7704 26.8299Z"
+        fill="currentColor"
+      />
+      <path
+        d="M14.5698 31.93C14.9298 32.02 15.2798 32.29 15.3298 32.68C15.3498 32.87 15.2998 33.06 15.1798 33.2C15.0598 33.33 14.9098 33.43 14.7398 33.47C14.3598 33.58 13.9498 33.49 13.6498 33.23C13.5198 33.12 13.4198 32.96 13.3798 32.79C13.3398 32.62 13.3798 32.43 13.4698 32.28C13.6998 31.92 14.1898 31.83 14.5698 31.93Z"
+        fill="currentColor"
+      />
+      <path
+        d="M22.8297 24.1299C22.9297 24.2399 23.0497 24.3599 23.1897 24.4099C23.3297 24.4599 23.4597 24.4099 23.5197 24.2799C23.5897 24.1399 23.5797 23.9699 23.5497 23.8299C23.5197 23.6699 23.4697 23.5099 23.3997 23.3599C23.3297 23.2099 23.2497 23.0699 23.1397 22.9399C23.0397 22.8099 22.9197 22.6999 22.7697 22.6299C22.6497 22.5799 22.5097 22.5899 22.4397 22.6999C22.3497 22.8299 22.3597 23.0099 22.3797 23.1599C22.4297 23.5199 22.5897 23.8599 22.8297 24.1399"
+        fill="currentColor"
+      />
+      <path
+        d="M24 27.3C24.07 27.43 24.21 27.65 24.38 27.56C24.45 27.52 24.5 27.45 24.52 27.38C24.55 27.3 24.58 27.21 24.6 27.13C24.67 26.74 24.66 26.35 24.58 25.96C24.55 25.77 24.49 25.59 24.41 25.42C24.35 25.3 24.24 25.09 24.08 25.11C23.91 25.13 23.84 25.36 23.81 25.49C23.77 25.67 23.74 25.86 23.75 26.05C23.75 26.27 23.77 26.49 23.81 26.71C23.85 26.92 23.91 27.12 24 27.31"
+        fill="currentColor"
+      />
+      <path
+        d="M22.7796 31.6C22.8996 31.53 23.1396 31.41 23.2396 31.58C23.2696 31.65 23.2796 31.73 23.2696 31.81C23.2596 31.9 23.2396 31.98 23.1996 32.06C23.0596 32.43 22.8396 32.76 22.5696 33.04C22.4396 33.18 22.2996 33.31 22.1396 33.41C22.0296 33.48 21.8196 33.6 21.6896 33.5C21.5596 33.4 21.6196 33.17 21.6596 33.03C21.7196 32.85 21.7996 32.68 21.8996 32.52C22.0096 32.33 22.1496 32.15 22.2996 31.99C22.4396 31.83 22.5996 31.69 22.7796 31.58"
+        fill="currentColor"
+      />
+      <path
+        d="M20.3498 23.5699C20.6298 23.7399 21.0598 23.7999 21.2698 23.4799C21.4798 23.1799 21.3498 22.7499 21.1498 22.4699C20.9498 22.1799 20.6298 21.9399 20.2698 21.9299C20.1098 21.9299 19.9498 21.9899 19.8398 22.1099C19.7198 22.2499 19.6898 22.4399 19.7098 22.6099C19.7498 22.9999 20.0198 23.3599 20.3498 23.5599"
+        fill="currentColor"
+      />
+      <path
+        d="M15.7004 28.83C16.5204 28.98 17.3005 28.44 17.4605 27.62C17.6105 26.8 17.0704 26.01 16.2604 25.86C15.4404 25.71 14.6605 26.25 14.5005 27.07C14.3705 27.78 14.7604 28.49 15.4304 28.76C15.5204 28.79 15.6104 28.82 15.7004 28.84"
+        fill="currentColor"
+      />
+      <path
+        d="M19.8098 29.9399C20.3998 29.9099 20.8798 29.46 21.0698 28.92C21.2698 28.38 21.1898 27.7199 20.7798 27.2999C20.5698 27.0799 20.2898 26.9499 19.9898 26.9399C19.7098 26.9399 19.4298 27.0199 19.1998 27.1899C18.7198 27.5299 18.4598 28.1499 18.5298 28.7399C18.5598 29.0199 18.6698 29.2799 18.8398 29.4999C19.0298 29.7299 19.2998 29.8899 19.5998 29.9299C19.6698 29.9399 19.7498 29.9399 19.8198 29.9299"
+        fill="currentColor"
+      />
+      <path
+        d="M21.2502 21.72C21.3502 21.8 21.4602 21.86 21.5902 21.9C21.6902 21.93 21.8202 21.94 21.9002 21.86C21.9802 21.78 21.9602 21.65 21.9302 21.55C21.8902 21.44 21.8402 21.33 21.7702 21.24C21.6202 21.03 21.4202 20.86 21.1802 20.75C21.0802 20.71 20.9502 20.68 20.8502 20.74C20.7502 20.8 20.7502 20.94 20.7702 21.04C20.8302 21.31 21.0402 21.55 21.2602 21.72"
+        fill="currentColor"
+      />
+      <path
+        d="M18.9305 21.1301C19.1505 21.2301 19.4805 21.2901 19.6705 21.1101C19.8705 20.9201 19.7305 20.6201 19.5705 20.4601C19.3805 20.2601 19.1205 20.1301 18.8505 20.1001C18.7305 20.0801 18.6005 20.1001 18.4905 20.1701C18.3805 20.2401 18.3205 20.3801 18.3505 20.5101C18.4005 20.8001 18.6805 21.0201 18.9305 21.1301Z"
+        fill="currentColor"
+      />
+      <path
+        d="M21.2902 20.3901C21.3602 20.4501 21.4402 20.5001 21.5202 20.5501C21.5802 20.5801 21.6602 20.6301 21.7302 20.6201C21.8902 20.5901 21.6302 20.2901 21.5902 20.2501C21.4702 20.1101 21.3202 20.0001 21.1702 19.9101C21.1002 19.8601 21.0302 19.8401 20.9502 19.8301C20.8602 19.8301 20.8702 19.9001 20.9002 19.9601C20.9402 20.0501 21.0002 20.1201 21.0702 20.1901C21.1402 20.2701 21.2202 20.3401 21.3002 20.4001"
+        fill="currentColor"
+      />
+      <path
+        d="M19.7899 20.0401C19.8799 20.0901 19.9699 20.1201 20.0599 20.1501C20.1399 20.1701 20.2399 20.1801 20.3099 20.1501C20.3899 20.1001 20.3799 20.0001 20.3399 19.9301C20.2999 19.8501 20.2399 19.7801 20.1699 19.7201C20.0299 19.5901 19.8499 19.5001 19.6699 19.4501C19.5899 19.4301 19.5099 19.4201 19.4299 19.4501C19.3499 19.4801 19.3299 19.5501 19.3599 19.6301C19.3999 19.7201 19.4499 19.8001 19.5299 19.8601C19.6099 19.9401 19.6999 20.0001 19.7999 20.0501"
+        fill="currentColor"
+      />
+      <path
+        d="M20.6299 30.8299C20.8499 30.8199 21.0599 30.9099 21.1999 31.0899C21.3199 31.2499 21.3499 31.4699 21.3299 31.6699C21.2699 32.1099 20.9699 32.5199 20.6099 32.7599C20.2699 32.9799 19.7399 33.1299 19.4099 32.8099C19.0799 32.4899 19.2099 31.9399 19.4299 31.5999C19.6599 31.2399 20.0399 30.9299 20.4699 30.8499C20.5199 30.8499 20.5799 30.8399 20.6299 30.8299Z"
+        fill="currentColor"
+      />
+      <path
+        d="M11.55 27.6499C12.14 27.8399 12.78 27.5699 13.13 27.0699C13.47 26.5699 13.52 25.8899 13.21 25.3699C13.05 25.0999 12.81 24.8899 12.51 24.7799C12.23 24.6799 11.92 24.6699 11.63 24.7699C11.06 24.9599 10.66 25.4999 10.6 26.0899C10.54 26.6699 10.81 27.2799 11.34 27.5599C11.41 27.5999 11.48 27.6299 11.55 27.6499Z"
+        fill="currentColor"
+      />
+      <path
+        d="M17.2997 29.85C17.5497 29.9 17.7697 30.0299 17.9397 30.2099C18.0997 30.3899 18.1797 30.63 18.1897 30.87C18.1897 31.38 17.8397 31.82 17.3797 32C16.9397 32.18 16.3997 32.12 16.0497 31.78C15.8897 31.62 15.7796 31.41 15.7496 31.19C15.7196 30.94 15.7696 30.68 15.8996 30.47C16.1596 30.05 16.6196 29.8 17.1096 29.82C17.1696 29.82 17.2297 29.83 17.2997 29.84"
+        fill="currentColor"
+      />
+      <path
+        d="M11.3099 31.0199C11.6299 31.1799 11.8999 31.4899 11.9799 31.8499C12.0199 32.0199 11.9999 32.2099 11.9099 32.3699C11.8199 32.5099 11.6799 32.6099 11.5099 32.6399C11.1499 32.7099 10.7699 32.5199 10.5299 32.2499C10.2999 31.9999 10.1399 31.6099 10.2799 31.2699C10.3599 31.0899 10.52 30.9599 10.71 30.9299C10.92 30.8899 11.1299 30.9299 11.3099 31.0299"
+        fill="currentColor"
+      />
+      <path
+        d="M9.90029 27.76C10.3103 27.98 10.5603 28.44 10.6003 28.89C10.6403 29.32 10.5003 29.84 10.0703 30.03C9.63031 30.23 9.1603 29.95 8.9103 29.58C8.6503 29.2 8.56031 28.7 8.71031 28.26C8.78031 28.05 8.91031 27.87 9.10031 27.75C9.29031 27.64 9.5203 27.61 9.7403 27.68C9.8003 27.7 9.85029 27.72 9.90029 27.75"
+        fill="currentColor"
+      />
+      <path
+        d="M14.5803 24.8201C15.0703 24.9401 15.5903 24.7601 15.9003 24.3701C16.0603 24.1701 16.1403 23.9301 16.1503 23.6701C16.1503 23.4401 16.0703 23.2101 15.9303 23.0201C15.6303 22.6101 15.0803 22.4501 14.6003 22.5801C14.1303 22.7001 13.7403 23.0901 13.6803 23.5901C13.6203 24.1001 13.9303 24.5701 14.3903 24.7601C14.4503 24.7801 14.5103 24.8101 14.5803 24.8201Z"
+        fill="currentColor"
+      />
+      <path
+        d="M13.4705 28.75C13.9505 28.91 14.3005 29.33 14.3605 29.83C14.3905 30.08 14.3305 30.34 14.2005 30.55C14.0805 30.75 13.8905 30.9 13.6805 30.99C13.2105 31.18 12.6605 31.03 12.3205 30.67C11.9805 30.32 11.8505 29.78 12.0605 29.33C12.2705 28.86 12.7905 28.63 13.2805 28.71C13.3505 28.72 13.4105 28.74 13.4705 28.76"
+        fill="currentColor"
+      />
+      <path
+        d="M17.1797 22.6999C17.5297 22.8099 17.9697 22.7699 18.2197 22.4599C18.3397 22.3099 18.3897 22.1199 18.3597 21.9399C18.3297 21.7699 18.2497 21.6099 18.1297 21.4799C17.8597 21.1899 17.4697 21.0499 17.0797 21.1099C16.9097 21.1399 16.7397 21.2199 16.6197 21.3399C16.4997 21.4699 16.4297 21.6399 16.4297 21.8199C16.4297 22.2499 16.7997 22.5799 17.1797 22.6999Z"
+        fill="currentColor"
+      />
+      <path
+        d="M22.5097 30.7701C22.7497 30.7901 22.9697 30.6401 23.1297 30.4801C23.2997 30.3001 23.4397 30.0901 23.5297 29.8701C23.6397 29.6201 23.7097 29.3601 23.7397 29.0901C23.7697 28.8501 23.7497 28.6 23.6897 28.36C23.6197 28.14 23.4897 27.9101 23.2597 27.8401C23.0197 27.7701 22.7697 27.8901 22.5997 28.0401C22.4197 28.2101 22.2697 28.4101 22.1697 28.6301C22.0497 28.8701 21.9697 29.1301 21.9397 29.3901C21.8997 29.6401 21.9097 29.8901 21.9597 30.1301C22.0097 30.3601 22.1297 30.6001 22.3497 30.7101C22.4097 30.7401 22.4697 30.7501 22.5297 30.7601"
+        fill="currentColor"
+      />
+      <path
+        d="M21.2597 34.39C21.3797 34.3 21.4997 34.2199 21.6197 34.1499C21.6797 34.1099 21.7397 34.0799 21.7997 34.0499C21.8197 34.0399 21.8997 33.9999 21.9297 34.0199C21.9597 34.0499 21.8997 34.1099 21.8797 34.1299C21.8397 34.1699 21.8097 34.2099 21.7697 34.2499C21.6697 34.3499 21.5697 34.4399 21.4597 34.5399C21.2297 34.7399 20.9897 34.9099 20.7397 35.0799C20.6797 35.1199 20.6197 35.1499 20.5597 35.1899C20.5097 35.2199 20.4597 35.2399 20.3997 35.2499C20.3497 35.2499 20.3597 35.2099 20.3797 35.1799C20.4097 35.1299 20.4497 35.0799 20.4897 35.0399C20.7297 34.7999 20.9797 34.58 21.2597 34.39Z"
+        fill="currentColor"
+      />
+      <path
+        d="M24.0903 31.02C24.0903 31.02 23.9903 31.2 23.9203 31.18C23.8603 31.16 23.8604 31.04 23.8604 30.99C23.8604 30.82 23.8804 30.65 23.9104 30.49C23.9704 30.15 24.0504 29.81 24.1604 29.47C24.2504 29.15 24.3704 28.84 24.5204 28.54C24.5504 28.49 24.6803 28.21 24.7603 28.28C24.8103 28.32 24.8004 28.44 24.8004 28.5C24.8004 28.57 24.8003 28.65 24.7903 28.72C24.7503 29.05 24.6903 29.38 24.5903 29.7C24.4503 30.15 24.2803 30.6 24.0903 31.03"
+        fill="currentColor"
+      />
+      <path
+        d="M16.8495 36.06C16.9395 36.05 17.0395 36.04 17.1295 36.05C17.1995 36.05 17.2895 36.05 17.3495 36.11C17.4695 36.22 17.0895 36.3401 17.0395 36.3501C16.8595 36.4001 16.6795 36.4201 16.4995 36.4201C16.4195 36.4201 16.3395 36.4101 16.2695 36.3801C16.1995 36.3401 16.2395 36.27 16.2995 36.24C16.3795 36.19 16.4695 36.1501 16.5595 36.1301C16.6595 36.1001 16.7595 36.0801 16.8595 36.0701"
+        fill="currentColor"
+      />
+      <path
+        d="M9.85953 34.0401C10.0095 34.1401 10.1395 34.2701 10.2395 34.4301C10.2695 34.4801 10.3195 34.5901 10.2495 34.6301C10.1795 34.6701 10.0795 34.6301 10.0195 34.6001C9.84953 34.5301 9.69953 34.4201 9.56953 34.2901C9.49953 34.2301 9.44952 34.1601 9.39952 34.0901C9.36952 34.0401 9.29953 33.9401 9.34953 33.8801C9.39953 33.8201 9.51953 33.8601 9.57953 33.8801C9.67953 33.9201 9.76953 33.9701 9.85953 34.0401Z"
+        fill="currentColor"
+      />
+      <path
+        d="M13.8496 35.9599C13.9596 35.9799 14.1096 36.0099 14.1896 36.0999C14.2296 36.1399 14.2296 36.1899 14.1696 36.2099C14.1196 36.2299 14.0596 36.2399 13.9996 36.2399C13.8696 36.2399 13.7396 36.2199 13.6096 36.1799C13.5596 36.1599 13.2996 36.0599 13.4296 35.9799C13.4896 35.9499 13.5496 35.9399 13.6096 35.9399C13.6896 35.9399 13.7596 35.9399 13.8396 35.9599"
+        fill="currentColor"
+      />
+      <path
+        d="M10.2901 35.0101C10.4001 35.0701 10.5001 35.1501 10.5801 35.2401C10.6101 35.2701 10.6501 35.3301 10.5801 35.3201C10.5301 35.3101 10.4801 35.2901 10.4301 35.2601C10.3201 35.2001 10.2101 35.1401 10.1101 35.0601C10.0601 35.0301 10.0201 34.9901 9.98011 34.9501C9.96011 34.9401 9.8901 34.8601 9.9301 34.8501C9.9601 34.8501 9.98011 34.8501 10.0101 34.8701C10.0401 34.8801 10.0701 34.8901 10.0901 34.9101C10.1601 34.9401 10.2201 34.9801 10.2801 35.0201"
+        fill="currentColor"
+      />
+      <path
+        d="M10.1404 32.7799C10.3504 32.9199 10.5404 33.1199 10.6304 33.3599C10.6704 33.4699 10.6904 33.5999 10.6204 33.6999C10.5504 33.7899 10.4304 33.8099 10.3304 33.7999C10.0804 33.7699 9.84044 33.5999 9.67044 33.4199C9.58044 33.3299 9.51044 33.2299 9.46044 33.1099C9.41044 32.9999 9.37044 32.8599 9.42044 32.7499C9.47044 32.6299 9.61044 32.5899 9.74044 32.6099C9.89044 32.6299 10.0304 32.6899 10.1504 32.7699"
+        fill="currentColor"
+      />
+      <path
+        d="M15.0204 36.3201C15.0904 36.3201 15.1504 36.3301 15.2204 36.3401C15.2804 36.3401 15.3304 36.3701 15.3804 36.4001C15.4904 36.4801 15.2304 36.5201 15.1904 36.5201C15.0604 36.5301 14.9304 36.5201 14.8104 36.5101C14.7504 36.5101 14.6904 36.4901 14.6404 36.4601C14.6004 36.4401 14.5604 36.4001 14.6204 36.3701C14.6804 36.3401 14.7504 36.33 14.8104 36.33C14.8804 36.33 14.9604 36.33 15.0304 36.33"
+        fill="currentColor"
+      />
+      <path
+        d="M11.2204 35.2301C11.3304 35.2801 11.4404 35.3501 11.5304 35.4401C11.5604 35.4801 11.5904 35.5401 11.5304 35.5501C11.4804 35.5501 11.4204 35.5501 11.3704 35.5301C11.2504 35.4901 11.1304 35.4401 11.0204 35.3601C10.9804 35.3401 10.7404 35.1601 10.8604 35.1201C10.9204 35.1101 10.9804 35.1202 11.0304 35.1402C11.1004 35.1602 11.1704 35.1901 11.2304 35.2201"
+        fill="currentColor"
+      />
+      <path
+        d="M12.4899 35.57C12.5999 35.61 12.7399 35.66 12.8199 35.76C12.8599 35.8 12.8699 35.8599 12.7999 35.8799C12.7499 35.8899 12.6899 35.8999 12.6399 35.8799C12.4999 35.8599 12.3699 35.82 12.2499 35.76C12.1999 35.73 11.9599 35.5899 12.0899 35.5299C12.1499 35.5099 12.2099 35.4999 12.2699 35.5199C12.3499 35.5199 12.4199 35.55 12.4899 35.57Z"
+        fill="currentColor"
+      />
+      <path
+        d="M18.9803 35.5001C19.0903 35.4601 19.2003 35.4301 19.3203 35.4101C19.3703 35.4001 19.4303 35.3901 19.4803 35.3901C19.5203 35.3901 19.5703 35.3901 19.6003 35.4201C19.6603 35.4901 19.5103 35.6001 19.4703 35.6301C19.3803 35.6901 19.2903 35.7501 19.1903 35.8001C18.9803 35.9101 18.7603 35.9901 18.5303 36.0401C18.4403 36.0601 18.3303 36.0801 18.2403 36.0601C18.1103 36.0201 18.2403 35.9001 18.3003 35.8501C18.5003 35.6901 18.7503 35.5801 18.9903 35.4901"
+        fill="currentColor"
+      />
+      <path
+        d="M15.2403 34.1799C15.4703 34.2099 15.7903 34.3299 15.8603 34.5799C15.9403 34.8499 15.6503 35.0299 15.4303 35.0799C15.1603 35.1499 14.8803 35.1299 14.6303 35.0099C14.5203 34.9599 14.4203 34.8699 14.3603 34.7599C14.3003 34.6399 14.3303 34.4899 14.4203 34.3999C14.6103 34.1799 14.9603 34.1399 15.2403 34.1699"
+        fill="currentColor"
+      />
+      <path
+        d="M17.5202 34.9099C17.6502 34.8899 17.7802 34.9099 17.9002 34.9299C18.0002 34.9599 18.1202 35.0099 18.1402 35.1299C18.1602 35.2399 18.0802 35.3499 18.0002 35.4199C17.9102 35.4999 17.8102 35.5599 17.7002 35.5999C17.4602 35.6999 17.2002 35.7399 16.9402 35.6999C16.8402 35.6799 16.7102 35.6399 16.6602 35.5399C16.6002 35.4299 16.6702 35.3099 16.7502 35.2399C16.9502 35.0399 17.2502 34.9499 17.5202 34.9199"
+        fill="currentColor"
+      />
+      <path
+        d="M12.6097 33.4201C12.8497 33.5101 13.1097 33.6901 13.1897 33.9501C13.2297 34.0701 13.1997 34.2 13.1197 34.3C13.0297 34.39 12.9097 34.4401 12.7897 34.4401C12.5097 34.4601 12.2397 34.3701 12.0297 34.2001C11.8497 34.0601 11.6497 33.7801 11.7997 33.5401C11.8797 33.4201 12.0197 33.3701 12.1497 33.3501C12.3097 33.3401 12.4597 33.3501 12.6097 33.4101"
+        fill="currentColor"
+      />
+      <path
+        d="M11.5195 34.45C11.6795 34.53 11.8595 34.6399 11.9495 34.7999C11.9895 34.8699 12.0095 34.9699 11.9295 35.0199C11.8595 35.0699 11.7695 35.0699 11.6895 35.0599C11.4895 35.0299 11.3095 34.9499 11.1595 34.8299C11.0895 34.7799 11.0195 34.71 10.9695 34.64C10.9295 34.58 10.8895 34.48 10.9495 34.42C11.0095 34.34 11.1295 34.3499 11.2195 34.3599C11.3295 34.3699 11.4295 34.41 11.5195 34.45Z"
+        fill="currentColor"
+      />
+      <path
+        d="M15.3995 35.5601C15.4995 35.5601 15.5995 35.5801 15.6895 35.6101C15.7695 35.6401 15.8595 35.6801 15.8895 35.7501C15.9395 35.8301 15.8695 35.9101 15.7995 35.9501C15.7195 35.9901 15.6395 36.0201 15.5495 36.0301C15.3595 36.0601 15.1595 36.0501 14.9795 36.0001C14.8995 35.9801 14.8295 35.9401 14.7695 35.8801C14.7195 35.8101 14.7395 35.7401 14.7995 35.6901C14.8795 35.6301 14.9696 35.5901 15.0696 35.5801C15.1796 35.5601 15.2895 35.5501 15.3995 35.5601Z"
+        fill="currentColor"
+      />
+      <path
+        d="M13.4901 34.99C13.6601 35.03 13.8801 35.12 13.9601 35.28C14.0001 35.36 13.9801 35.45 13.9001 35.5C13.8201 35.54 13.7401 35.57 13.6501 35.57C13.4501 35.57 13.2501 35.53 13.0701 35.44C12.9501 35.37 12.7401 35.2 12.8701 35.06C12.9401 34.99 13.0501 34.97 13.1401 34.96C13.2501 34.96 13.3701 34.96 13.4701 34.99"
+        fill="currentColor"
+      />
+      <path
+        d="M24.1603 24.1199C24.2203 24.2599 24.2703 24.3899 24.3403 24.5199C24.3703 24.5799 24.4103 24.6399 24.4403 24.6999C24.4503 24.7199 24.5003 24.7999 24.5303 24.7899C24.5703 24.7899 24.5503 24.6899 24.5503 24.6699C24.5503 24.6099 24.5303 24.5599 24.5203 24.5099C24.4903 24.3699 24.4503 24.2399 24.4003 24.0999C24.3103 23.8099 24.2003 23.5299 24.0703 23.2599C24.0403 23.1999 24.0103 23.1399 23.9703 23.0699C23.9403 23.0199 23.9103 22.9699 23.8703 22.9299C23.8303 22.8899 23.8203 22.9299 23.8203 22.9799C23.8203 23.0399 23.8203 23.0999 23.8403 23.1599C23.9103 23.4899 24.0203 23.8099 24.1503 24.1199"
+        fill="currentColor"
+      />
+      <path
+        d="M20.7497 19.4299C20.7497 19.4299 20.8397 19.4899 20.8797 19.5099C20.8997 19.5199 20.9197 19.5299 20.9397 19.5399C20.9597 19.5499 20.9797 19.5599 20.9997 19.5699C21.0197 19.5799 21.0497 19.5899 21.0797 19.5999H21.1097C21.1097 19.5999 21.1097 19.5999 21.1097 19.5899C21.1097 19.5899 21.1097 19.5799 21.1097 19.5699C21.0897 19.5499 21.0697 19.5199 21.0397 19.4999C21.0097 19.4699 20.9697 19.4399 20.9197 19.4099C20.9197 19.4099 20.9097 19.3999 20.8997 19.3899C20.8597 19.3599 20.8297 19.3399 20.7897 19.3099C20.7397 19.2799 20.6997 19.2499 20.6597 19.2299C20.6197 19.1999 20.5697 19.1799 20.5397 19.1599C20.5197 19.1499 20.4897 19.1399 20.4597 19.1299H20.4297C20.4297 19.1299 20.4297 19.1499 20.4397 19.1599C20.4597 19.1899 20.4797 19.2099 20.5097 19.2299C20.5397 19.2499 20.5697 19.2799 20.6097 19.3099C20.6097 19.3099 20.6297 19.3199 20.6297 19.3299C20.6697 19.3599 20.7197 19.3899 20.7597 19.4199"
+        fill="currentColor"
+      />
+      <path
+        d="M17.7003 36.36C17.7803 36.34 17.8603 36.33 17.9303 36.31C17.9603 36.31 17.9803 36.3 18.0103 36.3C18.0503 36.3 18.0804 36.29 18.1104 36.28C18.1404 36.28 18.1804 36.28 18.2104 36.27C18.2304 36.27 18.2404 36.27 18.2404 36.27C18.2404 36.27 18.2404 36.28 18.2104 36.29C18.1804 36.3 18.1504 36.31 18.1304 36.32H18.1104C18.0604 36.34 17.9904 36.36 17.9104 36.38C17.8504 36.39 17.8003 36.41 17.7303 36.42C17.7103 36.42 17.6903 36.43 17.6703 36.43C17.5903 36.45 17.5104 36.47 17.4404 36.48C17.3804 36.49 17.3204 36.5 17.2704 36.51H17.2504C17.2104 36.51 17.1804 36.52 17.1404 36.52C17.1204 36.52 17.1104 36.52 17.1104 36.52C17.1104 36.52 17.1104 36.51 17.1404 36.5C17.1404 36.5 17.1603 36.5 17.1703 36.49C17.1903 36.49 17.2204 36.47 17.2504 36.46C17.3104 36.44 17.3804 36.42 17.4604 36.4C17.4904 36.4 17.5203 36.38 17.5603 36.38C17.6103 36.37 17.6603 36.36 17.7003 36.35"
+        fill="currentColor"
+      />
+      <path
+        d="M15.8697 36.58C15.9197 36.58 15.9797 36.58 16.0197 36.58C16.0397 36.58 16.0697 36.58 16.0897 36.58C16.1097 36.58 16.1297 36.58 16.1497 36.58C16.1797 36.58 16.1997 36.5801 16.2297 36.5901C16.2497 36.5901 16.2597 36.6 16.2597 36.61C16.2597 36.61 16.2597 36.6101 16.2597 36.6201C16.2597 36.6201 16.2497 36.6201 16.2397 36.6201C16.2097 36.6201 16.1797 36.6401 16.1497 36.6401C16.1097 36.6401 16.0597 36.6501 15.9997 36.6601H15.9797C15.9297 36.6601 15.8897 36.6601 15.8397 36.6601C15.7897 36.6601 15.7297 36.6601 15.6797 36.6601C15.6297 36.6601 15.5797 36.6601 15.5397 36.6601C15.5097 36.6601 15.4797 36.6601 15.4597 36.6501C15.4597 36.6501 15.4297 36.6401 15.4297 36.6301C15.4297 36.6301 15.4297 36.62 15.4597 36.61C15.4897 36.6 15.5197 36.5901 15.5497 36.5901C15.5897 36.5901 15.6297 36.5801 15.6697 36.5701C15.6697 36.5701 15.6897 36.5701 15.6997 36.5701C15.7497 36.5701 15.8097 36.5701 15.8597 36.5601"
+        fill="currentColor"
+      />
+      <path
+        d="M14.2102 36.5C14.2102 36.5 14.1402 36.5 14.1002 36.5C14.1002 36.5 14.0902 36.5 14.0802 36.5C14.0502 36.5 14.0202 36.5 14.0002 36.5C13.9802 36.5 13.9501 36.5 13.9301 36.5H13.9102C13.9102 36.5 13.9101 36.51 13.9301 36.52C13.9501 36.52 13.9802 36.54 14.0002 36.54C14.0302 36.54 14.0602 36.55 14.1002 36.56C14.1302 36.56 14.1702 36.57 14.2102 36.58C14.2502 36.58 14.2902 36.58 14.3202 36.58C14.3602 36.58 14.4001 36.58 14.4301 36.58C14.4501 36.58 14.4802 36.58 14.5002 36.58H14.5101C14.5101 36.58 14.5102 36.57 14.4902 36.56C14.4702 36.56 14.4402 36.54 14.4202 36.54C14.4202 36.54 14.3602 36.53 14.3202 36.52C14.2902 36.52 14.2502 36.51 14.2102 36.51"
+        fill="currentColor"
+      />
+      <path
+        d="M13.1999 36.33C13.1999 36.33 13.1299 36.3201 13.0899 36.3101C13.0899 36.3101 13.0799 36.3101 13.0699 36.3101C13.0399 36.3101 13.0099 36.3101 12.9899 36.3101C12.9699 36.3101 12.9399 36.3101 12.9099 36.3101C12.9099 36.3101 12.8899 36.3101 12.8799 36.3201C12.8799 36.3201 12.8799 36.3301 12.8999 36.3401C12.9199 36.3501 12.9399 36.3601 12.9699 36.3701C12.9999 36.3801 13.0299 36.3901 13.0699 36.4001C13.0999 36.4001 13.1399 36.4201 13.1799 36.4201C13.2199 36.4201 13.2499 36.4301 13.2899 36.4401C13.3299 36.4401 13.3699 36.4401 13.3999 36.4501C13.4199 36.4501 13.4499 36.4501 13.4799 36.4501C13.4799 36.4501 13.4899 36.4501 13.4999 36.4501C13.4999 36.4501 13.4999 36.4501 13.5099 36.4401C13.5099 36.4401 13.5099 36.4201 13.4899 36.4201C13.4699 36.4101 13.4399 36.4001 13.4199 36.3901C13.3899 36.3901 13.3599 36.37 13.3199 36.36C13.2899 36.36 13.2499 36.3401 13.2099 36.3401"
+        fill="currentColor"
+      />
+      <path
+        d="M12.1599 36.05C12.1599 36.05 12.0899 36.03 12.0499 36.02C12.0499 36.02 12.0398 36.02 12.0298 36.02C11.9998 36.02 11.9698 36.01 11.9498 36C11.9298 35.99 11.8998 36 11.8698 36C11.8698 36 11.8498 36 11.8398 36C11.8398 36 11.8398 36.01 11.8598 36.02C11.8798 36.03 11.8998 36.05 11.9298 36.06C11.9598 36.07 11.9898 36.0901 12.0298 36.1001C12.0598 36.1101 12.0999 36.1201 12.1299 36.1401C12.1699 36.1501 12.1999 36.1601 12.2399 36.1701C12.2799 36.1801 12.3199 36.1901 12.3499 36.1901C12.3699 36.1901 12.3998 36.1901 12.4198 36.1901C12.4198 36.1901 12.4298 36.1901 12.4398 36.1901H12.4498C12.4498 36.1901 12.4498 36.1701 12.4298 36.1601C12.4098 36.1501 12.3898 36.13 12.3598 36.12C12.3598 36.12 12.2999 36.09 12.2699 36.08C12.2399 36.07 12.1998 36.06 12.1698 36.05"
+        fill="currentColor"
+      />
+      <path
+        d="M11.2102 35.6901C11.2102 35.6901 11.1402 35.6601 11.1102 35.6401C11.1102 35.6401 11.1001 35.6401 11.0901 35.6401C11.0601 35.6301 11.0401 35.6201 11.0101 35.6101C10.9901 35.6101 10.9602 35.5901 10.9402 35.5901C10.9402 35.5901 10.9202 35.5901 10.9102 35.5901C10.9102 35.5901 10.9102 35.6001 10.9202 35.6201C10.9402 35.6401 10.9601 35.6501 10.9801 35.6701C11.0001 35.6901 11.0302 35.7101 11.0702 35.7301C11.1002 35.7501 11.1302 35.7601 11.1702 35.7801C11.2002 35.8001 11.2402 35.8101 11.2702 35.8301C11.3102 35.8501 11.3401 35.8601 11.3701 35.8701C11.3901 35.8701 11.4202 35.8801 11.4402 35.8901C11.4402 35.8901 11.4502 35.8901 11.4602 35.8901H11.4702C11.4702 35.8901 11.4701 35.8801 11.4501 35.8601C11.4301 35.8401 11.4102 35.8301 11.3902 35.8201C11.3702 35.8001 11.3402 35.7901 11.3002 35.7701C11.2702 35.7501 11.2401 35.7301 11.2001 35.7201"
+        fill="currentColor"
+      />
+      <path
+        d="M22.0702 20.48C22.1302 20.54 22.1802 20.59 22.2402 20.64C22.2602 20.66 22.2802 20.68 22.3002 20.69C22.3302 20.72 22.3602 20.74 22.3802 20.76C22.4102 20.78 22.4302 20.8 22.4602 20.82C22.4802 20.83 22.4902 20.83 22.4902 20.83C22.4902 20.83 22.4901 20.82 22.4801 20.8C22.4601 20.78 22.4401 20.75 22.4301 20.73C22.4301 20.73 22.4202 20.72 22.4102 20.71C22.3702 20.67 22.3302 20.61 22.2702 20.56C22.2302 20.52 22.1901 20.47 22.1501 20.43C22.1301 20.41 22.1202 20.4 22.1002 20.38C22.0402 20.32 21.9801 20.27 21.9301 20.22C21.8801 20.18 21.8402 20.14 21.8002 20.11C21.8002 20.11 21.7902 20.11 21.7802 20.1C21.7502 20.08 21.7202 20.05 21.6902 20.03C21.6702 20.02 21.6602 20.01 21.6602 20.02C21.6602 20.02 21.6602 20.04 21.6702 20.06C21.6702 20.06 21.6802 20.08 21.6902 20.09C21.7002 20.11 21.7202 20.13 21.7502 20.16C21.7902 20.21 21.8402 20.26 21.8902 20.32C21.9102 20.34 21.9402 20.37 21.9602 20.39C21.9902 20.43 22.0302 20.46 22.0602 20.5"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default MultiBallInteractiveGamingIcon;
diff --git a/client/src/components/icons/activities/MultiPurposeCourtIcon.tsx b/client/src/components/icons/amenities/MultiPurposeCourtIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/MultiPurposeCourtIcon.tsx
rename to client/src/components/icons/amenities/MultiPurposeCourtIcon.tsx
diff --git a/client/src/components/icons/amenities/MultiPurposeRoomWithKitchenIcon.tsx b/client/src/components/icons/amenities/MultiPurposeRoomWithKitchenIcon.tsx
new file mode 100644
index 0000000..18a4c87
--- /dev/null
+++ b/client/src/components/icons/amenities/MultiPurposeRoomWithKitchenIcon.tsx
@@ -0,0 +1,15 @@
+function MultiPurposeRoomWithKitchenIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M44.2711 23.8481C37.8071 27.2928 30.4533 29.2393 22.6493 29.2393C18.2649 29.2393 14.0199 28.627 10 27.4787M38.3323 23.4216L34.8055 16.237M29.2205 18.9599L32.0612 25.1167M26.755 26.2102L24.7504 20.972M18.8867 22.6999L19.8943 26.4727M41.6233 25.3353L45 35.5055L40.5191 33.6136L38.0857 37.8894L34.709 27.7193M31.0965 28.616L32.0934 39.3001L28.3736 36.5662C28.2557 36.4787 28.0842 36.4897 27.9878 36.599L24.8361 40L23.8392 29.3159M19.8836 29.0972L18.4686 39.7376L15.2848 36.0085L11.2435 38.7424L12.6585 28.1021M38.9755 13C35.8025 15.4933 32.2542 17.6148 28.3736 19.2661C23.5605 21.311 18.5865 22.4702 13.6554 22.8311"
+        stroke="currentColor"
+        strokeWidth={1.78}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+export default MultiPurposeRoomWithKitchenIcon;
diff --git a/client/src/components/icons/amenities/OpenAirGymIcon.tsx b/client/src/components/icons/amenities/OpenAirGymIcon.tsx
new file mode 100644
index 0000000..8840b90
--- /dev/null
+++ b/client/src/components/icons/amenities/OpenAirGymIcon.tsx
@@ -0,0 +1,32 @@
+function OpenAirGymIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M18.643 43.3255C18.5239 43.3255 18.3928 43.3255 18.2737 43.3255C17.9998 43.3255 17.7139 43.3254 17.428 43.3016C16.5823 43.2301 15.808 42.706 15.3911 41.9317C15.2362 41.6459 15.1528 41.3481 15.1171 40.9788C14.9384 41.0622 14.7478 41.1337 14.5692 41.1694C14.3905 41.2052 14.1999 41.229 13.9617 41.229C13.8426 41.229 13.7234 41.229 13.6043 41.229C13.5329 41.229 13.4495 41.229 13.378 41.229C12.9373 41.229 12.4965 41.217 12.0677 41.0384C11.079 40.6334 10.4596 39.6685 10.4715 38.525C10.4715 37.9413 10.4954 37.3695 10.5073 36.7859L10.5549 33.9628H9.66154C9.45904 33.939 9.26845 33.8437 9.14934 33.6531C9.05404 33.5102 8.99448 33.3195 9.00639 33.1409L9.05404 30.4965C9.05404 30.1034 9.44712 29.8294 9.79256 29.8294C9.81639 29.8294 9.85212 29.8294 9.87594 29.8294H10.6264L10.6979 25.9343C10.7098 25.0885 11.091 24.3262 11.7461 23.8616C12.3417 23.4209 13.0206 23.3614 13.6043 23.3614C13.8068 23.3614 14.0093 23.3614 14.1999 23.3733H14.3548C14.724 23.3971 15.0933 23.4924 15.4268 23.6711C15.4745 23.3733 15.5578 23.0278 15.7603 22.6824C16.1892 21.9677 16.9873 21.4793 17.7973 21.4436C17.9045 21.4436 18.0117 21.4436 18.1189 21.4436C18.3214 21.4436 18.5239 21.4435 18.7145 21.4555C18.8455 21.4555 18.9765 21.4555 19.1075 21.4555C19.6436 21.4555 20.2272 21.5269 20.7871 21.8962C21.478 22.3488 21.9306 23.1708 21.9306 24.0046C21.9306 24.0284 21.9306 24.0522 21.9306 24.0641C21.9306 24.088 21.9306 24.1118 21.9306 24.1475L21.8234 30.0558L33.5327 30.2702L33.6399 24.3262C33.6399 23.8021 33.6875 23.2423 34.021 22.6943C34.4499 21.9796 35.248 21.4912 36.058 21.4555C36.1652 21.4555 36.2724 21.4555 36.3796 21.4555C36.5821 21.4555 36.7846 21.4555 36.9871 21.4674C37.1181 21.4674 37.2491 21.4674 37.3682 21.4793C37.9043 21.4793 38.4879 21.5508 39.0478 21.9081C39.6791 22.325 40.1079 23.0517 40.1794 23.8021C40.6678 23.5877 41.1681 23.5519 41.6207 23.5519C41.8232 23.5519 42.0257 23.5519 42.2282 23.5639H42.3593C43.7172 23.6115 44.825 24.755 44.825 26.1011C44.825 26.1249 44.825 26.1487 44.825 26.1606C44.825 26.1844 44.825 26.2083 44.825 26.244L44.7416 30.4846H45.6707C45.8494 30.5084 46.0162 30.5918 46.1353 30.7347C46.2782 30.9015 46.3497 31.1278 46.3259 31.3303L46.2782 33.9628C46.2782 34.3916 45.8613 34.618 45.4921 34.618H44.6582L44.5867 38.4297C44.5867 38.6084 44.5867 38.7751 44.5867 38.9538C44.551 40.1211 43.7053 41.1218 42.5499 41.3719C42.3712 41.4077 42.1806 41.4315 41.9423 41.4315C41.8232 41.4315 41.7041 41.4315 41.585 41.4315C41.5135 41.4315 41.4301 41.4315 41.3587 41.4315C40.9179 41.4315 40.4772 41.4196 40.0484 41.2409C39.9769 41.2171 39.9173 41.1813 39.8459 41.1456C39.7268 41.9437 39.3098 42.5988 38.6666 42.9919C38.1187 43.3254 37.5707 43.3731 37.0466 43.3731H36.8799C36.7488 43.3731 36.6297 43.3731 36.4987 43.3731C36.2247 43.3731 35.9388 43.3731 35.6649 43.3492C34.8191 43.2778 34.0449 42.7537 33.628 41.9794C33.4255 41.5983 33.3302 41.1694 33.3421 40.6334C33.3421 39.9306 33.3659 39.2278 33.3778 38.5369L33.4612 34.4274L21.7519 34.213L21.6328 40.7287C21.609 41.7174 21.1683 42.5393 20.4178 43.0038C19.8699 43.3373 19.322 43.385 18.7978 43.385H18.6311L18.643 43.3255ZM16.5584 40.7287C16.5584 40.7287 16.5584 40.7882 16.5584 40.812C16.5584 40.8478 16.5584 40.8954 16.5584 40.9073C16.5584 40.955 16.5823 41.0146 16.5942 41.0622C16.6299 41.1813 16.6776 41.2766 16.749 41.3719C16.9753 41.6816 17.3089 41.8246 17.8211 41.8365H18.2261C18.5 41.8484 18.7621 41.8603 19.0361 41.8603H19.0837C19.0837 41.8603 19.1909 41.8483 19.2267 41.8483C19.3458 41.8245 19.453 41.7888 19.5602 41.7412C19.7508 41.6459 19.9175 41.4791 20.0247 41.2885C20.132 41.086 20.1558 40.8478 20.1677 40.6453C20.1796 39.9544 20.1915 39.2635 20.2034 38.5845L20.4774 24.0999C20.4774 23.5758 20.1915 23.147 19.727 22.9921C19.5245 22.9206 19.2862 22.9087 19.0837 22.9087H18.6906H18.3928C18.2618 22.9087 18.1189 22.9087 17.9878 22.9087C17.9878 22.9087 17.8687 22.9087 17.8568 22.9087C17.7377 22.9087 17.6305 22.9564 17.5114 23.004C17.0826 23.1946 16.8681 23.5877 16.8562 24.2548C16.8562 24.2548 16.5465 40.6453 16.5465 40.7168M34.8072 40.7168C34.8072 40.7168 34.8072 40.7764 34.8072 40.8002C34.8072 40.8359 34.8072 40.8835 34.8072 40.8954C34.8072 40.9431 34.831 41.0026 34.843 41.0503C34.8787 41.1694 34.9263 41.2647 34.9978 41.36C35.2241 41.6816 35.5577 41.8246 36.0699 41.8246H36.5106C36.7726 41.8365 37.0228 41.8483 37.2849 41.8483H37.3325H37.3921C37.4159 41.8483 37.4516 41.8483 37.4754 41.8483C37.5946 41.8364 37.7018 41.8007 37.809 41.7412C37.9996 41.6459 38.1663 41.4791 38.2735 41.2885C38.3926 41.086 38.4046 40.8478 38.4165 40.6453C38.4165 40.0855 38.4403 39.5137 38.4522 38.9538V38.6799C38.4522 38.3106 38.4641 37.9413 38.476 37.5601L38.7262 24.088C38.7262 23.5639 38.4403 23.135 37.9877 22.9802C37.7971 22.9087 37.5469 22.9087 37.3444 22.9087H36.9632H36.6654C36.5344 22.9087 36.3915 22.9087 36.2605 22.9087C36.2605 22.9087 36.1413 22.9087 36.1294 22.9087C36.0103 22.9206 35.9031 22.9564 35.784 23.004C35.3552 23.1946 35.1407 23.5877 35.1288 24.2548C35.1288 24.2548 34.8191 40.6453 34.8191 40.7168M39.9412 38.9419C39.9412 38.9419 39.9531 39.061 39.9769 39.1206C40.0007 39.204 40.0365 39.2874 40.0722 39.3588C40.3938 39.9306 41.0132 39.9306 41.6565 39.9425H42.0496C42.0496 39.9425 42.1806 39.9425 42.2044 39.9425C42.3831 39.9187 42.5498 39.8472 42.6928 39.7281C42.9668 39.5256 43.1097 39.2159 43.1335 38.8109C43.1931 37.3934 43.205 35.9521 43.2288 34.5465V33.8437C43.2288 33.8437 43.2288 33.796 43.2288 33.7722L43.3718 26.2083C43.3718 25.7795 43.205 25.4578 42.9072 25.2315C42.6571 25.0529 42.3593 25.029 41.99 25.029H41.2872C41.2872 25.029 41.2157 25.029 41.1681 25.029C40.501 25.1004 40.1913 25.6723 40.1794 26.2083C40.1675 26.7562 40.1556 27.3041 40.1437 27.8521L39.9412 38.8228C39.9412 38.8228 39.9412 38.93 39.9412 38.9657M11.9367 38.7871C11.9367 38.7871 11.9486 38.9062 11.9724 38.9657C11.9962 39.0491 12.032 39.1325 12.0677 39.204C12.3893 39.7757 13.0087 39.7757 13.652 39.7876H14.0451C14.0451 39.7876 14.1761 39.7876 14.1999 39.7757C14.3786 39.7519 14.5453 39.6804 14.6883 39.5613C14.9623 39.3469 15.1171 39.0492 15.129 38.6442L15.3673 26.0534C15.3673 25.6246 15.2005 25.303 14.9027 25.0767C14.6526 24.898 14.3548 24.8741 13.9855 24.8741H13.2827C13.2827 24.8741 13.1993 24.8741 13.1636 24.8741C12.4965 24.9456 12.1749 25.5174 12.163 26.0534C12.1511 26.6014 12.1392 27.1493 12.1273 27.6973L11.9248 38.6679C11.9248 38.7275 11.9248 38.7751 11.9248 38.8109M44.8369 33.1766L44.8607 31.9974H44.7178L44.694 33.1766H44.8369ZM33.485 32.9622L33.5088 31.783L21.7996 31.5686L21.7758 32.7478L33.485 32.9622ZM10.5668 32.5334L10.5907 31.3541H10.4834L10.4596 32.5334H10.5668Z"
+        fill="currentColor"
+      />
+      <path
+        d="M35.0581 20.6217C34.7126 20.6217 34.4268 20.3358 34.4268 19.9904C34.4268 16.4883 31.5679 13.6295 28.0659 13.6295C24.5638 13.6295 21.705 16.4883 21.705 19.9904C21.705 20.3358 21.4191 20.6217 21.0737 20.6217C20.7283 20.6217 20.4424 20.3358 20.4424 19.9904C20.4424 15.7855 23.873 12.355 28.0778 12.355C32.2827 12.355 35.7132 15.7855 35.7132 19.9904C35.7132 20.3358 35.4273 20.6217 35.0819 20.6217"
+        fill="currentColor"
+      />
+      <path
+        d="M35.4026 14.2968C35.212 14.2968 35.0214 14.2134 34.8904 14.0466C34.676 13.7608 34.7356 13.3677 35.0095 13.1533L38.0947 10.8185C38.3805 10.6041 38.7736 10.6637 38.988 10.9496C39.2025 11.2236 39.1429 11.6286 38.8689 11.843L35.7838 14.1777C35.6647 14.261 35.5337 14.3087 35.4026 14.3087"
+        fill="currentColor"
+      />
+      <path
+        d="M30.3991 11.0328C30.3396 11.0328 30.2681 11.0328 30.2086 11.009C29.875 10.9018 29.6844 10.5444 29.7916 10.2109L30.9709 6.4468C31.0781 6.11327 31.4355 5.92272 31.769 6.02992C32.1025 6.13713 32.2931 6.49446 32.1859 6.82799L31.0066 10.5921C30.9233 10.866 30.6731 11.0447 30.3991 11.0447"
+        fill="currentColor"
+      />
+      <path
+        d="M24.5042 11.4378C24.2302 11.4378 23.9801 11.2592 23.8967 10.9852L22.7174 7.22112C22.6102 6.88759 22.8008 6.53019 23.1343 6.42298C23.4679 6.31578 23.8252 6.50641 23.9324 6.83994L25.1117 10.604C25.2189 10.9375 25.0283 11.2949 24.6948 11.4021C24.6352 11.4259 24.5637 11.4259 24.5042 11.4259"
+        fill="currentColor"
+      />
+      <path
+        d="M19.9648 15.3687C19.8337 15.3687 19.7027 15.321 19.5836 15.2377L16.4985 12.9149C16.2126 12.7004 16.1649 12.3074 16.3793 12.0215C16.5938 11.7475 16.9868 11.688 17.2727 11.9024L20.3579 14.2252C20.6437 14.4396 20.6914 14.8327 20.4889 15.1186C20.3579 15.2853 20.1792 15.3687 19.9767 15.3687"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default OpenAirGymIcon;
diff --git a/client/src/components/icons/activities/OutdoorCinemaIcon.tsx b/client/src/components/icons/amenities/OutdoorCinemaIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/OutdoorCinemaIcon.tsx
rename to client/src/components/icons/amenities/OutdoorCinemaIcon.tsx
diff --git a/client/src/components/icons/activities/OutdoorCoworkingSpaceIcon.tsx b/client/src/components/icons/amenities/OutdoorCoworkingSpaceIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/OutdoorCoworkingSpaceIcon.tsx
rename to client/src/components/icons/amenities/OutdoorCoworkingSpaceIcon.tsx
diff --git a/client/src/components/icons/amenities/OutdoorGamingTerraceIcon.tsx b/client/src/components/icons/amenities/OutdoorGamingTerraceIcon.tsx
new file mode 100644
index 0000000..528bcd8
--- /dev/null
+++ b/client/src/components/icons/amenities/OutdoorGamingTerraceIcon.tsx
@@ -0,0 +1,48 @@
+function OutdoorGamingTerraceIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M31.3397 40.6906H25.408C25.0754 40.6906 24.7966 40.4332 24.7751 40.1114L24.1315 31.7878C24.0993 31.4445 24.3675 31.1334 24.7215 31.112C25.0754 31.0798 25.3758 31.348 25.408 31.6912L26.0086 39.4357H31.3504C31.7043 39.4357 31.9832 39.7145 31.9832 40.0685C31.9832 40.4225 31.6936 40.7014 31.3504 40.7014"
+        fill="currentColor"
+      />
+      <path
+        d="M27.8438 44.3696C27.4898 44.3696 27.2109 44.0907 27.2109 43.7368V40.0576C27.2109 39.7144 27.4898 39.4248 27.8438 39.4248C28.1978 39.4248 28.4767 39.7037 28.4767 40.0576V43.7368C28.4767 44.08 28.187 44.3696 27.8438 44.3696Z"
+        fill="currentColor"
+      />
+      <path
+        d="M29.6349 35.5956H42.3456V34.1153H29.6349V35.5956ZM42.9892 36.8613H29.002C28.648 36.8613 28.3691 36.5824 28.3691 36.2284V33.4932C28.3691 33.1499 28.6588 32.8604 29.002 32.8604H42.9892C43.3432 32.8604 43.6221 33.1392 43.6221 33.4932V36.2284C43.6221 36.5716 43.3324 36.8613 42.9892 36.8613Z"
+        fill="currentColor"
+      />
+      <path
+        d="M35.9952 44.3696C35.6412 44.3696 35.3623 44.0907 35.3623 43.7367V36.2176C35.3623 35.8744 35.6519 35.5847 35.9952 35.5847C36.3384 35.5847 36.628 35.8636 36.628 36.2176V43.7367C36.628 44.08 36.3491 44.3696 35.9952 44.3696Z"
+        fill="currentColor"
+      />
+      <path
+        d="M46.5714 40.6904H40.6397C40.2857 40.6904 40.0068 40.4115 40.0068 40.0575C40.0068 39.7035 40.2964 39.4247 40.6397 39.4247H45.9814L46.5821 31.6802C46.6143 31.337 46.9146 31.0688 47.2686 31.101C47.6226 31.1225 47.88 31.4335 47.8585 31.7768L47.215 40.1005C47.1935 40.433 46.9146 40.6797 46.5821 40.6797"
+        fill="currentColor"
+      />
+      <path
+        d="M44.1485 44.3696C43.7945 44.3696 43.5156 44.0907 43.5156 43.7368V40.0576C43.5156 39.7144 43.7945 39.4248 44.1485 39.4248C44.5025 39.4248 44.7813 39.7037 44.7813 40.0576V43.7368C44.7813 44.08 44.4917 44.3696 44.1485 44.3696Z"
+        fill="currentColor"
+      />
+      <path
+        d="M17.3858 44.3699C17.0318 44.3699 16.7529 44.0909 16.7529 43.737V23.9469C16.7529 23.5929 17.0425 23.314 17.3858 23.314C17.729 23.314 18.0186 23.5929 18.0186 23.9469V43.737C18.0186 44.0802 17.7398 44.3699 17.3858 44.3699Z"
+        fill="currentColor"
+      />
+      <path
+        d="M17.3855 28.3554C17.2246 28.3554 17.0637 28.2911 16.935 28.1731C16.6883 27.9264 16.6883 27.5295 16.935 27.2828L18.7263 25.5022C18.973 25.2555 19.3806 25.2555 19.6273 25.5022C19.8741 25.7489 19.8741 26.1458 19.6273 26.3925L17.836 28.1731C17.7073 28.3018 17.5464 28.3554 17.3855 28.3554Z"
+        fill="currentColor"
+      />
+      <path
+        d="M17.3846 31.8737C17.2237 31.8737 17.0628 31.8093 16.9341 31.6913L14.8531 29.6534C14.6064 29.4066 14.5957 29.0098 14.8531 28.763C15.0998 28.5163 15.5074 28.5056 15.7541 28.763L17.8458 30.801C18.0925 31.0477 18.1032 31.4446 17.8458 31.6913C17.7171 31.82 17.5562 31.8844 17.3953 31.8844"
+        fill="currentColor"
+      />
+      <path
+        d="M17.3846 36.6253C12.2145 36.6253 8.02051 32.4527 8.02051 27.3255C8.02051 24.3758 9.41494 21.6405 11.7747 19.8814C11.3671 19.0448 11.1526 18.1223 11.1526 17.1891C11.1526 13.7781 13.9522 11 17.3846 11C20.8171 11 23.6167 13.7781 23.6167 17.1891C23.6167 18.1223 23.4021 19.0448 22.9945 19.8814C25.3543 21.6405 26.7488 24.3758 26.7488 27.3255C26.7488 27.6795 26.4592 27.9584 26.1159 27.9584C25.7727 27.9584 25.4831 27.6795 25.4831 27.3255C25.4831 24.6117 24.1101 22.1018 21.8146 20.6108C21.525 20.4284 21.4392 20.0423 21.6216 19.7527C22.0935 18.9804 22.351 18.0901 22.351 17.1998C22.351 14.486 20.1306 12.2764 17.3954 12.2764C14.6601 12.2764 12.4291 14.486 12.4291 17.1998C12.4291 18.1008 12.6865 18.9804 13.1584 19.7527C13.3408 20.0423 13.255 20.4177 12.9654 20.6108C10.6699 22.1018 9.29695 24.6117 9.29695 27.3255C9.29695 31.7555 12.9332 35.3596 17.3846 35.3596C18.8005 35.3596 20.195 34.9949 21.4178 34.2869C21.7181 34.1153 22.115 34.2119 22.2866 34.5229C22.4582 34.834 22.3617 35.2094 22.0506 35.381C20.6347 36.1855 19.0258 36.6146 17.3846 36.6146"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default OutdoorGamingTerraceIcon;
diff --git a/client/src/components/icons/amenities/OutdoorKitchenIcon.tsx b/client/src/components/icons/amenities/OutdoorKitchenIcon.tsx
new file mode 100644
index 0000000..e584ad5
--- /dev/null
+++ b/client/src/components/icons/amenities/OutdoorKitchenIcon.tsx
@@ -0,0 +1,28 @@
+function OutdoorKitchenIcon() {
+  return (
+    <svg
+      viewBox="0 0 56 56"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M16.3088 29.8897C16.2435 29.8897 16.1781 29.8897 16.1127 29.8679C15.6659 29.7589 15.3935 29.3013 15.5025 28.8546C16.9299 23.0143 22.0728 18.9392 28.0002 18.9392C28.4578 18.9392 28.8283 19.3097 28.8283 19.7782C28.8283 20.2467 28.4578 20.6172 28.0002 20.6172C22.8355 20.6172 18.3573 24.1693 17.1151 29.2577C17.0171 29.6391 16.6793 29.9006 16.3088 29.9006"
+        fill="currentColor"
+      />
+      <path
+        d="M13.4976 31.1537C13.9334 23.4175 20.264 17.2504 28.0002 17.2504C35.7363 17.2504 42.0778 23.4175 42.5136 31.1537H13.5085H13.4976ZM27.1721 14.7334C27.1721 14.2649 27.5425 13.8944 28.0002 13.8944C28.4578 13.8944 28.8283 14.2758 28.8283 14.7334C28.8283 15.191 28.4578 15.5724 28.0002 15.5724C27.5425 15.5724 27.1721 15.191 27.1721 14.7334ZM45.1722 27.4926C44.6274 27.4926 44.1153 27.6669 43.6904 27.9502C42.0886 21.5761 36.8041 16.6729 30.2774 15.7359C30.4082 15.4308 30.4844 15.0821 30.4844 14.7334C30.4844 13.3387 29.373 12.2056 28.0002 12.2056C26.6273 12.2056 25.5159 13.3387 25.5159 14.7334C25.5159 15.093 25.5921 15.4308 25.7229 15.7359C19.1962 16.6729 13.9117 21.5652 12.3099 27.9502C11.885 27.656 11.3838 27.4926 10.8281 27.4926C10.3705 27.4926 10 27.8631 10 28.3316C10 28.8001 10.3705 29.1706 10.8281 29.1706C11.3729 29.1706 11.8087 29.6173 11.8087 30.1621V31.9927C11.8087 32.4612 12.1792 32.8317 12.6368 32.8317H43.3417C43.8102 32.8317 44.1807 32.4503 44.1807 31.9927V30.1621C44.1807 29.6173 44.6165 29.1706 45.1613 29.1706C45.619 29.1706 45.9894 28.7892 45.9894 28.3316C45.9894 27.874 45.619 27.4926 45.1613 27.4926"
+        fill="currentColor"
+      />
+      <path
+        d="M33.4371 36.1985C33.8947 36.1985 34.2652 35.8172 34.2652 35.3595C34.2652 34.9019 33.8947 34.5205 33.4371 34.5205H22.5629C22.1053 34.5205 21.7348 34.9019 21.7348 35.3595C21.7348 35.8172 22.1053 36.1985 22.5629 36.1985H27.1719V37.8765H10.8388C10.3812 37.8765 10.0107 38.2578 10.0107 38.7155C10.0107 39.1731 10.3812 39.5544 10.8388 39.5544H28.0109C28.2288 39.5544 28.4358 39.4673 28.5993 39.3039C28.7518 39.1404 28.839 38.9334 28.839 38.7046V36.1767H33.448L33.4371 36.1985Z"
+        fill="currentColor"
+      />
+      <path
+        d="M45.172 37.8765H30.9092C30.4515 37.8765 30.0811 38.2578 30.0811 38.7154C30.0811 39.1731 30.4515 39.5544 30.9092 39.5544H45.172C45.6296 39.5544 46.0001 39.1731 46.0001 38.7154C46.0001 38.2578 45.6296 37.8765 45.172 37.8765Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default OutdoorKitchenIcon;
diff --git a/client/src/components/icons/activities/PadelPongIcon.tsx b/client/src/components/icons/amenities/PadelPongIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/PadelPongIcon.tsx
rename to client/src/components/icons/amenities/PadelPongIcon.tsx
diff --git a/client/src/components/icons/activities/PingPongInATableIcon.tsx b/client/src/components/icons/amenities/PingPongInATableIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/PingPongInATableIcon.tsx
rename to client/src/components/icons/amenities/PingPongInATableIcon.tsx
diff --git a/client/src/components/icons/amenities/PlaystationDeckIcon.tsx b/client/src/components/icons/amenities/PlaystationDeckIcon.tsx
new file mode 100644
index 0000000..8277f3f
--- /dev/null
+++ b/client/src/components/icons/amenities/PlaystationDeckIcon.tsx
@@ -0,0 +1,24 @@
+function PlaystationDeckIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M18.7315 14.3829H24.1819V24.6938H13.8811V14.3829H18.7315ZM13.1388 26.1886H24.9344C25.3411 26.1886 25.6868 25.8429 25.6868 25.4361V13.6304C25.6868 13.2237 25.3513 12.8779 24.9344 12.8779H13.1388C12.7321 12.8779 12.3965 13.2237 12.3965 13.6304V25.4361C12.3965 25.8429 12.7321 26.1886 13.1388 26.1886Z"
+        fill="currentColor"
+      />
+      <path
+        d="M39.17 24.6937H31.8181C31.8588 24.6327 31.8893 24.5615 31.93 24.5005C32.5299 23.4633 33.1299 22.4261 33.7298 21.3787C34.4315 20.1687 35.1331 18.9484 35.8347 17.7384C36.3635 16.8232 36.8821 15.9182 37.4108 15.003L37.5227 15.2064C38.1227 16.2436 38.7226 17.2808 39.3225 18.3282C40.0242 19.5484 40.7258 20.7584 41.4274 21.9685C41.9562 22.8735 42.4748 23.7887 43.0036 24.6937H39.1802H39.17ZM44.9356 25.0598C44.6814 24.6225 44.4272 24.1853 44.1729 23.7378L42.3731 20.6161C41.6715 19.3959 40.9698 18.1858 40.2682 16.9656C39.7089 15.9995 39.1497 15.0234 38.5904 14.0573C38.4074 13.7421 38.2243 13.4269 38.0413 13.1117C37.7566 12.6236 37.0346 12.6236 36.7499 13.1117C36.4957 13.5489 36.2415 13.9963 35.9872 14.4336C35.3873 15.4708 34.7873 16.508 34.1874 17.5452C33.4858 18.7654 32.7842 19.9755 32.0825 21.1855C31.5232 22.1515 30.964 23.1277 30.4047 24.0937L29.8556 25.0394C29.8556 25.0394 29.8048 25.1309 29.7946 25.192C29.7743 25.2631 29.7539 25.3445 29.7539 25.4258C29.7539 25.558 29.7946 25.6902 29.8556 25.7919C29.9166 25.9037 30.0081 25.9953 30.12 26.0665C30.181 26.097 30.242 26.1275 30.303 26.1376C30.364 26.158 30.425 26.1681 30.4962 26.1681H44.2543C44.8237 26.1681 45.1796 25.5377 44.9051 25.0394"
+        fill="currentColor"
+      />
+      <path
+        d="M24.5178 37.1402C24.4466 37.6283 24.3144 38.096 24.1314 38.5536C23.9382 38.9807 23.7043 39.3874 23.4196 39.7738C23.1145 40.1501 22.7688 40.4958 22.3926 40.8009C22.0163 41.0856 21.6096 41.3195 21.1723 41.5127C20.7148 41.6957 20.247 41.8279 19.7589 41.8991C19.2607 41.9601 18.7624 41.9601 18.2743 41.8991C17.7964 41.8279 17.3185 41.6957 16.8609 41.5127C16.4338 41.3195 16.027 41.0856 15.6406 40.8009C15.2644 40.4958 14.9187 40.1501 14.6136 39.7738C14.339 39.3976 14.095 38.9909 13.9018 38.5536C13.7188 38.096 13.5866 37.6283 13.5154 37.1402C13.4544 36.6419 13.4544 36.1437 13.5154 35.6454C13.5866 35.1573 13.7188 34.6896 13.9018 34.232C14.095 33.8049 14.3289 33.388 14.6136 33.0117C14.9187 32.6355 15.2644 32.2898 15.6406 31.9847C16.0169 31.7 16.4236 31.4661 16.8609 31.2729C17.3185 31.0899 17.7862 30.9577 18.2743 30.8865C18.7725 30.8255 19.2708 30.8255 19.7589 30.8865C20.247 30.9577 20.7148 31.0899 21.1723 31.2729C21.5994 31.4661 22.0062 31.7 22.3926 31.9847C22.7688 32.2898 23.1145 32.6253 23.4196 33.0117C23.6941 33.388 23.9382 33.7947 24.1314 34.232C24.3144 34.6896 24.4466 35.1573 24.5178 35.6454C24.5483 35.8894 24.5585 36.1437 24.5585 36.3877C24.5585 36.6317 24.5483 36.886 24.5178 37.13M23.4908 30.9475C22.6671 30.2865 21.7214 29.7883 20.6842 29.5443C19.6165 29.29 18.498 29.29 17.4201 29.5341C15.4271 29.9815 13.6679 31.3848 12.7528 33.2049C12.2647 34.1709 12.0105 35.2387 12.0003 36.3267C11.9901 37.4147 12.2443 38.4824 12.7121 39.4688C13.5866 41.3195 15.3356 42.7227 17.3184 43.221C18.3861 43.4854 19.5047 43.4955 20.5826 43.2617C21.6198 43.0379 22.5756 42.5499 23.4094 41.8991C25.0568 40.6178 26.0227 38.5943 26.0634 36.5199C26.0634 36.4792 26.0634 36.4385 26.0634 36.3979C26.0634 34.3235 25.1177 32.2796 23.4908 30.9678"
+        fill="currentColor"
+      />
+      <path
+        d="M42.9432 31.3438C43.2686 31.0184 43.5839 30.7032 43.9093 30.3778C44.194 30.0829 44.194 29.605 43.9093 29.3203C43.6245 29.0356 43.1364 29.0356 42.8517 29.3203C42.5568 29.6152 42.2619 29.9101 41.9671 30.2151C41.2247 30.9574 40.4824 31.6997 39.7401 32.442C38.9266 33.2555 38.1132 34.069 37.2997 34.8825C36.5269 34.1097 35.7541 33.3369 34.9812 32.5641C34.2288 31.8014 33.4661 31.0489 32.7136 30.2863C32.3984 29.9609 32.073 29.6457 31.7476 29.3203C31.4629 29.0254 30.9748 29.0254 30.6901 29.3203C30.4054 29.6152 30.4054 30.0931 30.6901 30.3778C30.985 30.6727 31.2799 30.9676 31.5748 31.2727C32.3171 32.015 33.0594 32.7573 33.8017 33.4996C34.6152 34.3131 35.4287 35.1265 36.2421 35.94C35.4693 36.7128 34.6965 37.4857 33.9237 38.2686C33.1712 39.0211 32.4086 39.7837 31.6561 40.5464C31.3307 40.8718 31.0155 41.187 30.6901 41.5124C30.4054 41.8073 30.4054 42.2852 30.6901 42.5699C30.9748 42.8547 31.4629 42.8547 31.7476 42.5699C32.0425 42.2751 32.3374 41.9802 32.6323 41.6751C33.3746 40.9328 34.1169 40.1905 34.8592 39.4482C35.6727 38.6347 36.4862 37.8212 37.2997 37.0077C38.0725 37.7805 38.8453 38.5533 39.6181 39.3363C40.3706 40.0888 41.1332 40.8515 41.8857 41.6141C42.2111 41.9395 42.5263 42.2547 42.8517 42.5801C43.1364 42.875 43.6245 42.875 43.9093 42.5801C44.194 42.2954 44.194 41.8073 43.9093 41.5226C43.6144 41.2277 43.3195 40.9328 43.0246 40.6277C42.2823 39.8854 41.5399 39.1431 40.7976 38.4008C39.9842 37.5873 39.1707 36.7738 38.3572 35.9502C39.13 35.1774 39.9028 34.4046 40.6756 33.6318C41.4281 32.8793 42.1908 32.1166 42.9432 31.354"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default PlaystationDeckIcon;
diff --git a/client/src/components/icons/amenities/PrivateMeetingRoomsIcon.tsx b/client/src/components/icons/amenities/PrivateMeetingRoomsIcon.tsx
new file mode 100644
index 0000000..44e86f8
--- /dev/null
+++ b/client/src/components/icons/amenities/PrivateMeetingRoomsIcon.tsx
@@ -0,0 +1,19 @@
+function PrivateMeetingRoomsIcon() {
+  return (
+    <svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M14.8144 25.7783C14.8144 27.0926 13.75 28.164 12.4286 28.164C11.1072 28.164 10.043 27.0997 10.043 25.7783M22.0571 25.7783C22.0571 27.0926 20.993 28.164 19.6715 28.164C18.3501 28.164 17.2858 27.0997 17.2858 25.7783M29.3001 25.7783C29.3001 27.0926 28.2358 28.164 26.9215 28.164C25.6072 28.164 24.5359 27.0997 24.5359 25.7783M24.5359 14.2783C24.5359 12.964 25.6 11.8926 26.9215 11.8926C28.2429 11.8926 29.3001 12.9569 29.3001 14.2783M17.2858 14.2783C17.2858 12.964 18.3501 11.8926 19.6715 11.8926C20.993 11.8926 22.0571 12.9569 22.0571 14.2783M10.043 14.2783C10.043 12.964 11.1072 11.8926 12.4286 11.8926C13.75 11.8926 14.8144 12.9569 14.8144 14.2783M7.67866 22.414C6.36437 22.414 5.29297 21.3497 5.29297 20.0283C5.29297 18.7069 6.35723 17.6426 7.67866 17.6426M32.0643 17.6426C33.3786 17.6426 34.4501 18.7069 34.4501 20.0283C34.4501 21.3497 33.3857 22.414 32.0643 22.414"
+        stroke="currentColor"
+        strokeWidth={1.5}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M29.5714 23.657H30.0714V23.157V16.8856V16.3856H29.5714H10.1143H9.61429V16.8856V23.157V23.657H10.1143H29.5714ZM9.29297 16.0713H30.3858V23.9713H9.29297V16.0713Z"
+        stroke="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default PrivateMeetingRoomsIcon;
diff --git a/client/src/components/icons/amenities/RooftopGardenIcon.tsx b/client/src/components/icons/amenities/RooftopGardenIcon.tsx
new file mode 100644
index 0000000..57843a3
--- /dev/null
+++ b/client/src/components/icons/amenities/RooftopGardenIcon.tsx
@@ -0,0 +1,64 @@
+function RooftopGardenIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M14.6538 43.7862H40.1438V41.3576H14.6538V43.7862ZM40.756 45.0004H14.0517C13.715 45.0004 13.4395 44.7249 13.4395 44.3882V40.7453C13.4395 40.4085 13.715 40.1331 14.0517 40.1331H40.756C41.0928 40.1331 41.3683 40.4085 41.3683 40.7453V44.3882C41.3683 44.7249 41.0928 45.0004 40.756 45.0004Z"
+        fill="currentColor"
+      />
+      <path
+        d="M16.1837 26.7858C14.2347 26.7858 12.2245 27.6124 12.2245 28.9899C12.2245 30.0512 14.3674 30.4287 16.3776 30.4287C16.9184 30.4287 17.1429 30.2144 17.449 29.9185C17.7756 29.6124 18.1837 29.2144 18.898 29.2144C19.2858 29.2144 20.194 29.2144 20.5613 28.8471C20.6327 28.7756 20.7144 28.6634 20.7144 28.4083C20.7144 27.296 18.0103 26.7756 16.1735 26.7756M16.3674 31.6328C12.9082 31.6328 11 30.694 11 28.9797C11 26.7348 13.6021 25.5613 16.1735 25.5613C16.7654 25.5613 21.9287 25.643 21.9287 28.4083C21.9287 28.9185 21.7552 29.3674 21.4185 29.7042C20.694 30.4287 19.4491 30.4185 18.9388 30.4185C18.6837 30.4185 18.5715 30.5103 18.2858 30.7858C17.9082 31.143 17.398 31.6328 16.3776 31.6328"
+        fill="currentColor"
+      />
+      <path
+        d="M40.418 26.184C38.9282 26.184 38.9282 26.3166 38.9282 26.786C38.9282 27.3473 40.2853 27.3983 41.9282 27.3983C43.6731 27.3983 43.7752 27.2656 43.7854 26.9799C43.469 26.6126 41.4894 26.184 40.418 26.184ZM41.9282 28.6126C39.9486 28.6126 37.7139 28.6126 37.7139 26.786C37.7139 24.9595 39.2751 24.9697 40.418 24.9697C40.4588 24.9697 44.9997 25.1126 44.9997 26.9187C44.9997 28.6126 43.5098 28.6126 41.9282 28.6126Z"
+        fill="currentColor"
+      />
+      <path
+        d="M33.4697 19.6737C33.9391 20.1533 37.0922 20.1227 38.7963 20.1022C39.2351 20.1022 39.6739 20.1022 40.0922 20.1022C42.7453 20.1022 43.1841 19.7553 43.1841 19.0002C43.1841 18.49 42.8575 17.7349 41.9494 17.7349C41.0412 17.7349 40.2759 18.4593 40.2657 18.4695C40.1228 18.6226 39.9086 18.6839 39.7045 18.6328C39.5106 18.592 39.3473 18.4594 39.2657 18.2655C39.2453 18.2145 38.9392 17.6941 37.633 17.6941C36.5412 17.6941 35.633 18.6736 35.6228 18.6838C35.4799 18.8369 35.2555 18.9083 35.0514 18.8675C34.8269 18.8165 34.082 18.7553 33.7248 19.041C33.6636 19.0921 33.4901 19.2349 33.4799 19.6838M37.5208 21.337C34.9493 21.337 33.2962 21.2145 32.6126 20.5308C32.3881 20.3063 32.2656 20.0308 32.2656 19.7247C32.2656 18.8471 32.6432 18.3573 32.9697 18.1022C33.6126 17.5818 34.5003 17.5818 34.9799 17.6329C35.4187 17.2349 36.4187 16.49 37.6432 16.49C38.8677 16.49 39.531 16.8471 39.929 17.194C40.378 16.8879 41.0922 16.5308 41.9494 16.5308C43.5412 16.5308 44.3984 17.8063 44.3984 19.0104C44.3984 21.3267 41.9086 21.3268 40.0922 21.3268C39.6841 21.3268 39.2453 21.3268 38.8065 21.3268C38.3575 21.3268 37.9188 21.3268 37.5106 21.3268"
+        fill="currentColor"
+      />
+      <path
+        d="M19.0211 17.0816C16.6742 17.0816 14.8374 17.0102 13.9599 16.1327C13.6129 15.7857 13.4395 15.347 13.4395 14.8164C13.4395 12.5408 16.3272 11.5816 17.4701 11.5816C18.2252 11.5816 19.215 11.8163 19.715 11.949C20.1946 11.602 21.2865 11 22.96 11C23.8987 11 25.4906 11.4082 25.5824 14.1123L24.3681 14.1531C24.3069 12.4388 23.6232 12.2041 22.96 12.2041C21.1844 12.2041 20.3069 13.0102 20.2763 13.0408C20.1232 13.1939 19.8885 13.2449 19.6844 13.1836C19.6742 13.1836 18.3273 12.7755 17.4905 12.7755C16.766 12.7755 14.6742 13.4694 14.6742 14.7959C14.6742 15.051 14.766 15.1735 14.8375 15.2551C15.4395 15.8572 17.5109 15.8572 19.7048 15.847H20.4191C22.2763 15.847 23.2457 15.5 23.7355 15.2041L24.3579 16.2449C23.4498 16.7755 22.1334 17.0511 20.4191 17.0511H19.7048C19.4803 17.0511 19.2558 17.0511 19.0314 17.0511"
+        fill="currentColor"
+      />
+      <path
+        d="M28.7146 13.4387C27.1227 13.4387 26.6534 14.2551 26.6329 14.2959C26.5309 14.4796 26.3268 14.6122 26.1125 14.6224C25.337 14.6428 24.4798 14.8469 24.3472 15.0408C24.3574 15.6632 25.4492 15.8775 28.8166 15.8775C32.184 15.8775 32.8575 15.5408 32.8575 14.9592C32.8575 14.6122 32.7452 14.3571 32.5616 14.2551C32.2963 14.1122 31.8371 14.2142 31.3473 14.5306C31.2044 14.6224 31.0309 14.653 30.8677 14.602C30.7044 14.5612 30.5718 14.449 30.4901 14.3061C30.4697 14.2653 29.9799 13.4489 28.7146 13.4489M28.8166 17.0918C25.7758 17.0918 23.1533 17.0918 23.1533 14.9898C23.1533 13.7653 24.888 13.4898 25.7758 13.4286C26.1432 12.9796 27.0105 12.2346 28.7146 12.2346C29.9901 12.2346 30.7758 12.806 31.184 13.2448C32.1432 12.806 32.8065 13.0101 33.1432 13.1938C33.7351 13.5203 34.0718 14.1633 34.0718 14.9592C34.0718 16.9388 31.7962 17.0918 28.8166 17.0918Z"
+        fill="currentColor"
+      />
+      <path
+        d="M21.3262 20.1124C13.8363 20.1124 11.0098 19.8573 11.0098 17.1124C11.0098 15.7553 12.9791 15.2144 13.8261 14.9797C13.8975 14.9593 13.9588 14.9389 13.9894 14.9287L14.173 15.4696L14.2241 15.4899L14.7445 15.1838L14.7853 15.7247C14.673 16.0104 14.4384 16.0716 14.1526 16.1532C12.2445 16.6838 12.2241 17.1022 12.2241 17.1124C12.2241 18.4492 13.5404 18.8981 21.3262 18.8981C25.7548 18.8981 27.9997 18.49 27.9997 17.6839C27.9997 17.2043 27.7242 16.8981 27.7242 16.8981L28.5814 16.041C28.6426 16.1022 29.214 16.7042 29.214 17.6839C29.214 19.2247 27.9181 20.1124 21.3262 20.1124Z"
+        fill="currentColor"
+      />
+      <path
+        d="M19.4792 40.9393L18.3262 40.5515L18.9384 38.725C18.9894 38.572 19.1017 38.4495 19.2445 38.3781L21.2038 37.3985L20.1527 34.2556C20.0813 34.0515 20.1323 33.8372 20.265 33.6739L23.3058 30.031C23.4283 29.878 23.6324 29.7964 23.8262 29.8168L30.0916 30.3882L30.9998 28.5719L30.0201 26.133L24.9181 25.5616C24.7854 25.5412 24.6528 25.48 24.5507 25.3882L19.0813 19.929L19.9384 19.0718L25.2548 24.3882L30.51 24.9698C30.7344 24.9902 30.9283 25.1433 31.01 25.3474L32.2242 28.378C32.2855 28.5412 32.2855 28.7147 32.2039 28.878L30.9896 31.3066C30.8773 31.5311 30.6324 31.6637 30.3875 31.6433L24.0303 31.0617L21.418 34.1944L22.5201 37.5107C22.6119 37.7964 22.4895 38.1127 22.214 38.2454L20.0099 39.3475L19.4792 40.9291V40.9393Z"
+        fill="currentColor"
+      />
+      <path
+        d="M29.8581 40.9393L29.3581 39.4495L26.6642 38.9087C26.4193 38.8577 26.2254 38.6638 26.1846 38.4087L25.5724 34.7658C25.5213 34.4597 25.705 34.1638 26.001 34.0821L34.1949 31.7453L34.6439 30.4086L32.9398 24.7351L31.45 23.7453H26.1744C26.0111 23.7453 25.8581 23.6841 25.7458 23.5616L22.1846 19.9187L23.0519 19.0718L26.4397 22.531H31.6439C31.7663 22.531 31.8785 22.5718 31.9806 22.633L33.7969 23.8473C33.9092 23.929 34.001 24.0412 34.0418 24.1739L35.8684 30.2454C35.899 30.3678 35.899 30.4902 35.8684 30.6127L35.2561 32.4291C35.1949 32.6229 35.0418 32.7658 34.848 32.8168L26.8683 35.0923L27.3173 37.7863L29.9397 38.3168C30.154 38.3576 30.3275 38.5107 30.3989 38.7148L31.0112 40.5413L29.8581 40.9291V40.9393Z"
+        fill="currentColor"
+      />
+      <path
+        d="M25.5913 22.5818L24.7852 21.6736L26.1831 20.4491V19.1226H27.3974V20.7246C27.3974 20.8981 27.326 21.0614 27.1933 21.1838L25.5913 22.592V22.5818Z"
+        fill="currentColor"
+      />
+      <path
+        d="M33.6632 24.9389L33.2754 23.7858L36.602 22.6736L37.1326 20.5715L38.3061 20.8674L37.6938 23.296C37.6428 23.5001 37.4897 23.6634 37.2958 23.7246L33.653 24.9389H33.6632Z"
+        fill="currentColor"
+      />
+      <path
+        d="M35.3679 31.031L35.2148 29.8269L39.7047 29.2656L40.2557 27.7759L41.3986 28.2044L40.7149 30.0412C40.6332 30.2555 40.4496 30.4085 40.2251 30.4289L35.3679 31.0412V31.031Z"
+        fill="currentColor"
+      />
+      <path
+        d="M25.7549 41.1737L23.9283 39.3472C23.8161 39.2349 23.7549 39.0819 23.7549 38.9186V37.092H24.9692V38.6635L26.612 40.3064L25.7549 41.1636V41.1737Z"
+        fill="currentColor"
+      />
+      <path
+        d="M19.4306 29.6215L18.3145 30.0999L20.1355 34.3486L21.2516 33.8702L19.4306 29.6215Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default RooftopGardenIcon;
diff --git a/client/src/components/icons/amenities/RoveBeverageTruckIcon.tsx b/client/src/components/icons/amenities/RoveBeverageTruckIcon.tsx
new file mode 100644
index 0000000..bd4a214
--- /dev/null
+++ b/client/src/components/icons/amenities/RoveBeverageTruckIcon.tsx
@@ -0,0 +1,24 @@
+function RoveBeverageTruckIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M23.8994 34.6099C23.8038 34.6099 23.7083 34.5886 23.6128 34.5568C23.2414 34.3976 23.061 33.9838 23.2202 33.6123L32.4211 12.0374C33.1109 10.3712 35.0636 9.56468 36.7615 10.2439L41.1763 12.0161C41.5477 12.1647 41.7281 12.5892 41.5795 12.9606C41.431 13.3321 40.9959 13.5125 40.6244 13.3533L36.2097 11.581C35.2546 11.199 34.1721 11.6553 33.7795 12.5892L24.5785 34.1641C24.4618 34.44 24.1859 34.6099 23.8994 34.6099Z"
+        fill="currentColor"
+      />
+      <path
+        d="M35.3189 21.5463H21.9155C18.6787 21.5463 16.0469 18.9568 16.0469 15.7731C16.0469 12.5894 18.6787 10 21.9155 10C25.1523 10 27.7948 12.5894 27.7948 15.7731C27.7948 17.0785 27.3384 18.3625 26.5001 19.3813C26.2454 19.6891 25.789 19.7422 25.4707 19.4875C25.1523 19.2434 25.0992 18.787 25.3539 18.4686C25.9907 17.6939 26.3197 16.7601 26.3197 15.7625C26.3197 13.3747 24.3457 11.4326 21.9155 11.4326C19.4853 11.4326 17.5114 13.3747 17.5114 15.7625C17.5114 18.1503 19.4853 20.0924 21.9155 20.0924H35.3189C35.7222 20.0924 36.0512 20.4107 36.0512 20.814C36.0512 21.2173 35.7222 21.5356 35.3189 21.5356"
+        fill="currentColor"
+      />
+      <path
+        d="M21.6299 16.495L22.3091 42.5059C22.3091 42.8986 22.6381 43.2063 23.0413 43.2063H33.399C33.8022 43.2063 34.1206 42.8986 34.1312 42.5059L34.8104 16.495H21.6299ZM33.399 44.6602H23.0413C21.8421 44.6602 20.8658 43.737 20.8339 42.5484L20.1123 15.0518H36.3068L35.5851 42.5484C35.5533 43.737 34.5876 44.6602 33.3778 44.6602"
+        fill="currentColor"
+      />
+      <path
+        d="M43.6392 44.6598H12.7996C12.3964 44.6598 12.0674 44.3415 12.0674 43.9382C12.0674 43.5349 12.3964 43.2166 12.7996 43.2166H43.6392C44.0424 43.2166 44.3714 43.5349 44.3714 43.9382C44.3714 44.3415 44.0424 44.6598 43.6392 44.6598Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default RoveBeverageTruckIcon;
diff --git a/client/src/components/icons/activities/RunningWheelIcon.tsx b/client/src/components/icons/amenities/RunningWheelIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/RunningWheelIcon.tsx
rename to client/src/components/icons/amenities/RunningWheelIcon.tsx
diff --git a/client/src/components/icons/amenities/SoundproofMeetingPodsIcon.tsx b/client/src/components/icons/amenities/SoundproofMeetingPodsIcon.tsx
new file mode 100644
index 0000000..e16914c
--- /dev/null
+++ b/client/src/components/icons/amenities/SoundproofMeetingPodsIcon.tsx
@@ -0,0 +1,27 @@
+function SoundproofMeetingPodsIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M25.6094 20.0699C25.6094 18.565 26.8265 17.3398 28.3394 17.3398C29.8432 17.3398 31.0693 18.566 31.0693 20.0699C31.0693 21.5737 29.8432 22.7999 28.3394 22.7999C26.8355 22.7999 25.6094 21.5737 25.6094 20.0699ZM30.1292 20.0699C30.1292 19.0839 29.3256 18.2798 28.3394 18.2798C27.3532 18.2798 26.5493 19.0837 26.5493 20.0699C26.5493 21.0561 27.3532 21.8599 28.3394 21.8599C29.3256 21.8599 30.1292 21.0559 30.1292 20.0699Z"
+        stroke="currentColor"
+      />
+      <path
+        d="M35.6594 31.43H36.1594V30.93V14.65C36.1594 12.4472 34.371 10.6554 32.1694 10.65V10.65H32.1594H24.5496C22.3434 10.65 20.5496 12.4438 20.5496 14.65V30.93V31.43H21.0496H35.6594ZM24.5396 9.70996H32.1594C34.8833 9.70996 37.0996 11.9261 37.0996 14.65V32.37H19.5996V14.65C19.5996 11.9255 21.8063 9.70996 24.5396 9.70996Z"
+        stroke="currentColor"
+      />
+      <path
+        d="M36.1692 35.5499V35.0499H35.6692H35.6592H21.0493H20.5493V35.5499V41.7299C20.5493 43.936 22.3432 45.7299 24.5493 45.7299H32.1692C34.3753 45.7299 36.1692 43.936 36.1692 41.7299V35.5499ZM19.6094 41.7299V34.1099H37.1094V41.7299C37.1094 44.4631 34.8937 46.6699 32.1692 46.6699H24.5493C21.8249 46.6699 19.6094 44.4631 19.6094 41.7299Z"
+        stroke="currentColor"
+      />
+      <path
+        d="M23.2793 31.8199V28.9799C23.2793 26.1699 25.5494 23.8899 28.3494 23.8899C31.1494 23.8899 33.4292 26.1699 33.4292 28.9799V31.8199"
+        stroke="currentColor"
+        strokeWidth={1.84}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+export default SoundproofMeetingPodsIcon;
diff --git a/client/src/components/icons/amenities/StargazingPointIcon.tsx b/client/src/components/icons/amenities/StargazingPointIcon.tsx
new file mode 100644
index 0000000..c0a4da9
--- /dev/null
+++ b/client/src/components/icons/amenities/StargazingPointIcon.tsx
@@ -0,0 +1,65 @@
+interface Props {
+  className?: string;
+}
+
+function StargazingPointIcon({ className = "" }: Props) {
+  return (
+    <svg
+      viewBox="0 0 56 56"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+    >
+      <path
+        d="M27.2328 27.5814C26.3365 27.5814 25.6083 28.332 25.6083 29.2394C25.6083 30.1469 26.3365 30.8974 27.2328 30.8974C28.129 30.8974 28.8572 30.1469 28.8572 29.2394C28.8572 28.332 28.129 27.5814 27.2328 27.5814ZM27.2328 32.5666C25.4403 32.5666 23.9951 31.0767 23.9951 29.2394C23.9951 27.4021 25.4515 25.9233 27.2328 25.9233C29.014 25.9233 30.4704 27.4133 30.4704 29.2394C30.4704 31.0655 29.014 32.5666 27.2328 32.5666Z"
+        fill=""
+      />
+      <path
+        d="M27.2324 45.8531C26.7843 45.8531 26.4258 45.4834 26.4258 45.0241V31.7375C26.4258 31.2781 26.7843 30.9084 27.2324 30.9084C27.6805 30.9084 28.039 31.2781 28.039 31.7375V45.0241C28.039 45.4834 27.6805 45.8531 27.2324 45.8531Z"
+        fill="currentColor"
+      />
+      <path
+        d="M36.1484 45.8533C35.8571 45.8533 35.577 45.6852 35.4314 45.4052L28.2728 31.3455C28.0711 30.9422 28.2167 30.4381 28.62 30.2252C29.0234 30.0124 29.5051 30.1692 29.7179 30.5725L36.8766 44.6322C37.0782 45.0355 36.9326 45.5396 36.5293 45.7524C36.4061 45.8197 36.2828 45.842 36.1596 45.842"
+        fill="currentColor"
+      />
+      <path
+        d="M19.1321 45.8534C19.02 45.8534 18.8968 45.831 18.7848 45.775C18.3815 45.5845 18.2022 45.0804 18.3927 44.6659L24.8119 30.6847C25.0024 30.2702 25.4841 30.0909 25.8874 30.2814C26.2907 30.4718 26.47 30.976 26.2795 31.3905L19.8603 45.3717C19.7258 45.6742 19.4346 45.8534 19.1321 45.8534Z"
+        fill="currentColor"
+      />
+      <path
+        d="M33.6077 40.868H21.4189C20.9708 40.868 20.6123 40.4983 20.6123 40.039C20.6123 39.5796 20.9708 39.21 21.4189 39.21H33.6077C34.0558 39.21 34.4143 39.5796 34.4143 40.039C34.4143 40.4983 34.0558 40.868 33.6077 40.868Z"
+        fill="currentColor"
+      />
+      <path
+        d="M21.585 32.5779C21.3049 32.5779 21.036 32.4323 20.8792 32.1634L16.4204 24.2542C16.3084 24.0637 16.286 23.8397 16.342 23.6268C16.398 23.414 16.5325 23.2347 16.7229 23.1227L36.3728 11.4941C36.7537 11.27 37.2578 11.4045 37.4819 11.7966C37.7059 12.1887 37.5715 12.704 37.1906 12.928L18.2465 24.1421L21.8874 30.6174L24.4081 29.1274C24.8002 28.9034 25.2931 29.0378 25.5172 29.4299C25.7412 29.8332 25.6068 30.3373 25.2259 30.5614L21.9995 32.4659C21.8762 32.5443 21.7306 32.5779 21.5962 32.5779"
+        fill="currentColor"
+      />
+      <path
+        d="M28.8897 28.2536C28.6096 28.2536 28.3408 28.108 28.1839 27.8391C27.9599 27.447 28.0943 26.9317 28.4752 26.7076L40.8096 19.4033C41.1905 19.1681 41.6946 19.3137 41.9187 19.7058C42.1427 20.0979 42.0083 20.6133 41.6274 20.8373L29.293 28.1416C29.1698 28.22 29.0241 28.2536 28.8897 28.2536Z"
+        fill="currentColor"
+      />
+      <path
+        d="M41.6381 21.6776C41.5709 21.6776 41.4925 21.6776 41.4253 21.6439C41.2236 21.5879 41.0444 21.4423 40.9324 21.2519L38.5573 17.0284C38.3333 16.6251 38.4677 16.1209 38.8486 15.8969C39.2295 15.6616 39.7336 15.8073 39.9577 16.1994L41.9294 19.6947L43.3298 18.8656L38.871 10.9564L37.4706 11.7854L38.5797 13.7683C38.8038 14.1716 38.6694 14.6758 38.2885 14.8998C37.8964 15.1239 37.4034 14.9895 37.1794 14.5974L35.6558 11.8975C35.5438 11.707 35.5214 11.4829 35.5774 11.2701C35.6334 11.0572 35.7678 10.878 35.9583 10.7659L38.7702 9.10794C38.9606 8.99591 39.1735 8.9735 39.3863 9.02951C39.588 9.08553 39.7672 9.21997 39.8793 9.42162L45.1446 18.776C45.3687 19.1681 45.2343 19.6835 44.8534 19.9075L42.0414 21.5655C41.9182 21.644 41.7726 21.6776 41.6381 21.6776Z"
+        fill="currentColor"
+      />
+      <path
+        d="M16.265 34.7627C16.1978 34.7627 16.1194 34.7627 16.0522 34.7291C15.8393 34.6731 15.6713 34.5274 15.5592 34.337L11.9183 27.8617C11.6942 27.4696 11.8287 26.9542 12.2096 26.7302L17.1164 23.8286C17.5085 23.5934 18.0015 23.739 18.2255 24.1311C18.4496 24.5232 18.3151 25.0386 17.923 25.2626L13.7108 27.7497L16.5451 32.7797L20.7574 30.2927C21.1495 30.0686 21.6424 30.2031 21.8665 30.5952C22.0905 30.9873 21.9561 31.5026 21.5752 31.7267L16.6683 34.6282C16.5451 34.7067 16.3995 34.7402 16.265 34.7402"
+        fill="currentColor"
+      />
+      <path
+        d="M9.21685 32.2193C8.93678 32.2193 8.66791 32.0737 8.51107 31.8048C8.28701 31.4127 8.42144 30.8974 8.80234 30.6733L13.0146 28.1863C13.4067 27.951 13.8997 28.0967 14.1237 28.4888C14.3478 28.8809 14.2133 29.3962 13.8324 29.6203L9.62015 32.1073C9.49692 32.1857 9.35128 32.2193 9.21685 32.2193Z"
+        fill="currentColor"
+      />
+      <path
+        d="M11.2452 35.8155C10.9651 35.8155 10.6962 35.6699 10.5394 35.401C10.3153 35.0089 10.4498 34.4936 10.8307 34.2695L15.0429 31.7825C15.435 31.5472 15.928 31.6929 16.152 32.085C16.3761 32.4771 16.2417 32.9924 15.8608 33.2165L11.6485 35.7035C11.5252 35.7819 11.3796 35.8155 11.2452 35.8155Z"
+        fill="currentColor"
+      />
+      <path
+        d="M11.6488 36.5438C11.3688 36.5438 11.0999 36.3982 10.9431 36.1293L8.10873 31.0992C7.88467 30.7071 8.0191 30.1918 8.39999 29.9677C8.7921 29.7436 9.28503 29.8781 9.50909 30.2702L12.3434 35.3003C12.5675 35.6924 12.433 36.2077 12.0521 36.4318C11.9289 36.5102 11.7833 36.5438 11.6488 36.5438Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default StargazingPointIcon;
diff --git a/client/src/components/icons/activities/SunLoungingDeckIcon.tsx b/client/src/components/icons/amenities/SunLoungingDeckIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/SunLoungingDeckIcon.tsx
rename to client/src/components/icons/amenities/SunLoungingDeckIcon.tsx
diff --git a/client/src/components/icons/amenities/SunkenSeatingIcon.tsx b/client/src/components/icons/amenities/SunkenSeatingIcon.tsx
new file mode 100644
index 0000000..33e61a8
--- /dev/null
+++ b/client/src/components/icons/amenities/SunkenSeatingIcon.tsx
@@ -0,0 +1,28 @@
+function SunkenSeatingIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M40.2375 45.6357H16.4795C16.1478 45.6357 15.8802 45.3681 15.8802 45.047V36.828H2.5993C2.26754 36.828 2 36.5605 2 36.2395C2 35.9184 2.26754 35.6509 2.5993 35.6509H16.4795C16.8113 35.6509 17.0788 35.9184 17.0788 36.2395V44.4584H39.6489V36.2395C39.6489 35.9077 39.9164 35.6509 40.2482 35.6509H53.4007C53.7325 35.6509 54 35.9184 54 36.2395C54 36.5605 53.7325 36.828 53.4007 36.828H40.8475V45.047C40.8475 45.3788 40.5799 45.6357 40.2482 45.6357"
+        fill="currentColor"
+      />
+      <path
+        d="M10.6563 15.424C9.4256 15.424 8.41964 16.4193 8.41964 17.65C8.41964 18.8807 9.4256 19.876 10.6563 19.876C11.887 19.876 12.893 18.8807 12.893 17.65C12.893 16.4193 11.887 15.424 10.6563 15.424ZM10.6563 20.7321C8.95473 20.7321 7.56348 19.3516 7.56348 17.65C7.56348 15.9484 8.94402 14.5786 10.6563 14.5786C12.3686 14.5786 13.7491 15.9591 13.7491 17.65C13.7491 19.3409 12.3686 20.7321 10.6563 20.7321Z"
+        fill="currentColor"
+      />
+      <path
+        d="M21.1143 43.1628C20.4508 43.1628 19.8087 42.7668 19.5411 42.114L16.9834 35.9604H10.6694C9.7276 35.9604 8.96777 35.2006 8.96777 34.2695V23.5464C8.96777 22.6046 9.7276 21.8555 10.6694 21.8555C11.6111 21.8555 12.371 22.6153 12.371 23.5464V32.5787H18.1178C18.8027 32.5787 19.4234 32.9853 19.691 33.6274L22.6875 40.8297C23.0513 41.6966 22.634 42.6811 21.7671 43.045C21.5531 43.1306 21.3283 43.1734 21.1143 43.1734"
+        fill="currentColor"
+      />
+      <path
+        d="M45.334 15.424C44.1033 15.424 43.0974 16.4193 43.0974 17.65C43.0974 18.8807 44.1033 19.876 45.334 19.876C46.5648 19.876 47.5707 18.8807 47.5707 17.65C47.5707 16.4193 46.5648 15.424 45.334 15.424ZM45.334 20.7321C43.6325 20.7321 42.2412 19.3516 42.2412 17.65C42.2412 15.9484 43.6218 14.5786 45.334 14.5786C47.0463 14.5786 48.4268 15.9591 48.4268 17.65C48.4268 19.3409 47.0463 20.7321 45.334 20.7321Z"
+        fill="currentColor"
+      />
+      <path
+        d="M34.8864 43.1635C34.6724 43.1635 34.4477 43.1206 34.2336 43.035C33.3668 42.6711 32.9494 41.6866 33.3133 40.8198L36.3098 33.6174C36.5773 32.986 37.198 32.5687 37.883 32.5687H43.6298V23.5364C43.6298 22.5946 44.3896 21.8455 45.3314 21.8455C46.2732 21.8455 47.033 22.6053 47.033 23.5364V34.2596C47.033 35.2013 46.2732 35.9504 45.3314 35.9504H39.0173L36.4596 42.1039C36.1921 42.7568 35.55 43.1528 34.8864 43.1528"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default SunkenSeatingIcon;
diff --git a/client/src/components/icons/activities/SuspendedLoungingNetsIcon.tsx b/client/src/components/icons/amenities/SuspendedLoungingNetsIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/SuspendedLoungingNetsIcon.tsx
rename to client/src/components/icons/amenities/SuspendedLoungingNetsIcon.tsx
diff --git a/client/src/components/icons/amenities/UrbanBeachPoolIcon.tsx b/client/src/components/icons/amenities/UrbanBeachPoolIcon.tsx
new file mode 100644
index 0000000..0e318f6
--- /dev/null
+++ b/client/src/components/icons/amenities/UrbanBeachPoolIcon.tsx
@@ -0,0 +1,78 @@
+function UrbanBeachPoolIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M28 18C24.6939 18 22 15.3107 22 12C22 8.68926 24.6939 6 28 6C31.3061 6 34 8.68926 34 12C34 15.3107 31.3061 18 28 18ZM28 7.26553C25.3952 7.26553 23.269 9.38983 23.269 12C23.269 14.6102 25.3952 16.7345 28 16.7345C30.6048 16.7345 32.731 14.6102 32.731 12C32.731 9.38983 30.6048 7.26553 28 7.26553Z"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M28 6.5C24.9698 6.5 22.5 8.96566 22.5 12C22.5 15.0343 24.9698 17.5 28 17.5C31.0302 17.5 33.5 15.0343 33.5 12C33.5 8.96566 31.0302 6.5 28 6.5ZM21.5 12C21.5 8.41287 24.418 5.5 28 5.5C31.582 5.5 34.5 8.41287 34.5 12C34.5 15.5871 31.582 18.5 28 18.5C24.418 18.5 21.5 15.5871 21.5 12ZM22.769 12C22.769 9.1138 25.1189 6.76553 28 6.76553C30.8811 6.76553 33.231 9.1138 33.231 12C33.231 14.8862 30.8811 17.2345 28 17.2345C25.1189 17.2345 22.769 14.8862 22.769 12ZM28 7.76553C25.6714 7.76553 23.769 9.66586 23.769 12C23.769 14.3341 25.6714 16.2345 28 16.2345C30.3286 16.2345 32.231 14.3341 32.231 12C32.231 9.66586 30.3286 7.76553 28 7.76553Z"
+        fill="currentColor"
+      />
+      <path
+        d="M44.1608 41.4686C43.6195 41.7381 43.0781 42.1179 42.5588 42.4977C42.0506 42.853 41.5755 43.196 41.1115 43.4288C40.6475 43.6616 40.2166 43.7841 39.8189 43.7841C39.4211 43.7841 38.9902 43.6738 38.5262 43.4288C38.0511 43.196 37.5761 42.853 37.0678 42.4977C36.5486 42.1302 36.0182 41.7504 35.4769 41.4809C34.2395 40.8561 33.2009 40.8561 31.9635 41.4809C31.4221 41.7504 30.8808 42.1302 30.3726 42.4977C29.8643 42.853 29.3893 43.196 28.9252 43.4288C28.4612 43.6616 28.0414 43.7841 27.6326 43.7841C27.2238 43.7841 26.804 43.6738 26.3399 43.4288C25.8648 43.196 25.3898 42.853 24.8926 42.4977C24.3733 42.1302 23.843 41.7504 23.3016 41.4809C22.0642 40.8561 21.0257 40.8561 19.7883 41.4809C19.2469 41.7504 18.7055 42.1302 18.1973 42.4977C17.6891 42.853 17.214 43.196 16.7389 43.4288C16.2749 43.6616 15.8551 43.7841 15.4463 43.7841C15.0375 43.7841 14.6177 43.6738 14.1536 43.4288C13.6786 43.196 13.2035 42.853 12.6953 42.4855C12.176 42.1179 11.6457 41.7381 11.1043 41.4686C9.8669 40.8438 8.82836 40.8438 7.59095 41.4686C7.04958 41.7381 6.50822 42.1179 6 42.4855L6.60765 43.5146C7.11587 43.1593 7.59096 42.8162 8.05499 42.5835C8.51901 42.3507 8.9499 42.2282 9.34764 42.2282C9.74537 42.2282 10.1763 42.3384 10.6403 42.5835C11.1154 42.8162 11.5904 43.1593 12.0876 43.5146C12.6069 43.8821 13.1372 44.2619 13.6786 44.5314C14.916 45.1562 15.9545 45.1562 17.1919 44.5314C17.7333 44.2619 18.2747 43.8821 18.7829 43.5146C19.2911 43.1593 19.7662 42.8162 20.2413 42.5835C20.7053 42.3507 21.1362 42.2282 21.5339 42.2282C21.9317 42.2282 22.3515 42.3384 22.8266 42.5835C23.3016 42.8162 23.7767 43.1593 24.2849 43.5146C24.8042 43.8821 25.3345 44.2619 25.8759 44.5314C27.1133 45.1562 28.1629 45.1562 29.3893 44.5314C29.9306 44.2619 30.472 43.8821 30.9802 43.5146C31.4884 43.1593 31.9635 42.8162 32.4275 42.5835C32.8916 42.3507 33.3114 42.2282 33.7202 42.2282C34.129 42.2282 34.5378 42.3384 35.0128 42.5835C35.4879 42.8162 35.963 43.1593 36.4712 43.5146C36.9905 43.8821 37.5208 44.2619 38.0622 44.5314C39.2996 45.1562 40.3492 45.1562 41.5755 44.5314C42.1169 44.2619 42.6583 43.8821 43.1775 43.5146C43.6858 43.1593 44.1608 42.8162 44.6249 42.5835C45.0889 42.3507 45.5198 42.2282 45.9175 42.2282C46.3153 42.2282 46.7462 42.3384 47.2102 42.5835C47.5969 42.7795 47.9836 43.0368 48.3923 43.3185L49 42.3017C48.5691 41.9954 48.1272 41.7014 47.6852 41.4809C46.4478 40.8561 45.4093 40.8561 44.1719 41.4809"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M11.3285 41.0216C11.8854 41.2991 12.425 41.6812 12.9166 42.0294C12.9392 42.0455 12.9618 42.0615 12.9842 42.0774L12.9884 42.0803C13.5054 42.4542 13.9445 42.7695 14.3738 42.9798L14.3805 42.9831L14.3872 42.9867C14.7936 43.2012 15.1338 43.2841 15.4464 43.2841C15.7525 43.2841 16.0941 43.1929 16.5149 42.9819L16.5191 42.9798C16.914 42.7863 17.3134 42.5065 17.7791 42.1802C17.8214 42.1506 17.8642 42.1206 17.9077 42.0902C18.4133 41.7246 18.9833 41.3233 19.5643 41.0339C20.2339 40.696 20.8798 40.5123 21.5451 40.5123C22.2104 40.5123 22.8563 40.696 23.5259 41.0339C24.0829 41.3114 24.6225 41.6936 25.1143 42.0419C25.1368 42.0579 25.1592 42.0738 25.1816 42.0896L25.1834 42.0909L25.2106 42.1103C25.707 42.4651 26.1376 42.7728 26.56 42.9798L26.5668 42.9831L26.5735 42.9867C26.9799 43.2012 27.32 43.2841 27.6327 43.2841C27.9388 43.2841 28.2804 43.1929 28.7012 42.9819C29.0854 42.7892 29.4822 42.511 29.9435 42.1878C29.9893 42.1557 30.0358 42.1231 30.0829 42.0902C30.5885 41.7246 31.1585 41.3234 31.7394 41.034C32.409 40.696 33.055 40.5123 33.7203 40.5123C34.3856 40.5123 35.0315 40.696 35.7011 41.0339C36.2581 41.3114 36.7978 41.6936 37.2895 42.0419C37.3117 42.0576 37.3337 42.0732 37.3557 42.0888C37.3998 42.1196 37.4433 42.1501 37.4862 42.1801C37.952 42.5065 38.3514 42.7863 38.7463 42.9798L38.7531 42.9831L38.7598 42.9867C39.1651 43.2007 39.5164 43.2841 39.819 43.2841C40.115 43.2841 40.4679 43.1923 40.8874 42.9819C41.2716 42.7892 41.6685 42.511 42.1298 42.1878C42.1753 42.1559 42.2214 42.1236 42.2681 42.091C42.7864 41.712 43.3565 41.3106 43.9381 41.021L44.3838 41.9162C43.8843 42.1649 43.3732 42.5216 42.8541 42.9013L42.8455 42.9076C42.796 42.9422 42.7462 42.977 42.6963 43.012C42.2495 43.3255 41.7899 43.6479 41.3358 43.8757C40.8273 44.1308 40.3185 44.2841 39.819 44.2841C39.3282 44.2841 38.82 44.1481 38.2995 43.8745C37.8325 43.6447 37.3699 43.3202 36.9223 43.0061C36.8752 42.9731 36.8282 42.9402 36.7815 42.9075L36.7791 42.9058L36.7372 42.8762C36.2243 42.513 35.7407 42.1707 35.2541 41.9285L35.2516 41.9272C34.6842 41.6407 34.1925 41.5123 33.7203 41.5123C33.2481 41.5123 32.7564 41.6407 32.189 41.9272L32.1865 41.9285C31.6864 42.1774 31.1754 42.5343 30.6657 42.9029L30.6592 42.9075C30.6097 42.9422 30.5599 42.977 30.51 43.012C30.0632 43.3255 29.6037 43.6479 29.1495 43.8757C28.6422 44.1302 28.1442 44.2841 27.6327 44.2841C27.1299 44.2841 26.6325 44.1476 26.1132 43.8745C25.6172 43.6304 25.129 43.2813 24.6629 42.9481C24.6429 42.9337 24.6229 42.9194 24.6029 42.9051L24.602 42.9045L24.562 42.8762C24.049 42.513 23.5654 42.1707 23.0789 41.9285L23.0764 41.9272C22.509 41.6407 22.0173 41.5123 21.5451 41.5123C21.0728 41.5123 20.5812 41.6407 20.0138 41.9272L20.0112 41.9285C19.5112 42.1774 19.0001 42.5343 18.4904 42.9029L18.484 42.9075C18.4372 42.9402 18.3902 42.9731 18.3431 43.0062C17.894 43.3212 17.4298 43.6469 16.9612 43.8768C16.4546 44.1306 15.9572 44.2841 15.4464 44.2841C14.9436 44.2841 14.4462 44.1476 13.927 43.8745C13.4134 43.6218 12.9094 43.2573 12.4167 42.901L12.4044 42.8921C12.391 42.8826 12.3776 42.8731 12.3642 42.8636C11.8514 42.5006 11.368 42.1583 10.8816 41.9162L10.8791 41.9149C10.3116 41.6284 9.81999 41.5 9.34775 41.5C8.87551 41.5 8.38384 41.6284 7.81643 41.9149L7.81391 41.9162C7.43504 42.1048 7.04989 42.3554 6.66378 42.6261L6.76377 42.7954C7.11701 42.5509 7.47562 42.3148 7.83091 42.1365C8.33942 41.8815 8.84825 41.7282 9.34775 41.7282C9.83852 41.7282 10.3468 41.8641 10.8672 42.1378C11.3632 42.3818 11.8515 42.731 12.3175 43.0642C12.3376 43.0785 12.3576 43.0928 12.3775 43.1071C12.3912 43.1168 12.4048 43.1264 12.4184 43.1361C12.9314 43.4992 13.415 43.8416 13.9015 44.0838L13.9041 44.0851C14.4715 44.3716 14.9631 44.5 15.4354 44.5C15.9076 44.5 16.3993 44.3716 16.9667 44.0851L16.9692 44.0838C17.4693 43.8348 17.9803 43.478 18.49 43.1094L18.4965 43.1047C18.5433 43.072 18.5902 43.0391 18.6374 43.0061C19.0865 42.691 19.5507 42.3654 20.0193 42.1355C20.5271 41.881 21.0352 41.7282 21.534 41.7282C22.0278 41.7282 22.5247 41.8658 23.0513 42.1367C23.5191 42.3666 23.9824 42.6916 24.4307 43.0061C24.4778 43.0391 24.5248 43.0721 24.5715 43.1048L24.5739 43.1064L24.6158 43.1361C25.1288 43.4992 25.6123 43.8416 26.0989 44.0838L26.1014 44.0851C26.6683 44.3713 27.1628 44.5 27.6368 44.5C28.1107 44.5 28.6019 44.3715 29.1624 44.0859L29.1665 44.0838C29.6666 43.8348 30.1777 43.478 30.6873 43.1094L30.6938 43.1047C30.7433 43.0701 30.7931 43.0353 30.843 43.0003C31.2898 42.6868 31.7493 42.3644 32.2035 42.1365C32.7108 41.8821 33.2088 41.7282 33.7203 41.7282C34.2261 41.7282 34.7121 41.8664 35.2376 42.1367C35.7054 42.3666 36.1687 42.6916 36.617 43.0061C36.6641 43.0392 36.7111 43.0721 36.7578 43.1048L36.7602 43.1064L36.8021 43.1361C37.315 43.4992 37.7986 43.8416 38.2851 44.0838L38.2877 44.0851C38.8546 44.3713 39.3491 44.5 39.8231 44.5C40.2969 44.5 40.7882 44.3715 41.3487 44.0859L41.3528 44.0838C41.8539 43.8343 42.3642 43.4778 42.8888 43.1064L42.8912 43.1048C42.9407 43.0701 42.9904 43.0353 43.0403 43.0003C43.4871 42.6868 43.9467 42.3643 44.4008 42.1365C44.9093 41.8815 45.4181 41.7282 45.9176 41.7282C46.4093 41.7282 46.9186 41.8646 47.44 42.1393C47.7077 42.2753 47.972 42.4364 48.2344 42.6084L48.3312 42.4463C48.0367 42.2483 47.7469 42.0704 47.4621 41.9283L47.46 41.9272C46.8926 41.6407 46.4009 41.5123 45.9287 41.5123C45.4565 41.5123 44.9648 41.6407 44.3974 41.9272L43.9466 41.0345C44.6166 40.6962 45.263 40.5123 45.9287 40.5123C46.5941 40.5123 47.2401 40.696 47.9097 41.034C48.387 41.2723 48.854 41.5844 49.2898 41.8941L49.6662 42.1617L48.548 44.033L48.1087 43.7302C47.7 43.4485 47.3378 43.2087 46.9842 43.0294L46.9768 43.0257C46.5715 42.8117 46.2202 42.7282 45.9176 42.7282C45.6217 42.7282 45.2687 42.8199 44.8492 43.0304C44.465 43.2231 44.0681 43.5012 43.6068 43.8245C43.5603 43.8571 43.5131 43.8901 43.4652 43.9236C42.9522 44.2867 42.381 44.6887 41.8006 44.978C41.1354 45.3165 40.4894 45.5 39.8231 45.5C39.1569 45.5 38.5083 45.3165 37.8382 44.9784C37.2812 44.7009 36.7415 44.3186 36.2498 43.9703C36.2276 43.9546 36.2056 43.939 36.1836 43.9235C36.1395 43.8926 36.096 43.8622 36.0531 43.8321C35.5873 43.5058 35.1879 43.226 34.793 43.0325L34.7837 43.0279C34.3608 42.8098 34.0307 42.7282 33.7203 42.7282C33.4142 42.7282 33.0726 42.8193 32.6518 43.0304C32.2677 43.2231 31.8708 43.5012 31.4095 43.8244C31.3637 43.8565 31.3173 43.8891 31.2701 43.922C30.7648 44.2875 30.195 44.6886 29.6143 44.978C28.9492 45.3165 28.3031 45.5 27.6368 45.5C26.9706 45.5 26.322 45.3165 25.6519 44.9784C25.0949 44.7009 24.5552 44.3186 24.0635 43.9703C24.0413 43.9546 24.0193 43.939 23.9973 43.9235C23.9532 43.8926 23.9097 43.8621 23.8667 43.8321C23.401 43.5058 23.0016 43.226 22.6067 43.0325L22.5974 43.0279C22.1756 42.8104 21.8343 42.7282 21.534 42.7282C21.2381 42.7282 20.8851 42.8199 20.4656 43.0304L20.4614 43.0325C20.0665 43.226 19.6671 43.5058 19.2013 43.8321C19.159 43.8617 19.1162 43.8917 19.0727 43.9221C18.5672 44.2876 17.9972 44.6889 17.4162 44.9783C16.7466 45.3162 16.1007 45.5 15.4354 45.5C14.77 45.5 14.1241 45.3163 13.4546 44.9784C12.8976 44.7009 12.3579 44.3186 11.8662 43.9703C11.8436 43.9544 11.8212 43.9385 11.7989 43.9227L11.797 43.9214L11.7698 43.9019C11.2734 43.5472 10.8428 43.2394 10.4204 43.0325L10.4136 43.0291L10.4069 43.0256C10.0016 42.8116 9.65036 42.7282 9.34775 42.7282C9.05177 42.7282 8.69885 42.8199 8.27929 43.0304C7.89508 43.2231 7.49817 43.5013 7.03687 43.8245C6.99001 43.8573 6.94249 43.8906 6.89424 43.9244L6.45174 44.2337L5.33789 42.3473L5.70712 42.0803C6.21349 41.7141 6.78473 41.3117 7.36696 41.0216C8.03651 40.6837 8.68243 40.5 9.34775 40.5C10.0131 40.5 10.659 40.6837 11.3285 41.0216Z"
+        fill="currentColor"
+      />
+      <path
+        d="M44.1608 36.4686C43.6195 36.7381 43.0781 37.1179 42.5588 37.4977C42.0506 37.853 41.5755 38.196 41.1115 38.4288C40.6475 38.6616 40.2166 38.7841 39.8189 38.7841C39.4211 38.7841 38.9902 38.6738 38.5262 38.4288C38.0511 38.196 37.5761 37.853 37.0678 37.4977C36.5486 37.1302 36.0182 36.7504 35.4769 36.4809C34.2395 35.8561 33.2009 35.8561 31.9635 36.4809C31.4221 36.7504 30.8808 37.1302 30.3726 37.4977C29.8643 37.853 29.3893 38.196 28.9252 38.4288C28.4612 38.6616 28.0414 38.7841 27.6326 38.7841C27.2238 38.7841 26.804 38.6738 26.3399 38.4288C25.8648 38.196 25.3898 37.853 24.8926 37.4977C24.3733 37.1302 23.843 36.7504 23.3016 36.4809C22.0642 35.8561 21.0257 35.8561 19.7883 36.4809C19.2469 36.7504 18.7055 37.1302 18.1973 37.4977C17.6891 37.853 17.214 38.196 16.7389 38.4288C16.2749 38.6616 15.8551 38.7841 15.4463 38.7841C15.0375 38.7841 14.6177 38.6738 14.1536 38.4288C13.6786 38.196 13.2035 37.853 12.6953 37.4855C12.176 37.1179 11.6457 36.7381 11.1043 36.4686C9.8669 35.8438 8.82836 35.8438 7.59095 36.4686C7.04958 36.7381 6.50822 37.1179 6 37.4855L6.60765 38.5146C7.11587 38.1593 7.59096 37.8162 8.05499 37.5835C8.51901 37.3507 8.9499 37.2282 9.34764 37.2282C9.74537 37.2282 10.1763 37.3384 10.6403 37.5835C11.1154 37.8162 11.5904 38.1593 12.0876 38.5146C12.6069 38.8821 13.1372 39.2619 13.6786 39.5314C14.916 40.1562 15.9545 40.1562 17.1919 39.5314C17.7333 39.2619 18.2747 38.8821 18.7829 38.5146C19.2911 38.1593 19.7662 37.8162 20.2413 37.5835C20.7053 37.3507 21.1362 37.2282 21.5339 37.2282C21.9317 37.2282 22.3515 37.3384 22.8266 37.5835C23.3016 37.8162 23.7767 38.1593 24.2849 38.5146C24.8042 38.8821 25.3345 39.2619 25.8759 39.5314C27.1133 40.1562 28.1629 40.1562 29.3893 39.5314C29.9306 39.2619 30.472 38.8821 30.9802 38.5146C31.4884 38.1593 31.9635 37.8162 32.4275 37.5835C32.8916 37.3507 33.3114 37.2282 33.7202 37.2282C34.129 37.2282 34.5378 37.3384 35.0128 37.5835C35.4879 37.8162 35.963 38.1593 36.4712 38.5146C36.9905 38.8821 37.5208 39.2619 38.0622 39.5314C39.2996 40.1562 40.3492 40.1562 41.5755 39.5314C42.1169 39.2619 42.6583 38.8821 43.1775 38.5146C43.6858 38.1593 44.1608 37.8162 44.6249 37.5835C45.0889 37.3507 45.5198 37.2282 45.9175 37.2282C46.3153 37.2282 46.7462 37.3384 47.2102 37.5835C47.5969 37.7795 47.9836 38.0368 48.3923 38.3185L49 37.3017C48.5691 36.9954 48.1272 36.7014 47.6852 36.4809C46.4478 35.8561 45.4093 35.8561 44.1719 36.4809"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M11.3285 36.0216C11.8854 36.2991 12.425 36.6812 12.9166 37.0294C12.9392 37.0455 12.9618 37.0615 12.9842 37.0774L12.9884 37.0803C13.5054 37.4542 13.9445 37.7695 14.3738 37.9798L14.3805 37.9831L14.3872 37.9867C14.7936 38.2012 15.1338 38.2841 15.4464 38.2841C15.7525 38.2841 16.0941 38.1929 16.5149 37.9819L16.5191 37.9798C16.914 37.7863 17.3134 37.5065 17.7791 37.1802C17.8214 37.1506 17.8642 37.1206 17.9077 37.0902C18.4133 36.7246 18.9833 36.3233 19.5643 36.0339C20.2339 35.696 20.8798 35.5123 21.5451 35.5123C22.2104 35.5123 22.8563 35.696 23.5259 36.0339C24.0829 36.3114 24.6225 36.6936 25.1143 37.0419C25.1368 37.0579 25.1592 37.0738 25.1816 37.0896L25.1834 37.0909L25.2106 37.1103C25.707 37.4651 26.1376 37.7728 26.56 37.9798L26.5668 37.9831L26.5735 37.9867C26.9799 38.2012 27.32 38.2841 27.6327 38.2841C27.9388 38.2841 28.2804 38.1929 28.7012 37.9819C29.0854 37.7892 29.4822 37.511 29.9435 37.1878C29.9893 37.1557 30.0358 37.1231 30.0829 37.0902C30.5885 36.7246 31.1585 36.3234 31.7394 36.034C32.409 35.696 33.055 35.5123 33.7203 35.5123C34.3856 35.5123 35.0315 35.696 35.7011 36.0339C36.2581 36.3114 36.7978 36.6936 37.2895 37.0419C37.3117 37.0576 37.3337 37.0732 37.3557 37.0888C37.3998 37.1196 37.4433 37.1501 37.4862 37.1801C37.952 37.5065 38.3514 37.7863 38.7463 37.9798L38.7531 37.9831L38.7598 37.9867C39.1651 38.2007 39.5164 38.2841 39.819 38.2841C40.115 38.2841 40.4679 38.1923 40.8874 37.9819C41.2716 37.7892 41.6685 37.511 42.1298 37.1878C42.1753 37.1559 42.2214 37.1236 42.2681 37.091C42.7864 36.712 43.3565 36.3106 43.9381 36.021L44.3838 36.9162C43.8843 37.1649 43.3732 37.5216 42.8541 37.9013L42.8455 37.9076C42.796 37.9422 42.7462 37.977 42.6963 38.012C42.2495 38.3255 41.7899 38.6479 41.3358 38.8757C40.8273 39.1308 40.3185 39.2841 39.819 39.2841C39.3282 39.2841 38.82 39.1481 38.2995 38.8745C37.8325 38.6447 37.3699 38.3202 36.9223 38.0061C36.8752 37.9731 36.8282 37.9402 36.7815 37.9075L36.7791 37.9058L36.7372 37.8762C36.2243 37.513 35.7407 37.1707 35.2541 36.9285L35.2516 36.9272C34.6842 36.6407 34.1925 36.5123 33.7203 36.5123C33.2481 36.5123 32.7564 36.6407 32.189 36.9272L32.1865 36.9285C31.6864 37.1774 31.1754 37.5343 30.6657 37.9029L30.6592 37.9075C30.6097 37.9422 30.5599 37.977 30.51 38.012C30.0632 38.3255 29.6037 38.6479 29.1495 38.8757C28.6422 39.1302 28.1442 39.2841 27.6327 39.2841C27.1299 39.2841 26.6325 39.1476 26.1132 38.8745C25.6172 38.6304 25.129 38.2813 24.6629 37.9481C24.6429 37.9337 24.6229 37.9194 24.6029 37.9051L24.602 37.9045L24.562 37.8762C24.049 37.513 23.5654 37.1707 23.0789 36.9285L23.0764 36.9272C22.509 36.6407 22.0173 36.5123 21.5451 36.5123C21.0728 36.5123 20.5812 36.6407 20.0138 36.9272L20.0112 36.9285C19.5112 37.1774 19.0001 37.5343 18.4904 37.9029L18.484 37.9075C18.4372 37.9402 18.3902 37.9731 18.3431 38.0062C17.894 38.3212 17.4298 38.6469 16.9612 38.8768C16.4546 39.1306 15.9572 39.2841 15.4464 39.2841C14.9436 39.2841 14.4462 39.1476 13.927 38.8745C13.4134 38.6218 12.9094 38.2573 12.4167 37.901L12.4044 37.8921C12.391 37.8826 12.3776 37.8731 12.3642 37.8636C11.8514 37.5006 11.368 37.1583 10.8816 36.9162L10.8791 36.9149C10.3116 36.6284 9.81999 36.5 9.34775 36.5C8.87551 36.5 8.38384 36.6284 7.81643 36.9149L7.81391 36.9162C7.43504 37.1048 7.04989 37.3554 6.66378 37.6261L6.76377 37.7954C7.11701 37.5509 7.47562 37.3148 7.83091 37.1365C8.33942 36.8815 8.84825 36.7282 9.34775 36.7282C9.83852 36.7282 10.3468 36.8641 10.8672 37.1378C11.3632 37.3818 11.8515 37.731 12.3175 38.0642C12.3376 38.0785 12.3576 38.0928 12.3775 38.1071C12.3912 38.1168 12.4048 38.1264 12.4184 38.1361C12.9314 38.4992 13.415 38.8416 13.9015 39.0838L13.9041 39.0851C14.4715 39.3716 14.9631 39.5 15.4354 39.5C15.9076 39.5 16.3993 39.3716 16.9667 39.0851L16.9692 39.0838C17.4693 38.8348 17.9803 38.478 18.49 38.1094L18.4965 38.1047C18.5433 38.072 18.5902 38.0391 18.6374 38.0061C19.0865 37.691 19.5507 37.3654 20.0193 37.1355C20.5271 36.881 21.0352 36.7282 21.534 36.7282C22.0278 36.7282 22.5247 36.8658 23.0513 37.1367C23.5191 37.3666 23.9824 37.6916 24.4307 38.0061C24.4778 38.0391 24.5248 38.0721 24.5715 38.1048L24.5739 38.1064L24.6158 38.1361C25.1288 38.4992 25.6123 38.8416 26.0989 39.0838L26.1014 39.0851C26.6683 39.3713 27.1628 39.5 27.6368 39.5C28.1107 39.5 28.6019 39.3715 29.1624 39.0859L29.1665 39.0838C29.6666 38.8348 30.1777 38.478 30.6873 38.1094L30.6938 38.1047C30.7433 38.0701 30.7931 38.0353 30.843 38.0003C31.2898 37.6868 31.7493 37.3644 32.2035 37.1365C32.7108 36.8821 33.2088 36.7282 33.7203 36.7282C34.2261 36.7282 34.7121 36.8664 35.2376 37.1367C35.7054 37.3666 36.1687 37.6916 36.617 38.0061C36.6641 38.0392 36.7111 38.0721 36.7578 38.1048L36.7602 38.1064L36.8021 38.1361C37.315 38.4992 37.7986 38.8416 38.2851 39.0838L38.2877 39.0851C38.8546 39.3713 39.3491 39.5 39.8231 39.5C40.2969 39.5 40.7882 39.3715 41.3487 39.0859L41.3528 39.0838C41.8539 38.8343 42.3642 38.4778 42.8888 38.1064L42.8912 38.1048C42.9407 38.0701 42.9904 38.0353 43.0403 38.0003C43.4871 37.6868 43.9467 37.3643 44.4008 37.1365C44.9093 36.8815 45.4181 36.7282 45.9176 36.7282C46.4093 36.7282 46.9186 36.8646 47.44 37.1393C47.7077 37.2753 47.972 37.4364 48.2344 37.6084L48.3312 37.4463C48.0367 37.2483 47.7469 37.0704 47.4621 36.9283L47.46 36.9272C46.8926 36.6407 46.4009 36.5123 45.9287 36.5123C45.4565 36.5123 44.9648 36.6407 44.3974 36.9272L43.9466 36.0345C44.6166 35.6962 45.263 35.5123 45.9287 35.5123C46.5941 35.5123 47.2401 35.696 47.9097 36.034C48.387 36.2723 48.854 36.5844 49.2898 36.8941L49.6662 37.1617L48.548 39.033L48.1087 38.7302C47.7 38.4485 47.3378 38.2087 46.9842 38.0294L46.9768 38.0257C46.5715 37.8117 46.2202 37.7282 45.9176 37.7282C45.6217 37.7282 45.2687 37.8199 44.8492 38.0304C44.465 38.2231 44.0681 38.5012 43.6068 38.8245C43.5603 38.8571 43.5131 38.8901 43.4652 38.9236C42.9522 39.2867 42.381 39.6887 41.8006 39.978C41.1354 40.3165 40.4894 40.5 39.8231 40.5C39.1569 40.5 38.5083 40.3165 37.8382 39.9784C37.2812 39.7009 36.7415 39.3186 36.2498 38.9703C36.2276 38.9546 36.2056 38.939 36.1836 38.9235C36.1395 38.8926 36.096 38.8622 36.0531 38.8321C35.5873 38.5058 35.1879 38.226 34.793 38.0325L34.7837 38.0279C34.3608 37.8098 34.0307 37.7282 33.7203 37.7282C33.4142 37.7282 33.0726 37.8193 32.6518 38.0304C32.2677 38.2231 31.8708 38.5012 31.4095 38.8244C31.3637 38.8565 31.3173 38.8891 31.2701 38.922C30.7648 39.2875 30.195 39.6886 29.6143 39.978C28.9492 40.3165 28.3031 40.5 27.6368 40.5C26.9706 40.5 26.322 40.3165 25.6519 39.9784C25.0949 39.7009 24.5552 39.3186 24.0635 38.9703C24.0413 38.9546 24.0193 38.939 23.9973 38.9235C23.9532 38.8926 23.9097 38.8621 23.8667 38.8321C23.401 38.5058 23.0016 38.226 22.6067 38.0325L22.5974 38.0279C22.1756 37.8104 21.8343 37.7282 21.534 37.7282C21.2381 37.7282 20.8851 37.8199 20.4656 38.0304L20.4614 38.0325C20.0665 38.226 19.6671 38.5058 19.2013 38.8321C19.159 38.8617 19.1162 38.8917 19.0727 38.9221C18.5672 39.2876 17.9972 39.6889 17.4162 39.9783C16.7466 40.3162 16.1007 40.5 15.4354 40.5C14.77 40.5 14.1241 40.3163 13.4546 39.9784C12.8976 39.7009 12.3579 39.3186 11.8662 38.9703C11.8436 38.9544 11.8212 38.9385 11.7989 38.9227L11.797 38.9214L11.7698 38.9019C11.2734 38.5472 10.8428 38.2394 10.4204 38.0325L10.4136 38.0291L10.4069 38.0256C10.0016 37.8116 9.65036 37.7282 9.34775 37.7282C9.05177 37.7282 8.69885 37.8199 8.27929 38.0304C7.89508 38.2231 7.49817 38.5013 7.03687 38.8245C6.99001 38.8573 6.94249 38.8906 6.89424 38.9244L6.45174 39.2337L5.33789 37.3473L5.70712 37.0803C6.21349 36.7141 6.78473 36.3117 7.36696 36.0216C8.03651 35.6837 8.68243 35.5 9.34775 35.5C10.0131 35.5 10.659 35.6837 11.3285 36.0216Z"
+        fill="currentColor"
+      />
+      <path
+        d="M44.1608 31.4686C43.6195 31.7381 43.0781 32.1179 42.5588 32.4977C42.0506 32.853 41.5755 33.196 41.1115 33.4288C40.6475 33.6616 40.2166 33.7841 39.8189 33.7841C39.4211 33.7841 38.9902 33.6738 38.5262 33.4288C38.0511 33.196 37.5761 32.853 37.0678 32.4977C36.5486 32.1302 36.0182 31.7504 35.4769 31.4809C34.2395 30.8561 33.2009 30.8561 31.9635 31.4809C31.4221 31.7504 30.8808 32.1302 30.3726 32.4977C29.8643 32.853 29.3893 33.196 28.9252 33.4288C28.4612 33.6616 28.0414 33.7841 27.6326 33.7841C27.2238 33.7841 26.804 33.6738 26.3399 33.4288C25.8648 33.196 25.3898 32.853 24.8926 32.4977C24.3733 32.1302 23.843 31.7504 23.3016 31.4809C22.0642 30.8561 21.0257 30.8561 19.7883 31.4809C19.2469 31.7504 18.7055 32.1302 18.1973 32.4977C17.6891 32.853 17.214 33.196 16.7389 33.4288C16.2749 33.6616 15.8551 33.7841 15.4463 33.7841C15.0375 33.7841 14.6177 33.6738 14.1536 33.4288C13.6786 33.196 13.2035 32.853 12.6953 32.4855C12.176 32.1179 11.6457 31.7381 11.1043 31.4686C9.8669 30.8438 8.82836 30.8438 7.59095 31.4686C7.04958 31.7381 6.50822 32.1179 6 32.4855L6.60765 33.5146C7.11587 33.1593 7.59096 32.8162 8.05499 32.5835C8.51901 32.3507 8.9499 32.2282 9.34764 32.2282C9.74537 32.2282 10.1763 32.3384 10.6403 32.5835C11.1154 32.8162 11.5904 33.1593 12.0876 33.5146C12.6069 33.8821 13.1372 34.2619 13.6786 34.5314C14.916 35.1562 15.9545 35.1562 17.1919 34.5314C17.7333 34.2619 18.2747 33.8821 18.7829 33.5146C19.2911 33.1593 19.7662 32.8162 20.2413 32.5835C20.7053 32.3507 21.1362 32.2282 21.5339 32.2282C21.9317 32.2282 22.3515 32.3384 22.8266 32.5835C23.3016 32.8162 23.7767 33.1593 24.2849 33.5146C24.8042 33.8821 25.3345 34.2619 25.8759 34.5314C27.1133 35.1562 28.1629 35.1562 29.3893 34.5314C29.9306 34.2619 30.472 33.8821 30.9802 33.5146C31.4884 33.1593 31.9635 32.8162 32.4275 32.5835C32.8916 32.3507 33.3114 32.2282 33.7202 32.2282C34.129 32.2282 34.5378 32.3384 35.0128 32.5835C35.4879 32.8162 35.963 33.1593 36.4712 33.5146C36.9905 33.8821 37.5208 34.2619 38.0622 34.5314C39.2996 35.1562 40.3492 35.1562 41.5755 34.5314C42.1169 34.2619 42.6583 33.8821 43.1775 33.5146C43.6858 33.1593 44.1608 32.8162 44.6249 32.5835C45.0889 32.3507 45.5198 32.2282 45.9175 32.2282C46.3153 32.2282 46.7462 32.3384 47.2102 32.5835C47.5969 32.7795 47.9836 33.0368 48.3923 33.3185L49 32.3017C48.5691 31.9954 48.1272 31.7014 47.6852 31.4809C46.4478 30.8561 45.4093 30.8561 44.1719 31.4809"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M11.3285 31.0216C11.8854 31.2991 12.425 31.6812 12.9166 32.0294C12.9392 32.0455 12.9618 32.0615 12.9842 32.0774L12.9884 32.0803C13.5054 32.4542 13.9445 32.7695 14.3738 32.9798L14.3805 32.9831L14.3872 32.9867C14.7936 33.2012 15.1338 33.2841 15.4464 33.2841C15.7525 33.2841 16.0941 33.1929 16.5149 32.9819L16.5191 32.9798C16.914 32.7863 17.3134 32.5065 17.7791 32.1802C17.8214 32.1506 17.8642 32.1206 17.9077 32.0902C18.4133 31.7246 18.9833 31.3233 19.5643 31.0339C20.2339 30.696 20.8798 30.5123 21.5451 30.5123C22.2104 30.5123 22.8563 30.696 23.5259 31.0339C24.0829 31.3114 24.6225 31.6936 25.1143 32.0419C25.1368 32.0579 25.1592 32.0738 25.1816 32.0896L25.1834 32.0909L25.2106 32.1103C25.707 32.4651 26.1376 32.7728 26.56 32.9798L26.5668 32.9831L26.5735 32.9867C26.9799 33.2012 27.32 33.2841 27.6327 33.2841C27.9388 33.2841 28.2804 33.1929 28.7012 32.9819C29.0854 32.7892 29.4822 32.511 29.9435 32.1878C29.9893 32.1557 30.0358 32.1231 30.0829 32.0902C30.5885 31.7246 31.1585 31.3234 31.7394 31.034C32.409 30.696 33.055 30.5123 33.7203 30.5123C34.3856 30.5123 35.0315 30.696 35.7011 31.0339C36.2581 31.3114 36.7978 31.6936 37.2895 32.0419C37.3117 32.0576 37.3337 32.0732 37.3557 32.0888C37.3998 32.1196 37.4433 32.1501 37.4862 32.1801C37.952 32.5065 38.3514 32.7863 38.7463 32.9798L38.7531 32.9831L38.7598 32.9867C39.1651 33.2007 39.5164 33.2841 39.819 33.2841C40.115 33.2841 40.4679 33.1923 40.8874 32.9819C41.2716 32.7892 41.6685 32.511 42.1298 32.1878C42.1753 32.1559 42.2214 32.1236 42.2681 32.091C42.7864 31.712 43.3565 31.3106 43.9381 31.021L44.3838 31.9162C43.8843 32.1649 43.3732 32.5216 42.8541 32.9013L42.8455 32.9076C42.796 32.9422 42.7462 32.977 42.6963 33.012C42.2495 33.3255 41.7899 33.6479 41.3358 33.8757C40.8273 34.1308 40.3185 34.2841 39.819 34.2841C39.3282 34.2841 38.82 34.1481 38.2995 33.8745C37.8325 33.6447 37.3699 33.3202 36.9223 33.0061C36.8752 32.9731 36.8282 32.9402 36.7815 32.9075L36.7791 32.9058L36.7372 32.8762C36.2243 32.513 35.7407 32.1707 35.2541 31.9285L35.2516 31.9272C34.6842 31.6407 34.1925 31.5123 33.7203 31.5123C33.2481 31.5123 32.7564 31.6407 32.189 31.9272L32.1865 31.9285C31.6864 32.1774 31.1754 32.5343 30.6657 32.9029L30.6592 32.9075C30.6097 32.9422 30.5599 32.977 30.51 33.012C30.0632 33.3255 29.6037 33.6479 29.1495 33.8757C28.6422 34.1302 28.1442 34.2841 27.6327 34.2841C27.1299 34.2841 26.6325 34.1476 26.1132 33.8745C25.6172 33.6304 25.129 33.2813 24.6629 32.9481C24.6429 32.9337 24.6229 32.9194 24.6029 32.9051L24.602 32.9045L24.562 32.8762C24.049 32.513 23.5654 32.1707 23.0789 31.9285L23.0764 31.9272C22.509 31.6407 22.0173 31.5123 21.5451 31.5123C21.0728 31.5123 20.5812 31.6407 20.0138 31.9272L20.0112 31.9285C19.5112 32.1774 19.0001 32.5343 18.4904 32.9029L18.484 32.9075C18.4372 32.9402 18.3902 32.9731 18.3431 33.0062C17.894 33.3212 17.4298 33.6469 16.9612 33.8768C16.4546 34.1306 15.9572 34.2841 15.4464 34.2841C14.9436 34.2841 14.4462 34.1476 13.927 33.8745C13.4134 33.6218 12.9094 33.2573 12.4167 32.901L12.4044 32.8921C12.391 32.8826 12.3776 32.8731 12.3642 32.8636C11.8514 32.5006 11.368 32.1583 10.8816 31.9162L10.8791 31.9149C10.3116 31.6284 9.81999 31.5 9.34775 31.5C8.87551 31.5 8.38384 31.6284 7.81643 31.9149L7.81391 31.9162C7.43504 32.1048 7.04989 32.3554 6.66378 32.6261L6.76377 32.7954C7.11701 32.5509 7.47562 32.3148 7.83091 32.1365C8.33942 31.8815 8.84825 31.7282 9.34775 31.7282C9.83852 31.7282 10.3468 31.8641 10.8672 32.1378C11.3632 32.3818 11.8515 32.731 12.3175 33.0642C12.3376 33.0785 12.3576 33.0928 12.3775 33.1071C12.3912 33.1168 12.4048 33.1264 12.4184 33.1361C12.9314 33.4992 13.415 33.8416 13.9015 34.0838L13.9041 34.0851C14.4715 34.3716 14.9631 34.5 15.4354 34.5C15.9076 34.5 16.3993 34.3716 16.9667 34.0851L16.9692 34.0838C17.4693 33.8348 17.9803 33.478 18.49 33.1094L18.4965 33.1047C18.5433 33.072 18.5902 33.0391 18.6374 33.0061C19.0865 32.691 19.5507 32.3654 20.0193 32.1355C20.5271 31.881 21.0352 31.7282 21.534 31.7282C22.0278 31.7282 22.5247 31.8658 23.0513 32.1367C23.5191 32.3666 23.9824 32.6916 24.4307 33.0061C24.4778 33.0391 24.5248 33.0721 24.5715 33.1048L24.5739 33.1064L24.6158 33.1361C25.1288 33.4992 25.6123 33.8416 26.0989 34.0838L26.1014 34.0851C26.6683 34.3713 27.1628 34.5 27.6368 34.5C28.1107 34.5 28.6019 34.3715 29.1624 34.0859L29.1665 34.0838C29.6666 33.8348 30.1777 33.478 30.6873 33.1094L30.6938 33.1047C30.7433 33.0701 30.7931 33.0353 30.843 33.0003C31.2898 32.6868 31.7493 32.3644 32.2035 32.1365C32.7108 31.8821 33.2088 31.7282 33.7203 31.7282C34.2261 31.7282 34.7121 31.8664 35.2376 32.1367C35.7054 32.3666 36.1687 32.6916 36.617 33.0061C36.6641 33.0392 36.7111 33.0721 36.7578 33.1048L36.7602 33.1064L36.8021 33.1361C37.315 33.4992 37.7986 33.8416 38.2851 34.0838L38.2877 34.0851C38.8546 34.3713 39.3491 34.5 39.8231 34.5C40.2969 34.5 40.7882 34.3715 41.3487 34.0859L41.3528 34.0838C41.8539 33.8343 42.3642 33.4778 42.8888 33.1064L42.8912 33.1048C42.9407 33.0701 42.9904 33.0353 43.0403 33.0003C43.4871 32.6868 43.9467 32.3643 44.4008 32.1365C44.9093 31.8815 45.4181 31.7282 45.9176 31.7282C46.4093 31.7282 46.9186 31.8646 47.44 32.1393C47.7077 32.2753 47.972 32.4364 48.2344 32.6084L48.3312 32.4463C48.0367 32.2483 47.7469 32.0704 47.4621 31.9283L47.46 31.9272C46.8926 31.6407 46.4009 31.5123 45.9287 31.5123C45.4565 31.5123 44.9648 31.6407 44.3974 31.9272L43.9466 31.0345C44.6166 30.6962 45.263 30.5123 45.9287 30.5123C46.5941 30.5123 47.2401 30.696 47.9097 31.034C48.387 31.2723 48.854 31.5844 49.2898 31.8941L49.6662 32.1617L48.548 34.033L48.1087 33.7302C47.7 33.4485 47.3378 33.2087 46.9842 33.0294L46.9768 33.0257C46.5715 32.8117 46.2202 32.7282 45.9176 32.7282C45.6217 32.7282 45.2687 32.8199 44.8492 33.0304C44.465 33.2231 44.0681 33.5012 43.6068 33.8245C43.5603 33.8571 43.5131 33.8901 43.4652 33.9236C42.9522 34.2867 42.381 34.6887 41.8006 34.978C41.1354 35.3165 40.4894 35.5 39.8231 35.5C39.1569 35.5 38.5083 35.3165 37.8382 34.9784C37.2812 34.7009 36.7415 34.3186 36.2498 33.9703C36.2276 33.9546 36.2056 33.939 36.1836 33.9235C36.1395 33.8926 36.096 33.8622 36.0531 33.8321C35.5873 33.5058 35.1879 33.226 34.793 33.0325L34.7837 33.0279C34.3608 32.8098 34.0307 32.7282 33.7203 32.7282C33.4142 32.7282 33.0726 32.8193 32.6518 33.0304C32.2677 33.2231 31.8708 33.5012 31.4095 33.8244C31.3637 33.8565 31.3173 33.8891 31.2701 33.922C30.7648 34.2875 30.195 34.6886 29.6143 34.978C28.9492 35.3165 28.3031 35.5 27.6368 35.5C26.9706 35.5 26.322 35.3165 25.6519 34.9784C25.0949 34.7009 24.5552 34.3186 24.0635 33.9703C24.0413 33.9546 24.0193 33.939 23.9973 33.9235C23.9532 33.8926 23.9097 33.8621 23.8667 33.8321C23.401 33.5058 23.0016 33.226 22.6067 33.0325L22.5974 33.0279C22.1756 32.8104 21.8343 32.7282 21.534 32.7282C21.2381 32.7282 20.8851 32.8199 20.4656 33.0304L20.4614 33.0325C20.0665 33.226 19.6671 33.5058 19.2013 33.8321C19.159 33.8617 19.1162 33.8917 19.0727 33.9221C18.5672 34.2876 17.9972 34.6889 17.4162 34.9783C16.7466 35.3162 16.1007 35.5 15.4354 35.5C14.77 35.5 14.1241 35.3163 13.4546 34.9784C12.8976 34.7009 12.3579 34.3186 11.8662 33.9703C11.8436 33.9544 11.8212 33.9385 11.7989 33.9227L11.797 33.9214L11.7698 33.9019C11.2734 33.5472 10.8428 33.2394 10.4204 33.0325L10.4136 33.0291L10.4069 33.0256C10.0016 32.8116 9.65036 32.7282 9.34775 32.7282C9.05177 32.7282 8.69885 32.8199 8.27929 33.0304C7.89508 33.2231 7.49817 33.5013 7.03687 33.8245C6.99001 33.8573 6.94249 33.8906 6.89424 33.9244L6.45174 34.2337L5.33789 32.3473L5.70712 32.0803C6.21349 31.7141 6.78473 31.3117 7.36696 31.0216C8.03651 30.6837 8.68243 30.5 9.34775 30.5C10.0131 30.5 10.659 30.6837 11.3285 31.0216Z"
+        fill="currentColor"
+      />
+      <path
+        d="M23 31.6841V26.1399C23 25.8856 22.9665 25.6314 22.8883 25.4103C22.8212 25.2002 22.6425 25.0455 22.4302 25.0123C22.2179 24.9681 21.9944 25.0455 21.8492 25.2002L15 32.7614C15.3017 32.7172 15.6023 34 15.6023 34L21.7821 27.0795V31.5182C22.1844 31.5072 22.5754 31.5625 22.9888 31.6841H23Z"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M22.52 24.5205C22.9157 24.5871 23.2383 24.8727 23.3621 25.2503C23.4624 25.5371 23.5001 25.8481 23.5001 26.14V32.1841H22.9169L22.8478 32.1638C22.4792 32.0554 22.1405 32.0087 21.796 32.0182L21.2822 32.0323V28.3902L15.335 35.0503L15.1156 34.1144L15.1151 34.1123L15.113 34.1035L15.104 34.0671C15.096 34.0351 15.084 33.9888 15.0686 33.933C15.0376 33.8204 14.9944 33.6744 14.9436 33.5328C14.9094 33.4372 14.8757 33.3547 14.8446 33.2897L13.6943 33.4583L21.4846 24.8581C21.7397 24.5863 22.1317 24.4442 22.52 24.5205ZM15.8146 33.0117L22.2822 25.769V31.0364C22.3549 31.0435 22.4275 31.0525 22.5001 31.0635V26.14C22.5001 25.9256 22.4713 25.7307 22.417 25.5771L22.4144 25.5698L22.412 25.5624C22.401 25.528 22.3734 25.5096 22.3531 25.5064L22.3406 25.5045L22.3283 25.5019C22.2965 25.4953 22.2484 25.5072 22.2157 25.5405L15.689 32.7458C15.7357 32.8304 15.7776 32.9218 15.8146 33.0117Z"
+        fill="currentColor"
+      />
+      <path
+        d="M35.1699 25.1939C35.0194 25.0375 34.7761 24.9646 34.5444 25.0167C34.3128 25.0688 34.139 25.2251 34.0811 25.4232C34.0232 25.6108 34 25.8088 34 26.0173V31.0096C34.417 31.0096 34.834 31.0826 35.2626 31.2181V27.0074L41.2277 32.802C41.61 32.927 41.969 33 42.305 33C42.5366 33 42.7683 32.9687 43 32.9166L35.1584 25.2043L35.1699 25.1939Z"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M34.4347 24.5288C34.8285 24.4402 35.2524 24.5587 35.5301 24.8469L35.8887 25.2192L35.8876 25.2202L44.0044 33.2031L43.1097 33.4044C42.8506 33.4627 42.5814 33.4999 42.305 33.4999C41.8988 33.4999 41.4848 33.4121 41.0722 33.2771L40.9623 33.2411L35.7626 28.1901V31.9005L35.1119 31.6948C34.7234 31.5719 34.3575 31.5096 34 31.5096H33.5V26.0172C33.5 25.7733 33.5269 25.5245 33.6024 25.2788C33.7187 24.8866 34.0503 24.6153 34.4347 24.5288ZM34.7557 25.5095C34.7273 25.5001 34.6917 25.496 34.6542 25.5044C34.5765 25.5219 34.5615 25.5618 34.561 25.5635L34.5589 25.5706C34.5192 25.6991 34.5 25.8452 34.5 26.0172V30.5397C34.5877 30.5502 34.6752 30.5634 34.7626 30.5791V25.8245L41.491 32.3606C41.6002 32.3936 41.7045 32.4207 41.8044 32.442L34.7557 25.5095Z"
+        fill="currentColor"
+      />
+      <path
+        d="M11.4255 32.2105L21.2166 19.9737C21.5784 19.5325 22.0719 19.2539 22.5434 19.2307C22.5544 19.2307 22.5763 19.2307 22.5872 19.2307H33.8269C33.8269 19.2307 33.8708 19.2307 33.8927 19.2423C34.3532 19.2887 34.7919 19.5557 35.1537 19.9853L44.7609 31.9899C44.8157 32.0596 44.8706 32.1293 44.9144 32.2105C45.1337 32.0712 45.3531 31.9435 45.5833 31.839C45.7259 31.7693 45.8574 31.7113 46 31.6649C45.9013 31.4907 45.7917 31.3282 45.6711 31.1772L36.0639 19.1726C35.5485 18.5457 34.8796 18.1509 34.1778 18.0348C34.112 18.0116 34.0462 18 33.9695 18H22.5105C22.5105 18 22.4228 18 22.3789 18.0116C21.6113 18.0929 20.8766 18.4993 20.3174 19.1842L10.5263 31.421C10.2961 31.6997 10.1206 32.0015 10 32.3266C10.3509 32.5356 11.4255 32.2105 11.4255 32.2105Z"
+        fill="currentColor"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M22.5108 17.5H33.9698C34.0853 17.5 34.193 17.5159 34.2987 17.5482C35.1167 17.6939 35.8751 18.1552 36.4505 18.8551L36.4546 18.8602L46.0618 30.8648C46.1995 31.0372 46.3241 31.222 46.4354 31.4183L46.7371 31.9507L46.1552 32.1403C46.0438 32.1766 45.9355 32.2236 45.8032 32.2882L45.7968 32.2914L45.7903 32.2943C45.5899 32.3852 45.3926 32.4993 45.1829 32.6326L44.7298 32.9204L44.4748 32.448C44.4547 32.4109 44.4273 32.3741 44.3697 32.3009C44.3693 32.3003 44.3688 32.2998 44.3684 32.2992L34.7678 20.3028C34.4659 19.9462 34.1389 19.7696 33.8429 19.7398L33.7527 19.7307H22.5583C22.2614 19.7493 21.8957 19.9357 21.6053 20.2886L11.7193 32.6441L11.5706 32.6891L11.4259 32.2105C11.5706 32.6891 11.5707 32.6891 11.5706 32.6891L11.5689 32.6896L11.5655 32.6906L11.5542 32.6939L11.5147 32.7053C11.4813 32.7147 11.4341 32.7277 11.3766 32.7424C11.2623 32.7717 11.104 32.8089 10.9316 32.8393C10.7618 32.8693 10.564 32.8952 10.3748 32.8966C10.2059 32.8978 9.95562 32.8819 9.74452 32.7562L9.38672 32.5431L9.53159 32.1527C9.67206 31.7741 9.87552 31.4248 10.1387 31.1056L19.9304 18.868C20.5584 18.0988 21.399 17.6201 22.3005 17.5173C22.36 17.5062 22.4137 17.5033 22.435 17.5022C22.4555 17.5011 22.4734 17.5006 22.4862 17.5003L22.5024 17.5L22.5076 17.5L22.5095 17.5L22.5108 17.5ZM11.1368 31.7715L20.8303 19.6566C21.2598 19.1329 21.8756 18.763 22.5192 18.7313L22.5314 18.7307H33.8273V19.2307C33.8274 18.7307 33.8272 18.7307 33.8273 18.7307L33.8285 18.7307L33.8296 18.7307L33.8322 18.7307L33.8384 18.7308L33.8549 18.7313C33.8672 18.7318 33.8845 18.7328 33.9047 18.7349L33.9066 18.7351C33.9187 18.7364 33.9524 18.7399 33.9963 18.7509C34.5982 18.8281 35.1277 19.1779 35.5365 19.6632L35.5446 19.6728L45.0487 31.5489C45.1133 31.5134 45.179 31.4789 45.246 31.4458L35.678 19.4901C35.6773 19.4893 35.6766 19.4885 35.676 19.4877C35.23 18.9462 34.6664 18.6224 34.0965 18.5281L34.0532 18.521L34.0118 18.5063C34.0006 18.5024 33.9911 18.5 33.9698 18.5H22.5118L22.5067 18.5001C22.5017 18.5002 22.495 18.5004 22.488 18.5008C22.4868 18.5008 22.4857 18.5009 22.4847 18.5009L22.4701 18.5048L22.4319 18.5088C21.8088 18.5748 21.1908 18.9064 20.7066 19.4986L10.9122 31.7396C10.8846 31.773 10.8579 31.8067 10.8322 31.8407C10.9442 31.8189 11.0478 31.7943 11.1284 31.7737C11.1312 31.7729 11.134 31.7722 11.1368 31.7715ZM22.4731 18.5019C22.4731 18.5019 22.4738 18.5018 22.4753 18.5016L22.4731 18.5019Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default UrbanBeachPoolIcon;
diff --git a/client/src/components/icons/amenities/ViewingDeckWithSwingsIcon.tsx b/client/src/components/icons/amenities/ViewingDeckWithSwingsIcon.tsx
new file mode 100644
index 0000000..8ad8887
--- /dev/null
+++ b/client/src/components/icons/amenities/ViewingDeckWithSwingsIcon.tsx
@@ -0,0 +1,36 @@
+function ViewingDeckWithSwingsIcon() {
+  return (
+    <svg
+      viewBox="0 0 56 56"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M19.9379 35H10.127C9.58015 35 9.11746 34.5759 9.0754 34.0246L8.00283 20.1372C7.96077 19.5541 8.39192 19.0559 8.97027 19.0029C9.54863 18.9605 10.0534 19.3951 10.1059 19.9675L11.1049 32.8798H19.9485C20.5268 32.8798 21 33.3462 21 33.9293C21 34.5123 20.5268 34.9788 19.9485 34.9788"
+        fill="currentColor"
+      />
+      <path
+        d="M15 41C14.45 41 14 40.5367 14 39.9807V34.0193C14 33.453 14.45 33 15 33C15.55 33 16 33.4633 16 34.0193V39.9807C16 40.547 15.55 41 15 41Z"
+        fill="currentColor"
+      />
+      <path
+        d="M17.1658 26.7854H38.8342V24.2035H17.1658V26.7854ZM39.9171 29H16.0829C15.4873 29 15 28.4992 15 27.8983V23.1017C15 22.4897 15.4873 22 16.0829 22H39.9171C40.5127 22 41 22.5008 41 23.1017V27.8983C41 28.5103 40.5127 29 39.9171 29Z"
+        fill="currentColor"
+      />
+      <path
+        d="M28 41C27.45 41 27 40.5438 27 39.9964V28.0036C27 27.446 27.45 27 28 27C28.55 27 29 27.4562 29 28.0036V39.9964C29 40.554 28.55 41 28 41Z"
+        fill="currentColor"
+      />
+      <path
+        d="M45.8625 34.9788H36.0516C35.4732 34.9788 35 34.5018 35 33.9294C35 33.357 35.4732 32.88 36.0516 32.88H44.8951L45.8941 19.969C45.9361 19.386 46.4514 18.9514 47.0298 19.0044C47.6081 19.0468 48.0392 19.5556 47.9972 20.1386L46.9246 34.0248C46.8825 34.576 46.4199 35 45.873 35"
+        fill="currentColor"
+      />
+      <path
+        d="M42 41C41.45 41 41 40.5367 41 39.9807V34.0193C41 33.453 41.45 33 42 33C42.55 33 43 33.4633 43 34.0193V39.9807C43 40.547 42.55 41 42 41Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
+
+export default ViewingDeckWithSwingsIcon;
diff --git a/client/src/components/icons/activities/WellnessFeaturesIcon.tsx b/client/src/components/icons/amenities/WellnessFeaturesIcon.tsx
similarity index 100%
rename from client/src/components/icons/activities/WellnessFeaturesIcon.tsx
rename to client/src/components/icons/amenities/WellnessFeaturesIcon.tsx
diff --git a/client/src/components/icons/amenities/YogaLoungeIcon.tsx b/client/src/components/icons/amenities/YogaLoungeIcon.tsx
new file mode 100644
index 0000000..da50e8f
--- /dev/null
+++ b/client/src/components/icons/amenities/YogaLoungeIcon.tsx
@@ -0,0 +1,15 @@
+function YogaLoungeIcon() {
+  return (
+    <svg viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M23.392 27.8458C22.9964 31.015 22.3122 32.9718 21.0934 34.3969C19.9066 35.7795 18.1532 36.7153 15.2345 37.513C14.6999 37.6619 14.144 37.5555 13.6949 37.2258C13.2566 36.8962 13 36.3963 13 35.8433C13 34.9499 13.6522 34.2055 14.561 34.0673C18.0677 33.5568 19.7463 30.462 19.8211 27.7926C19.8639 26.2293 20.3343 24.9318 21.2217 23.9321C22.5688 22.422 24.814 21.635 27.9145 21.6031H28.0855C31.186 21.635 33.4419 22.422 34.7783 23.9321C35.6657 24.9318 36.1362 26.2293 36.1789 27.7926C36.2538 30.4513 37.9323 33.5568 41.4391 34.0673C42.3478 34.1949 43 34.9499 43 35.8433C43 36.3963 42.7434 36.8962 42.3051 37.2258C41.995 37.4598 41.6208 37.5768 41.2466 37.5768C41.0863 37.5768 40.9259 37.5555 40.7655 37.513C37.8468 36.7047 36.0934 35.7795 34.9067 34.3969C33.6771 32.9718 32.9929 31.015 32.608 27.8458M26.995 43.7344L21.4141 44.9574C21.2644 44.9894 21.1041 45 20.9544 45C19.928 45 18.9979 44.2875 18.784 43.2665C18.752 43.1176 18.7413 42.9687 18.7413 42.8198C18.7413 42.5646 18.784 42.2987 18.8803 42.0647M28.7377 38.9912L37.2267 37.2365C38.4241 36.9918 39.6108 37.7469 39.8567 38.9274C39.8888 39.0763 39.8995 39.2252 39.8995 39.3741C39.8995 40.4057 39.1511 41.299 38.1354 41.5117M23.4027 27.8032V36.6834M32.608 37.3003V27.8032M34.9815 45C34.8318 45 34.6714 44.9894 34.5217 44.9574L17.8005 41.5117C17.2231 41.3947 16.7206 41.0544 16.3999 40.5652C16.0791 40.076 15.9615 39.4911 16.0898 38.9168C16.3357 37.7363 17.5225 36.9812 18.7199 37.2258L35.4412 40.6716C36.6387 40.9162 37.4084 42.086 37.1625 43.2558C37.0449 43.8301 36.7028 44.3194 36.2003 44.6384C35.8368 44.8724 35.4198 45 34.9922 45H34.9815ZM27.9786 11C25.5196 11 23.5096 12.9675 23.5096 15.4029C23.5096 17.8383 25.5196 19.8058 27.9786 19.8058C30.4376 19.8058 32.4476 17.8383 32.4476 15.4029C32.4476 12.9675 30.4376 11 27.9786 11Z"
+        stroke="currentColor"
+        strokeWidth={1.77}
+        strokeLinecap="square"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+export default YogaLoungeIcon;
diff --git a/client/src/components/masterplanPage/map/Marker.tsx b/client/src/components/masterplanPage/map/Marker.tsx
index 1485f7b..fbe8f80 100644
--- a/client/src/components/masterplanPage/map/Marker.tsx
+++ b/client/src/components/masterplanPage/map/Marker.tsx
@@ -4,7 +4,6 @@ import { useTransformEffect } from "react-zoom-pan-pinch";
 import { markers } from "../../../consts/markers";
 import useMarker from "../../../store/useMarker";
 import { useNavigate } from "react-router-dom";
-import { isMobile } from "react-device-detect";
 
 const Marker = (props: MarkerComponentProps) => {
   const { setHoveredMarker, hoveredMarker } = useMarker();
@@ -26,7 +25,7 @@ const Marker = (props: MarkerComponentProps) => {
   const handleOnClick = () => {
     if (!currentMarker || currentMarker?.isDisabled) return;
     navigate(
-      `../masterplan/${currentMarker?.itemNumber}${isMobile ? "/wing" : ""}`
+      `../masterplan/${currentMarker?.itemNumber}`
     );
     setHoveredMarker(null);
   };
diff --git a/client/src/components/masterplanPage/map/ZoomControlls.tsx b/client/src/components/masterplanPage/map/ZoomControlls.tsx
index 28012be..e3d524d 100644
--- a/client/src/components/masterplanPage/map/ZoomControlls.tsx
+++ b/client/src/components/masterplanPage/map/ZoomControlls.tsx
@@ -1,7 +1,7 @@
 import { useControls } from "react-zoom-pan-pinch";
-import Button from "../../Button";
 import UnzoomIcon from "../../icons/UnzoomIcon";
 import ZoomIcon from "../../icons/ZoomIcon";
+import Button3 from "../../Button3";
 
 const ZoomControlls = () => {
   const { zoomIn, zoomOut } = useControls();
@@ -15,16 +15,18 @@ const ZoomControlls = () => {
 
   return (
     <div className="absolute z-50 flex flex-col gap-2 top-1/2 right-4 -translate-y-[50%]">
-      <Button
-        buttonType="primary"
+      <Button3
+        variant="secondary"
         icon={<ZoomIcon />}
-        isCircleRounded
+        onlyIcon
+        roundedFull
         onClick={handleOnZoomClick}
       />
-      <Button
-        buttonType="primary"
+      <Button3
+        variant="secondary"
         icon={<UnzoomIcon />}
-        isCircleRounded
+        onlyIcon
+        roundedFull
         onClick={handleOnUnzoomClick}
       />
     </div>
diff --git a/client/src/components/modals/AboutComplexModal.tsx b/client/src/components/modals/AboutComplexModal.tsx
index 72e9559..99a30f2 100644
--- a/client/src/components/modals/AboutComplexModal.tsx
+++ b/client/src/components/modals/AboutComplexModal.tsx
@@ -3,14 +3,14 @@ import { useNavigate } from "react-router-dom";
 import { apartmentLayouts } from "../../consts/apartmentsLayout";
 import useModal from "../../store/useModal";
 import { ISwitchLabel } from "../../types/switchLabel";
-import Button from "../Button";
 import SwitchToggle from "../SwitchToggle";
 import HeartIcon from "../icons/Heart";
 import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
 import { IAparmentRes } from "../../types/apartmentsRes";
 import { apartmentsWithoutVirtualTour } from "../../consts/apartmentsWithoutVirtualTour";
 import { apartmentLayoutImages } from "../../consts/apartmentLayoutsImages";
-import useFavorites from "../../store/useFavorites";
+// import useFavorites from "../../store/useFavorites";
+import Button3 from "../Button3";
 
 interface AboutComplexModalProps {
   apartment: IAparmentRes;
@@ -30,7 +30,7 @@ const AboutComplexModal = ({
     (aprt) => aprt.type === apartment.Unit_Type || aprt.type === apartmentType
   );
   const [isFavorite, setIsFavorite] = useState(false);
-  const { setFavorites } = useFavorites();
+  // const { setFavorites } = useFavorites();
 
   const apartmentLayoutImage = apartmentLayoutImages[apartmentType];
 
@@ -56,37 +56,37 @@ const AboutComplexModal = ({
     navigate(`../virtual-tour/${apartment.id}`);
   };
 
-  const handleOnFavoriteClick = (
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent>
-  ) => {
-    e.stopPropagation();
-    const favorites = localStorage.getItem("Favorites");
+  // const handleOnFavoriteClick = (
+  //   e: React.MouseEvent<HTMLButtonElement, MouseEvent>
+  // ) => {
+  //   e.stopPropagation();
+  //   const favorites = localStorage.getItem("Favorites");
 
-    if (!favorites) {
-      setIsFavorite(true);
-      const updatedFavorites = JSON.stringify([apartment]);
+  //   if (!favorites) {
+  //     setIsFavorite(true);
+  //     const updatedFavorites = JSON.stringify([apartment]);
 
-      localStorage.setItem("Favorites", updatedFavorites);
-    } else {
-      const _favorites = JSON.parse(favorites) as IAparmentRes[];
+  //     localStorage.setItem("Favorites", updatedFavorites);
+  //   } else {
+  //     const _favorites = JSON.parse(favorites) as IAparmentRes[];
 
-      if (_favorites.some((apart) => apart.id === apartment.id)) {
-        setIsFavorite(false);
-        const updatedFavorites = [..._favorites].filter(
-          (apart) => apart.id !== apartment.id
-        );
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        setFavorites(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      } else {
-        setIsFavorite(true);
-        const updatedFavorites = [..._favorites, apartment];
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      }
-    }
-  };
+  //     if (_favorites.some((apart) => apart.id === apartment.id)) {
+  //       setIsFavorite(false);
+  //       const updatedFavorites = [..._favorites].filter(
+  //         (apart) => apart.id !== apartment.id
+  //       );
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       setFavorites(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     } else {
+  //       setIsFavorite(true);
+  //       const updatedFavorites = [..._favorites, apartment];
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     }
+  //   }
+  // };
 
   useEffect(() => {
     const favorites = localStorage.getItem("Favorites");
@@ -101,13 +101,13 @@ const AboutComplexModal = ({
   return (
     <div className="absolute z-[99999998] top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] grid grid-cols-12 items-center">
       <div className="col-span-9 col-start-4 bg-[#F3F3F2] grid grid-cols-9 gap-4 max-h-screen px-6">
-        <div className="flex flex-col col-span-6 max-h-screen h-screen py-6">
+        <div className="flex flex-col h-screen max-h-screen col-span-6 py-6">
           {/* Button pannel */}
-          <div className="flex justify-between w-full gap-4 items-center pb-3">
-            <div className="flex gap-4 items-center ">
-              <Button
+          <div className="flex items-center justify-between w-full gap-4 pb-3">
+            <div className="flex items-center gap-4 ">
+              <Button3
                 icon={<LeftArrowSliderIcon />}
-                buttonType="cta"
+                onlyIcon
                 onClick={handleOnBackClick}
               />
               <div className="flex flex-col">
@@ -119,15 +119,14 @@ const AboutComplexModal = ({
                 </h2>
               </div>
             </div>
-            <Button
-              buttonType="favorite"
+            <Button3
               icon={<HeartIcon isFilled={isFavorite} />}
-              isCircleRounded
-              onClick={handleOnFavoriteClick}
+              roundedFull
+              // onClick={handleOnFavoriteClick}
             />
           </div>
           {/* Layout */}
-          <div className="p-10 rounded-2xl bg-white flex flex-col items-center gap-8 relative justify-center h-full">
+          <div className="relative flex flex-col items-center justify-center h-full gap-8 p-10 bg-white rounded-2xl">
             <div className="flex justify-center h-full">
               <img
                 className="object-cover h-full"
@@ -149,20 +148,20 @@ const AboutComplexModal = ({
           </div>
         </div>
         {/* Sidebar */}
-        <div className="col-span-3 rounded-lg h-screen py-6">
-          <div className="flex lg:flex-col gap-2 h-full">
-            <div className="rounded-2xl overflow-clip lg:flex-1 flex-none relative">
+        <div className="h-screen col-span-3 py-6 rounded-lg">
+          <div className="flex h-full gap-2 lg:flex-col">
+            <div className="relative flex-none rounded-2xl overflow-clip lg:flex-1">
               <p className="absolute top-[30px] left-6 font-semibold text-m text-white">
                 View from window
               </p>
               <img
                 src="/images/view_from_window.png"
                 alt=""
-                className="w-full h-full object-cover"
+                className="object-cover w-full h-full"
               />
             </div>
-            <div className="flex gap-2 flex-col flex-1 lg:flex-none">
-              <div className="flex flex-col rounded-2xl bg-white p-6 gap-6 ">
+            <div className="flex flex-col flex-1 gap-2 lg:flex-none">
+              <div className="flex flex-col gap-6 p-6 bg-white rounded-2xl ">
                 <h2 className="font-semibold text-[#0D1922] text-subheadline-s">
                   Parameters
                 </h2>
@@ -191,24 +190,23 @@ const AboutComplexModal = ({
                   </div>
                 </div>
               </div>
-              <div className="rounded-2xl bg-white flex flex-col p-6 gap-4 flex-1 lg:flex-none justify-between">
+              <div className="flex flex-col justify-between flex-1 gap-4 p-6 bg-white rounded-2xl lg:flex-none">
                 <p className="text-[#00BED7] font-semibold text-subheadline-s leading-7">
                   Unavailable
                   {/* AED {formatNumber(1668888, ",", 3, 1)} */}
                 </p>
                 <div className="flex gap-2">
-                  <Button
-                    onClick={handleOn3DTourClick}
-                    text="3D Tour"
-                    buttonType="secondary"
-                    className="w-full flex justify-center"
+                  <Button3
+                    variant="secondary"
+                    className="flex justify-center w-full"
                     disabled={!isVirtualTourAvailialbe}
-                  />
-                  <Button
-                    text="Send Enquiry"
-                    buttonType="cta"
-                    className="w-full flex justify-center"
-                  />
+                    onClick={handleOn3DTourClick}
+                  >
+                    3D Tour
+                  </Button3>
+                  <Button3 className="flex justify-center w-full">
+                    Send Enquiry
+                  </Button3>
                 </div>
               </div>
             </div>
diff --git a/client/src/components/modals/HelpModal.tsx b/client/src/components/modals/HelpModal.tsx
index 92f4fe4..724bc87 100644
--- a/client/src/components/modals/HelpModal.tsx
+++ b/client/src/components/modals/HelpModal.tsx
@@ -1,5 +1,5 @@
 import useModal from "../../store/useModal";
-import Button from "../Button";
+import Button3 from "../Button3";
 import CrossIcon from "../icons/CrossIcon";
 import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
 import RightArrowSliderIcon from "../icons/RightArrowSliderIcon";
@@ -14,14 +14,14 @@ const HelpModal = () => {
       <div className="h-full col-span-3 col-start-10 bg-[#F3F3F2] py-6 px-6 flex flex-col justify-between items-center">
         <div className="flex flex-col gap-8">
           <div className="flex justify-between pb-4 border-b border-[#E2E2DC]">
-            <h2 className="text-subheadline-m font-semibold">
+            <h2 className="font-semibold text-subheadline-m">
               Tips for working
             </h2>
-            <Button
+            <Button3
               icon={<CrossIcon />}
-              buttonType="fab"
+              onlyIcon
+              roundedFull
               onClick={handleOnCloseClick}
-              isCircleRounded
             />
           </div>
           <img
@@ -30,7 +30,7 @@ const HelpModal = () => {
             className="rounded-2xl"
           />
           <div className="flex flex-col gap-2 text-[#0D1922]">
-            <h2 className="text-subheadline-m font-semibold">1. Workspace</h2>
+            <h2 className="font-semibold text-subheadline-m">1. Workspace</h2>
             <p className="text-m">
               For more comfortable work with the general plan, size it to the
               full screen.
@@ -38,9 +38,9 @@ const HelpModal = () => {
           </div>
         </div>
         <div className="flex gap-8">
-          <Button
+          <Button3
             icon={<LeftArrowSliderIcon />}
-            buttonType="fab"
+            onlyIcon
             className="text-black"
           />
           <div className="flex items-center gap-3">
@@ -50,9 +50,9 @@ const HelpModal = () => {
             <div className="bg-[#E2E2DC] rounded-full w-3 h-3"></div>
             <div className="bg-[#E2E2DC] rounded-full w-3 h-3"></div>
           </div>
-          <Button
+          <Button3
             icon={<RightArrowSliderIcon />}
-            buttonType="fab"
+            onlyIcon
             className="text-black"
           />
         </div>
diff --git a/client/src/components/modals/MasterplanFilters.tsx b/client/src/components/modals/MasterplanFilters.tsx
index 683994b..40a6a34 100644
--- a/client/src/components/modals/MasterplanFilters.tsx
+++ b/client/src/components/modals/MasterplanFilters.tsx
@@ -1,5 +1,4 @@
 import useModal from "../../store/useModal";
-import Button from "../Button";
 import CrossIcon from "../icons/CrossIcon";
 import ResetIcon from "../icons/ResetIcon";
 import Checkbox from "../Checkbox";
@@ -11,6 +10,7 @@ import {
   initialViewCheckboxes,
 } from "../../consts/initialMasterplanFilters";
 import useMasterplanFilters from "../../store/useMasterplanFilters";
+import Button3 from "../Button3";
 
 const MasterplanFilters = () => {
   const { setModal } = useModal();
@@ -75,17 +75,16 @@ const MasterplanFilters = () => {
   return (
     <div className="absolute z-[99999901] top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] items-center select-none">
       <div className="h-screen bg-[#F3F3F2] flex flex-col items-center justify-between w-[360px] overflow-y-scroll">
-        <div className="w-full py-6 px-6 flex flex-col items-center">
+        <div className="flex flex-col items-center w-full px-6 py-6">
           <div className="flex justify-between border-b border-[#E2E2DC] w-full pb-4">
-            <h2 className="text-subheadline-m font-semibold">Filters</h2>
-            <Button
+            <h2 className="font-semibold text-subheadline-m">Filters</h2>
+            <Button3
               icon={<CrossIcon />}
-              buttonType="fab"
-              isCircleRounded
+              roundedFull
               onClick={handleOnCloseClick}
             />
           </div>
-          <div className="flex flex-col pt-6 w-full">
+          <div className="flex flex-col w-full pt-6">
             <p className="text-[#0D1922] text-s pb-4">Apartment type</p>
             <div className="flex flex-col gap-2">
               {apartmentTypeCheckboxes.map((checkbox) => (
@@ -97,10 +96,10 @@ const MasterplanFilters = () => {
               ))}
             </div>
           </div>
-          <div className="flex flex-col pt-6 w-full gap-8">
+          <div className="flex flex-col w-full gap-8 pt-6">
             {multirangeSliders.map((slider) => (
               <div key={slider.id} className="flex flex-col gap-2">
-                <div className="flex justify-between items-center">
+                <div className="flex items-center justify-between">
                   <p className="text-[#0D1922] text-s ">{slider.title}</p>
                   <p className="text-[#73787C] text-s">{slider.unit}</p>
                 </div>
@@ -111,7 +110,7 @@ const MasterplanFilters = () => {
               </div>
             ))}
           </div>
-          <div className="flex flex-col pt-6 w-full">
+          <div className="flex flex-col w-full pt-6">
             <p className="text-[#0D1922] text-s pb-4">View</p>
             <div className="flex flex-col gap-2">
               {viewCheckboxes.map((checkbox) => (
@@ -125,13 +124,10 @@ const MasterplanFilters = () => {
           </div>
         </div>
 
-        <div className="w-full justify-items-end p-6 flex gap-2 justify-center bg-white rounded-se-2xl rounded-ss-2xl">
-          <Button
-            text="Reset"
-            buttonType="secondary"
-            icon={<ResetIcon />}
-            onClick={handleOnResetClick}
-          />
+        <div className="flex justify-center w-full gap-2 p-6 bg-white justify-items-end rounded-se-2xl rounded-ss-2xl">
+          <Button3 icon={<ResetIcon />} onClick={handleOnResetClick}>
+            Reset
+          </Button3>
           <div className="text-s text-[#0D1922] py-3 px-6 ">234 apartments</div>
         </div>
       </div>
diff --git a/client/src/components/modals/NavbarModal.tsx b/client/src/components/modals/NavbarModal.tsx
index e2f83dd..2514997 100644
--- a/client/src/components/modals/NavbarModal.tsx
+++ b/client/src/components/modals/NavbarModal.tsx
@@ -74,7 +74,7 @@ function NavbarModal() {
                 href="/files/marasi-drive/ROVE_AMENITIES_BROCHURE.pdf"
                 className="flex items-center justify-between px-3 py-2 text-xs font-semibold bg-white rounded-lg"
               >
-                <p>Rove Amenties Brochure</p>
+                <p>Rove Amenities Brochure</p>
                 <DownloadIcon />
               </a>
               <a
@@ -103,7 +103,7 @@ function NavbarModal() {
                 href="/files/downtown/ROVE_AMENITIES_BROCHURE.pdf"
                 className="flex items-center justify-between px-3 py-2 text-xs font-semibold bg-white rounded-lg"
               >
-                <p>Rove Amenties Brochure</p>
+                <p>Rove Amenities Brochure</p>
                 <DownloadIcon />
               </a>
               <a
diff --git a/client/src/components/modals/SendEnquryModal.tsx b/client/src/components/modals/SendEnquryModal.tsx
index a1c826e..c25fcaf 100644
--- a/client/src/components/modals/SendEnquryModal.tsx
+++ b/client/src/components/modals/SendEnquryModal.tsx
@@ -1,5 +1,5 @@
 import useModal from "../../store/useModal";
-import Button from "../Button";
+import Button3 from "../Button3";
 import CrossIcon from "../icons/CrossIcon";
 import MasterInput from "../MasterInput";
 import MasterSelector from "../MasterSelector";
@@ -22,22 +22,22 @@ const SendEnquiryModal = () => {
     <div className="absolute z-[99999998] top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] grid grid-cols-12 items-center">
       <div className="h-full col-span-3 col-start-10 bg-[#F3F3F2] py-6 px-6  overflow-y-scroll">
         <form
-          className="justify-between flex flex-col h-full"
+          className="flex flex-col justify-between h-full"
           onSubmit={handleOnSubmit}
         >
           <div className="flex flex-col w-full">
             <div className="flex justify-between pb-4 border-b border-[#E2E2DC] ">
-              <h2 className="text-subheadline-m font-semibold">
+              <h2 className="font-semibold text-subheadline-m">
                 Apartment purchase enquiry
               </h2>
-              <Button
-                buttonType="tertiary"
+              <Button3
+                variant="secondary"
                 icon={<CrossIcon />}
                 onClick={handleOnCloseClick}
               />
             </div>
             <div className="py-4 border-b">
-              <div className="rounded-lg bg-white p-4 flex flex-col gap-4">
+              <div className="flex flex-col gap-4 p-4 bg-white rounded-lg">
                 <div className="flex flex-col gap-1">
                   <p className="text-subheadline-s font-semibold text-[#0D1922]">
                     1 bedroom, 609 Sqft{" "}
@@ -51,17 +51,17 @@ const SendEnquiryModal = () => {
                 </div>
                 <div className="flex flex-col gap-1">
                   <p className="text-[#00BED7] text-s">1 bedroom, 609 Sqft </p>
-                  <div className="flex gap-1 flex-col">
+                  <div className="flex flex-col gap-1">
                     <div className="text-[#73787C] flex gap-2 items-center w-fit">
-                      <p className="text-caption-m font-semibold leading-4">
+                      <p className="font-semibold leading-4 text-caption-m">
                         East Wing
                       </p>
                       <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-                      <p className="text-caption-m font-semibold leading-4">
+                      <p className="font-semibold leading-4 text-caption-m">
                         Floor 11
                       </p>
                       <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-                      <p className="text-caption-m font-semibold leading-4">
+                      <p className="font-semibold leading-4 text-caption-m">
                         № 213
                       </p>
                     </div>
@@ -83,19 +83,16 @@ const SendEnquiryModal = () => {
             </div>
           </div>
           <div>
-            <div className="flex gap-4 border w-full">
-              <Button
+            <div className="flex w-full gap-4 border">
+              <Button3
+                className="justify-center w-full"
                 onClick={handleOnCloseClick}
-                text="Cancel"
-                buttonType="fab"
-                className="w-full justify-center"
-              />
-              <Button
-                type="submit"
-                text="Send"
-                buttonType="cta"
-                className="w-full justify-center"
-              />
+              >
+                Cancel
+              </Button3>
+              <Button3 type="submit" className="justify-center w-full">
+                Send
+              </Button3>
             </div>
             <p className="text-caption-m font-semibold text-[#0D192266] text-center pt-4">
               By clicking on the “Send” button, you accept the privacy policy
diff --git a/client/src/components/modals/SuccessSentEnquiry.tsx b/client/src/components/modals/SuccessSentEnquiry.tsx
index 91b9733..dc10db7 100644
--- a/client/src/components/modals/SuccessSentEnquiry.tsx
+++ b/client/src/components/modals/SuccessSentEnquiry.tsx
@@ -1,5 +1,5 @@
 import useModal from "../../store/useModal";
-import Button from "../Button";
+import Button3 from "../Button3";
 import Logo from "../Logo";
 import CrossIcon from "../icons/CrossIcon";
 
@@ -18,8 +18,8 @@ const SuccessSentEnquiry = () => {
               Thank you
               <br /> <p className="text-[#00BED7]">for your enquiry!</p>
             </h1>
-            <Button
-              buttonType="tertiary"
+            <Button3
+              variant="secondary"
               icon={<CrossIcon />}
               onClick={handleOnCloseClick}
             />
@@ -28,7 +28,7 @@ const SuccessSentEnquiry = () => {
             Our manager will call you back soon.
           </p>
         </div>
-        <div className="border-t flex justify-between">
+        <div className="flex justify-between border-t">
           <Logo className="pl-0" />
           <div className="flex text-[#0D1922B2] text-s gap-4 items-center">
             <a
diff --git a/client/src/components/modals/UnitModal.tsx b/client/src/components/modals/UnitModal.tsx
index b4ff260..c1099ac 100644
--- a/client/src/components/modals/UnitModal.tsx
+++ b/client/src/components/modals/UnitModal.tsx
@@ -1,7 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import useModal from "../../store/useModal";
 import IUnit from "../../types/IUnit";
-import Button from "../Button";
 import ArrowLeftIcon from "../icons/ArrowLeftIcon";
 import BookingIcon from "../icons/BookingIcon";
 import HeartIcon from "../icons/HeartIcon";
@@ -12,6 +11,7 @@ import { useEffect } from "react";
 import useFavoritesStore from "../../store/useFavoritesStore";
 import HeartFilledIcon from "../icons/HeartFilledIcon";
 import ShareIcon from "../icons/ShareIcon";
+import Button3 from "../Button3";
 
 interface Props {
   unit: IUnit;
@@ -185,9 +185,7 @@ function UnitModal({ unit, type }: Props) {
     if (!favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id)) {
       setFavoriteUnits([...favoriteUnits, unit]);
     } else {
-      setFavoriteUnits(
-        favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id)
-      );
+      setFavoriteUnits(favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id));
     }
   }
 
@@ -204,25 +202,16 @@ function UnitModal({ unit, type }: Props) {
   }, []);
 
   return (
-    <div
-      className={`fixed top-0 left-0 w-full overflow-y-scroll h-dvh pt-[56px] z-40 backdrop-blur select-none`}
-    >
+    <div className={`fixed top-0 left-0 w-full overflow-y-scroll h-dvh pt-[56px] z-40 backdrop-blur select-none`}>
       <div className="flex justify-end min-h-full">
         <div className="bg-[#F3F3F2] lg:p-6 p-4 max-w-[1240px] w-full sm:space-y-20 space-y-10">
           <div className="flex gap-2 sm:gap-4 max-lg:flex-col">
             <div className="left lg:max-w-[800px] w-full flex flex-col gap-4">
               <div className="flex justify-between gap-4">
                 <div className="flex items-center gap-4">
-                  <Button
-                    buttonType="cta"
-                    icon={<ArrowLeftIcon />}
-                    onClick={() => setModal(null)}
-                  />
+                  <Button3 icon={<ArrowLeftIcon />} onlyIcon onClick={() => setModal(null)} />
                   <p className="text-2xl font-[#0D1922] font-semibold">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.title
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.title}
                   </p>
                 </div>
                 <div className="flex gap-2">
@@ -242,9 +231,7 @@ function UnitModal({ unit, type }: Props) {
                     className="w-10 h-10 flex items-center justify-center border border-[#E2E2DC] rounded-full bg-[#FFFFFF] bg-opacity-80 hover:text-[#0D1922] hover:bg-opacity-100 hover:border-[#00BED7] transition-all"
                     onClick={() => addOrRemoveFromFavorites(unit)}
                   >
-                    {favoriteUnits.some(
-                      (favoriteUnit) => favoriteUnit.id === unit.id
-                    ) ? (
+                    {favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id) ? (
                       <HeartFilledIcon className="w-5 h-5" />
                     ) : (
                       <HeartIcon className="w-5 h-5" />
@@ -254,11 +241,7 @@ function UnitModal({ unit, type }: Props) {
               </div>
               <div className="flex flex-col items-center justify-center flex-1 gap-10 p-4 bg-white sm:p-10 rounded-2xl">
                 <div className="">
-                  <img
-                    src={getMainImage()}
-                    alt=""
-                    className="max-h-[580px] pointer-events-none"
-                  />
+                  <img src={getMainImage()} alt="" className="max-h-[580px] pointer-events-none" />
                 </div>
                 {/* <div className="bg-[#F3F3F2] rounded-lg flex">
                 <Button buttonType="cta" text="Layout" />
@@ -280,8 +263,7 @@ function UnitModal({ unit, type }: Props) {
                 <div
                   className="absolute top-0 left-0 flex items-end w-full h-full p-6 rounded-2xl"
                   style={{
-                    background:
-                      "linear-gradient(180deg, rgba(16, 41, 79, 0) 67.74%, rgba(16, 41, 79, 0.64) 100%)",
+                    background: "linear-gradient(180deg, rgba(16, 41, 79, 0) 67.74%, rgba(16, 41, 79, 0.64) 100%)",
                   }}
                 >
                   <div className="space-y-1 font-semibold text-white">
@@ -297,9 +279,7 @@ function UnitModal({ unit, type }: Props) {
                       {unit.unitName}, {unit.totalArea} Sqft
                     </p>
                     <div className="space-y-1">
-                      <p className="text-sm text-[#00BED7]">
-                        Rove Home Marasi Drive
-                      </p>
+                      <p className="text-sm text-[#00BED7]">Rove Home Marasi Drive</p>
                       <div className="flex items-center gap-2 sm:text-xs text-[10px] font-semibold">
                         <p>{unit.unitNo[0] === "E" ? "East" : "West"} Wing</p>
                         <div className="bg-[#E2E2DC] w-1 h-1 rounded-full"></div>
@@ -347,23 +327,23 @@ function UnitModal({ unit, type }: Props) {
                   </p>
                 </div>
                 <div className="flex gap-2 p-6 bg-white rounded-2xl">
-                  {unitTypes.find((unitType) => unitType.type === type)
-                    ?.tourAvailable && (
-                    <Button
-                      buttonType="secondary"
+                  {unitTypes.find((unitType) => unitType.type === type)?.tourAvailable && (
+                    <Button3
+                      variant="secondary"
                       icon={<VirtualTourIcon />}
-                      text="3D tour"
                       className="justify-center w-full text-sm"
                       onClick={handleClickTour}
-                    />
+                    >
+                      3D tour
+                    </Button3>
                   )}
-                  <Button
-                    buttonType="cta"
+                  <Button3
                     icon={<BookingIcon />}
-                    text="Send Enquiry"
-                    className="text-[13.6px] justify-center disabled:hover:bg-[#ECEDEE] w-full"
+                    className="text-[13.6px] justify-center w-full"
                     disabled
-                  />
+                  >
+                    Send Enquiry
+                  </Button3>
                 </div>
               </div>
             </div>
@@ -373,10 +353,7 @@ function UnitModal({ unit, type }: Props) {
               <div className="left lg:w-[376px] lg:min-w-[376px] space-y-6">
                 <div className="space-y-2">
                   <p className="sm:text-[40px] text-2xl text-[#0D1922] font-bold sm:leading-[54px]">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.title
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.title}
                   </p>
                   <p className="sm:text-xl text-[#00BED7] font-semibold leading-[18.4px]">
                     {unitTypes.find((unitType) => unitType.type === type)?.desc}
@@ -384,24 +361,16 @@ function UnitModal({ unit, type }: Props) {
                 </div>
                 <div className="sm:leading-[22px]">
                   <p className="space-y-2 max-sm:text-sm">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.texts[0]
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.texts[0]}
                   </p>
                   <p className="space-y-2 max-sm:text-sm">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.texts[1]
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.texts[1]}
                   </p>
                 </div>
               </div>
               <div className="space-y-1">
                 <p className="text-xs sm:text-sm">
-                  Up to{" "}
-                  {unitTypes.find((unitType) => unitType.type === type)?.sqft}{" "}
-                  Sqft
+                  Up to {unitTypes.find((unitType) => unitType.type === type)?.sqft} Sqft
                 </p>
                 <p className="text-xl text-[#00BED7] font-semibold">
                   {unit.unitPrice && (
@@ -419,10 +388,7 @@ function UnitModal({ unit, type }: Props) {
             </div>
             <div>
               <img
-                src={
-                  unitTypes.find((unitType) => unitType.type === type)
-                    ?.imageDesc
-                }
+                src={unitTypes.find((unitType) => unitType.type === type)?.imageDesc}
                 alt=""
                 className="lg:max-h-[644px] sm:h-full rounded-2xl pointer-events-none object-cover max-sm:aspect-square"
               />
diff --git a/client/src/components/modals/UnitModalForSearchPage.tsx b/client/src/components/modals/UnitModalForSearchPage.tsx
index 2f224bc..2d470fa 100644
--- a/client/src/components/modals/UnitModalForSearchPage.tsx
+++ b/client/src/components/modals/UnitModalForSearchPage.tsx
@@ -433,7 +433,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import useModal from "../../store/useModal";
 import IUnit from "../../types/IUnit";
-import Button from "../Button";
 import ArrowLeftIcon from "../icons/ArrowLeftIcon";
 import BookingIcon from "../icons/BookingIcon";
 import HeartIcon from "../icons/HeartIcon";
@@ -444,6 +443,7 @@ import { useEffect } from "react";
 import useFavoritesStore from "../../store/useFavoritesStore";
 import HeartFilledIcon from "../icons/HeartFilledIcon";
 import ShareIcon from "../icons/ShareIcon";
+import Button3 from "../Button3";
 
 interface Props {
   unit: IUnit;
@@ -617,9 +617,7 @@ function UnitModalForSearchPage({ unit, type }: Props) {
     if (!favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id)) {
       setFavoriteUnits([...favoriteUnits, unit]);
     } else {
-      setFavoriteUnits(
-        favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id)
-      );
+      setFavoriteUnits(favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id));
     }
   }
 
@@ -645,16 +643,9 @@ function UnitModalForSearchPage({ unit, type }: Props) {
             <div className="left lg:max-w-[800px] w-full flex flex-col gap-4">
               <div className="flex justify-between gap-4">
                 <div className="flex items-center gap-4">
-                  <Button
-                    buttonType="cta"
-                    icon={<ArrowLeftIcon />}
-                    onClick={() => setModal(null)}
-                  />
+                  <Button3 icon={<ArrowLeftIcon className="" />} onlyIcon onClick={() => setModal(null)} />
                   <p className="text-2xl font-[#0D1922] font-semibold">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.title
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.title}
                   </p>
                 </div>
                 <div className="flex gap-2">
@@ -674,9 +665,7 @@ function UnitModalForSearchPage({ unit, type }: Props) {
                     className="w-10 h-10 flex items-center justify-center border border-[#E2E2DC] rounded-full bg-[#FFFFFF] bg-opacity-80 hover:text-[#0D1922] hover:bg-opacity-100 hover:border-[#00BED7] transition-all"
                     onClick={() => addOrRemoveFromFavorites(unit)}
                   >
-                    {favoriteUnits.some(
-                      (favoriteUnit) => favoriteUnit.id === unit.id
-                    ) ? (
+                    {favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id) ? (
                       <HeartFilledIcon className="w-5 h-5" />
                     ) : (
                       <HeartIcon className="w-5 h-5" />
@@ -686,11 +675,7 @@ function UnitModalForSearchPage({ unit, type }: Props) {
               </div>
               <div className="flex flex-col items-center justify-center flex-1 gap-10 p-4 bg-white sm:p-10 rounded-2xl">
                 <div className="">
-                  <img
-                    src={getMainImage()}
-                    alt=""
-                    className="max-h-[580px] pointer-events-none"
-                  />
+                  <img src={getMainImage()} alt="" className="max-h-[580px] pointer-events-none" />
                 </div>
                 {/* <div className="bg-[#F3F3F2] rounded-lg flex">
                 <Button buttonType="cta" text="Layout" />
@@ -712,8 +697,7 @@ function UnitModalForSearchPage({ unit, type }: Props) {
                 <div
                   className="absolute top-0 left-0 flex items-end w-full h-full p-6 rounded-2xl"
                   style={{
-                    background:
-                      "linear-gradient(180deg, rgba(16, 41, 79, 0) 67.74%, rgba(16, 41, 79, 0.64) 100%)",
+                    background: "linear-gradient(180deg, rgba(16, 41, 79, 0) 67.74%, rgba(16, 41, 79, 0.64) 100%)",
                   }}
                 >
                   <div className="space-y-1 font-semibold text-white">
@@ -729,9 +713,7 @@ function UnitModalForSearchPage({ unit, type }: Props) {
                       {unit.unitName}, {unit.totalArea} Sqft
                     </p>
                     <div className="space-y-1">
-                      <p className="text-sm text-[#00BED7]">
-                        Rove Home Marasi Drive
-                      </p>
+                      <p className="text-sm text-[#00BED7]">Rove Home Marasi Drive</p>
                       <div className="flex items-center gap-2 sm:text-xs text-[10px] font-semibold">
                         <p>{unit.unitNo[0] === "E" ? "East" : "West"} Wing</p>
                         <div className="bg-[#E2E2DC] w-1 h-1 rounded-full"></div>
@@ -779,23 +761,24 @@ function UnitModalForSearchPage({ unit, type }: Props) {
                   </p>
                 </div>
                 <div className="flex gap-2 p-6 bg-white rounded-2xl">
-                  {unitTypes.find((unitType) => unitType.type === type)
-                    ?.tourAvailable && (
-                    <Button
-                      buttonType="secondary"
+                  {unitTypes.find((unitType) => unitType.type === type)?.tourAvailable && (
+                    <Button3
+                      variant="secondary"
                       icon={<VirtualTourIcon />}
-                      text="3D tour"
                       className="justify-center w-full text-sm"
                       onClick={handleClickTour}
-                    />
+                    >
+                      3D tour
+                    </Button3>
                   )}
-                  <Button
-                    buttonType="cta"
+                  <Button3
+                    variant="secondary"
                     icon={<BookingIcon />}
-                    text="Send Enquiry"
-                    className="text-[13.6px] justify-center disabled:hover:bg-[#ECEDEE] w-full"
+                    className="text-[13.6px] justify-center w-full"
                     disabled
-                  />
+                  >
+                    Send Enquiry
+                  </Button3>
                 </div>
               </div>
             </div>
@@ -805,10 +788,7 @@ function UnitModalForSearchPage({ unit, type }: Props) {
               <div className="left lg:w-[376px] lg:min-w-[376px] space-y-6">
                 <div className="space-y-2">
                   <p className="sm:text-[40px] text-2xl text-[#0D1922] font-bold sm:leading-[54px]">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.title
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.title}
                   </p>
                   <p className="sm:text-xl text-[#00BED7] font-semibold leading-[18.4px]">
                     {unitTypes.find((unitType) => unitType.type === type)?.desc}
@@ -816,24 +796,16 @@ function UnitModalForSearchPage({ unit, type }: Props) {
                 </div>
                 <div className="sm:leading-[22px]">
                   <p className="space-y-2 max-sm:text-sm">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.texts[0]
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.texts[0]}
                   </p>
                   <p className="space-y-2 max-sm:text-sm">
-                    {
-                      unitTypes.find((unitType) => unitType.type === type)
-                        ?.texts[1]
-                    }
+                    {unitTypes.find((unitType) => unitType.type === type)?.texts[1]}
                   </p>
                 </div>
               </div>
               <div className="space-y-1">
                 <p className="text-xs sm:text-sm">
-                  Up to{" "}
-                  {unitTypes.find((unitType) => unitType.type === type)?.sqft}{" "}
-                  Sqft
+                  Up to {unitTypes.find((unitType) => unitType.type === type)?.sqft} Sqft
                 </p>
                 <p className="text-xl text-[#00BED7] font-semibold">
                   {unit.unitPrice && (
@@ -851,10 +823,7 @@ function UnitModalForSearchPage({ unit, type }: Props) {
             </div>
             <div>
               <img
-                src={
-                  unitTypes.find((unitType) => unitType.type === type)
-                    ?.imageDesc
-                }
+                src={unitTypes.find((unitType) => unitType.type === type)?.imageDesc}
                 alt=""
                 className="lg:max-h-[644px] sm:h-full rounded-2xl pointer-events-none object-cover max-sm:aspect-square"
               />
diff --git a/client/src/components/modals/auth/ContinueLoginModal.tsx b/client/src/components/modals/auth/ContinueLoginModal.tsx
deleted file mode 100644
index aaa2cd1..0000000
--- a/client/src/components/modals/auth/ContinueLoginModal.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { createRef, useLayoutEffect, useState, RefObject } from "react";
-import useModal from "../../../store/useModal";
-import Button from "../../Button";
-import CrossIcon from "../../icons/CrossIcon";
-import RegistrationModal from "./RegistrationModal";
-
-const ContinueLoginModal = () => {
-  const { setModal } = useModal();
-  const [codeRefs, setCodeRefs] = useState<RefObject<HTMLInputElement>[]>([]);
-
-  const codeLength = 6;
-
-  useLayoutEffect(() => {
-    const refs = Array.from({ length: codeLength }).map(() =>
-      createRef<HTMLInputElement>()
-    );
-    setCodeRefs(refs);
-  }, []);
-
-  const handleOnCloseClick = () => {
-    setModal(null);
-  };
-
-  const handleOnCancelClick = () => {
-    setModal(<RegistrationModal />);
-  };
-
-  const handleOnCodeInput = (
-    refIndex: number,
-    e: React.ChangeEvent<HTMLInputElement>
-  ) => {
-    const char = e.currentTarget.value;
-    const isNotEmpty = char !== "";
-    const isCountOne = char.length === 1;
-    if (refIndex < codeLength && isNotEmpty && isCountOne) {
-      codeRefs[refIndex + 1].current?.focus();
-    }
-  };
-
-  return (
-    <div className="absolute z-50 top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] flex justify-center items-center">
-      <div className="bg-[#F3F3F2] rounded-lg w-[424px] py-[37px] px-8">
-        <div className="w-full flex justify-between items-center border-b pb-6">
-          <h2 className="text-[#0D1922] text-subheadline-m font-semibold">
-            Enter the code
-          </h2>
-          <button onClick={handleOnCloseClick}>
-            <CrossIcon />
-          </button>
-        </div>
-        <div className="flex gap-1 pt-6 text-m text-[#0D1922B2]">
-          We`ve sent the code to <p className="text-[#0D1922] ">number</p>
-        </div>
-        <div className="grid grid-cols-6 gap-x-2 pt-6">
-          {codeRefs.map((ref, index) => (
-            <div
-              key={index}
-              className="h-12 bg-white rounded-lg flex items-center justify-center overflow-clip"
-            >
-              <input
-                onChange={(e) => handleOnCodeInput(index, e)}
-                ref={ref}
-                type="number"
-                className="input_number outline-transparent aspect-square w-full text-center"
-              />
-            </div>
-          ))}
-          <p className="col-span-2 text-caption-m text-[#00BED7] font-semibold pt-6 select-none cursor-pointer">
-            Resend code
-          </p>
-
-          <div className="pt-8 col-span-full flex gap-2">
-            <Button
-              text="Cancel"
-              className="justify-center w-full"
-              onClick={handleOnCancelClick}
-            />
-            <Button
-              text="Login"
-              buttonType="cta"
-              className="justify-center w-full"
-            />
-          </div>
-          <p className="text-caption-m font-semibold text-center col-span-full text-[#0D192266] pt-4">
-            By clicking on the button, you accept the{" "}
-            <a className="text-[#00BED7] cursor-pointer select-none">
-              privacy policy
-            </a>{" "}
-            and consent to the processing of personal data.
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default ContinueLoginModal;
diff --git a/client/src/components/modals/auth/ContinueRegistrationModal.tsx b/client/src/components/modals/auth/ContinueRegistrationModal.tsx
deleted file mode 100644
index 4b5c581..0000000
--- a/client/src/components/modals/auth/ContinueRegistrationModal.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { createRef, useLayoutEffect, useState, RefObject } from "react";
-import useModal from "../../../store/useModal";
-import Button from "../../Button";
-import CrossIcon from "../../icons/CrossIcon";
-import RegistrationModal from "./RegistrationModal";
-
-const ContinueRegistrationModal = () => {
-  const { setModal } = useModal();
-  const [codeRefs, setCodeRefs] = useState<RefObject<HTMLInputElement>[]>([]);
-
-  const codeLength = 6;
-
-  useLayoutEffect(() => {
-    const refs = Array.from({ length: codeLength }).map(() =>
-      createRef<HTMLInputElement>()
-    );
-    setCodeRefs(refs);
-  }, []);
-
-  const handleOnCloseClick = () => {
-    setModal(null);
-  };
-
-  const handleOnCancelClick = () => {
-    setModal(<RegistrationModal />);
-  };
-
-  const handleOnCodeInput = (
-    refIndex: number,
-    e: React.ChangeEvent<HTMLInputElement>
-  ) => {
-    const char = e.currentTarget.value;
-    const isNotEmpty = char !== "";
-    const isCountOne = char.length === 1;
-    if (refIndex < codeLength && isNotEmpty && isCountOne) {
-      codeRefs[refIndex + 1].current?.focus();
-    }
-  };
-
-  return (
-    <div className="absolute z-50 top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] flex justify-center items-center">
-      <div className="bg-[#F3F3F2] rounded-lg w-[424px] py-[37px] px-8">
-        <div className="w-full flex justify-between items-center border-b pb-6">
-          <h2 className="text-[#0D1922] text-subheadline-m font-semibold">
-            Enter the code
-          </h2>
-          <button onClick={handleOnCloseClick}>
-            <CrossIcon />
-          </button>
-        </div>
-        <div className="flex gap-1 pt-6 text-m text-[#0D1922B2]">
-          We`ve sent the code to <p className="text-[#0D1922] ">number</p>
-        </div>
-        <div className="grid grid-cols-6 gap-x-2 pt-6">
-          {codeRefs.map((ref, index) => (
-            <div
-              key={index}
-              className="h-12 bg-white rounded-lg flex items-center justify-center overflow-clip"
-            >
-              <input
-                onChange={(e) => handleOnCodeInput(index, e)}
-                ref={ref}
-                type="number"
-                className="input_number outline-transparent aspect-square w-full text-center"
-              />
-            </div>
-          ))}
-          <p className="col-span-2 text-caption-m text-[#00BED7] font-semibold pt-6 select-none cursor-pointer">
-            Resend code
-          </p>
-
-          <div className="pt-8 col-span-full flex gap-2">
-            <Button
-              text="Cancel"
-              className="justify-center w-full"
-              onClick={handleOnCancelClick}
-            />
-            <Button
-              text="Create account"
-              buttonType="cta"
-              className="justify-center w-full"
-            />
-          </div>
-          <p className="text-caption-m font-semibold text-center col-span-full text-[#0D192266] pt-4">
-            By clicking on the button, you accept the{" "}
-            <a className="text-[#00BED7] cursor-pointer select-none">
-              privacy policy
-            </a>{" "}
-            and consent to the processing of personal data.
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default ContinueRegistrationModal;
diff --git a/client/src/components/modals/auth/LoginModal.tsx b/client/src/components/modals/auth/LoginModal.tsx
deleted file mode 100644
index 02559bf..0000000
--- a/client/src/components/modals/auth/LoginModal.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import useModal from "../../../store/useModal";
-import Button from "../../Button";
-import MasterSelector from "../../MasterSelector";
-import CrossIcon from "../../icons/CrossIcon";
-import ContinueLoginModal from "./ContinueLoginModal";
-import RegistrationModal from "./RegistrationModal";
-
-const LoginModal = () => {
-  const { setModal } = useModal();
-
-  const handleOnCloseClick = () => {
-    setModal(null);
-  };
-
-  const handleOnCreateAccoutClick = () => {
-    setModal(<RegistrationModal />);
-  };
-
-  const handleOnLoginClick = () => {
-    setModal(<ContinueLoginModal />);
-  };
-
-  return (
-    <div className="absolute z-50 top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] flex items-center justify-center">
-      <div className="bg-[#F3F3F2] rounded-lg py-[37px] px-8 w-[424px]">
-        <div className="w-full flex justify-between items-center border-b pb-6">
-          <h2 className="text-[#0D1922] text-subheadline-m font-semibold">
-            Login
-          </h2>
-          <button onClick={handleOnCloseClick}>
-            <CrossIcon />
-          </button>
-        </div>
-        <div className="flex flex-col pt-6">
-          <MasterSelector title="Contact number" />
-          <div className="pt-8">
-            <Button
-              onClick={handleOnLoginClick}
-              text="Login"
-              buttonType="cta"
-              className="justify-center w-full"
-            />
-          </div>
-
-          <div className="font-semibold text-caption-m flex justify-center items-center text-[#0D192266] gap-1 pt-4">
-            Don`t have an account?{" "}
-            <p
-              className="text-[#00BED7] select-none cursor-pointer"
-              onClick={handleOnCreateAccoutClick}
-            >
-              Create one
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default LoginModal;
diff --git a/client/src/components/modals/auth/RegistrationModal.tsx b/client/src/components/modals/auth/RegistrationModal.tsx
deleted file mode 100644
index b7bfc61..0000000
--- a/client/src/components/modals/auth/RegistrationModal.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import useModal from "../../../store/useModal";
-import Button from "../../Button";
-import MasterInput from "../../MasterInput";
-import MasterSelector from "../../MasterSelector";
-import CrossIcon from "../../icons/CrossIcon";
-import ContinueRegistrationModal from "./ContinueRegistrationModal";
-import LoginModal from "./LoginModal";
-
-const RegistrationModal = () => {
-  const { setModal } = useModal();
-
-  const handleOnCloseClick = () => {
-    setModal(null);
-  };
-
-  const handleOnLoginClick = () => {
-    setModal(<LoginModal />);
-  };
-
-  const handleOnContinueClick = () => {
-    setModal(<ContinueRegistrationModal />);
-  };
-
-  return (
-    <div className="absolute z-50 top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] flex justify-center items-center">
-      <div className="bg-[#F3F3F2] rounded-lg w-[424px] py-[37px] px-8">
-        <div className="w-full flex justify-between items-center border-b pb-6">
-          <h2 className="text-[#0D1922] text-subheadline-m font-semibold">
-            Create account
-          </h2>
-          <button onClick={handleOnCloseClick}>
-            <CrossIcon />
-          </button>
-        </div>
-        <div className="flex flex-col gap-4 pt-6">
-          <MasterInput title="Name" isRequired={true} placeholder="Name" />
-          <MasterInput
-            title="Company name"
-            isRequired={false}
-            placeholder="Company"
-          />
-          <MasterInput
-            title="Email"
-            isRequired={false}
-            placeholder="sample@mail.com"
-          />
-          <MasterSelector title="Contact number" />
-        </div>
-        <div className="pt-8">
-          <Button
-            onClick={handleOnContinueClick}
-            text="Continue"
-            buttonType="cta"
-            className="justify-center w-full"
-          />
-        </div>
-
-        <div className="font-semibold text-caption-m flex justify-center items-center text-[#0D192266] gap-1 pt-4">
-          Already have an account?{" "}
-          <p
-            className="text-[#00BED7] select-none cursor-pointer"
-            onClick={handleOnLoginClick}
-          >
-            login
-          </p>
-        </div>
-        <div className="font-semibold text-caption-m text-[#0D192266] gap-1 pt-8 flex">
-          <p className="text-center">
-            By clicking on the button, you accept the and consent to the{" "}
-            <a className="text-[#00BED7] select-none cursor-pointer">
-              privacy policy{" "}
-            </a>{" "}
-            processing of personal data.
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default RegistrationModal;
diff --git a/client/src/components/modals/mobile/MasterplanFiltersModal.tsx b/client/src/components/modals/mobile/MasterplanFiltersModal.tsx
index 4a42226..72984ac 100644
--- a/client/src/components/modals/mobile/MasterplanFiltersModal.tsx
+++ b/client/src/components/modals/mobile/MasterplanFiltersModal.tsx
@@ -1,6 +1,5 @@
 import { useContext, useState } from "react";
 import useModal from "../../../store/useModal";
-import Button from "../../Button";
 import CrossIcon from "../../icons/CrossIcon";
 import { MobileModalWrapperContext } from "./MobileModalWrapper";
 import Checkbox from "../../Checkbox";
@@ -13,6 +12,7 @@ import {
   initialViewCheckboxes,
 } from "../../../consts/initialMasterplanFilters";
 import { ICheckbox } from "../../../types/checkbox";
+import Button3 from "../../Button3";
 
 const MasterplanFiltersModal = () => {
   const { setModal } = useModal();
@@ -98,11 +98,11 @@ const MasterplanFiltersModal = () => {
         <h2 className="text-[#0D1922] text-subheadline-m font-semibold">
           Filters
         </h2>
-        <Button
-          buttonType="secondary"
-          isCircleRounded
+        <Button3
+          variant="secondary"
           icon={<CrossIcon />}
           className="text-[#0D1922B2]"
+          roundedFull
           onClick={handleOnCrossClick}
         />
       </div>
@@ -118,10 +118,10 @@ const MasterplanFiltersModal = () => {
           ))}
         </div>
       </div>
-      <div className="grid grid-cols-2 gap-6 border-b pb-12">
+      <div className="grid grid-cols-2 gap-6 pb-12 border-b">
         {multirangeSliders.map((slider) => (
           <div key={slider.id} className="flex flex-col gap-3">
-            <div className="flex justify-between items-center">
+            <div className="flex items-center justify-between">
               <p className="text-[#0D1922] text-s ">{slider.title}</p>
               <p className="text-[#73787C] text-s">{slider.unit}</p>
             </div>
@@ -146,19 +146,20 @@ const MasterplanFiltersModal = () => {
       </div>
       <div className="flex justify-between">
         <p className="text-[#00BED7] text-m">195 apartments found</p>
-        <Button
+        <Button3
+          variant="secondary"
           icon={<ResetIcon />}
-          text="Reset filters"
-          buttonType="tertiary"
           onClick={handleOnResetClick}
-        />
+        >
+          Reset filters
+        </Button3>
       </div>
-      <Button
-        text="Show Apartments"
-        buttonType="cta"
+      <Button3
         className="flex justify-center"
         onClick={handleOnShowApartmentClick}
-      />
+      >
+        Show Apartments
+      </Button3>
     </div>
   );
 };
diff --git a/client/src/components/modals/mobile/SearchFiltersModal.tsx b/client/src/components/modals/mobile/SearchFiltersModal.tsx
index 5630910..e67e9b2 100644
--- a/client/src/components/modals/mobile/SearchFiltersModal.tsx
+++ b/client/src/components/modals/mobile/SearchFiltersModal.tsx
@@ -1,6 +1,5 @@
 import { useContext } from "react";
 import useModal from "../../../store/useModal";
-import Button from "../../Button";
 import CrossIcon from "../../icons/CrossIcon";
 import { MobileModalWrapperContext } from "./MobileModalWrapper";
 import useSearchFilters from "../../../store/useSearchFilters";
@@ -14,6 +13,7 @@ import {
   initialViewCheckboxes,
   initialRoveHomeCheckboxes,
 } from "../../../consts/initialMasterplanFilters";
+import Button3 from "../../Button3";
 
 const SearchFiltersModal = () => {
   // const [viewCheckboxes, setViewCheckboxes] = useState<ICheckbox[]>(
@@ -118,10 +118,10 @@ const SearchFiltersModal = () => {
         <h2 className="text-[#0D1922] text-subheadline-m font-semibold">
           Filters
         </h2>
-        <Button
-          buttonType="secondary"
-          isCircleRounded
+        <Button3
+          variant="secondary"
           icon={<CrossIcon />}
+          roundedFull
           className="text-[#0D1922B2]"
           onClick={handleOnCrossClick}
         />
@@ -152,10 +152,10 @@ const SearchFiltersModal = () => {
           ))}
         </div>
       </div>
-      <div className="grid grid-cols-2 gap-6 border-b pb-12">
+      <div className="grid grid-cols-2 gap-6 pb-12 border-b">
         {multirangeSliders.map((slider) => (
           <div key={slider.id} className="flex flex-col gap-3">
-            <div className="flex justify-between items-center">
+            <div className="flex items-center justify-between">
               <p className="text-[#0D1922] text-m font-semibold ">
                 {slider.title}
               </p>
@@ -189,19 +189,20 @@ const SearchFiltersModal = () => {
       </div>
       <div className="flex justify-between">
         <p className="text-[#00BED7] text-m">195 apartments found</p>
-        <Button
+        <Button3
+          variant="secondary"
           icon={<ResetIcon />}
-          text="Reset filters"
-          buttonType="tertiary"
           onClick={handleOnResetClick}
-        />
+        >
+          Reset filters
+        </Button3>
       </div>
-      <Button
-        text="Show Apartments"
-        buttonType="cta"
+      <Button3
         className="flex justify-center"
         onClick={handleOnShowApartmentClick}
-      />
+      >
+        Show Apartments
+      </Button3>
     </div>
   );
 };
diff --git a/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx b/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx
index 4bcaa20..be1fb15 100644
--- a/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx
+++ b/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx
@@ -1,11 +1,11 @@
 import { useSwipeable } from "react-swipeable";
-import Button from "../../Button";
 import useModal from "../../../store/useModal";
 import CrossIcon from "../../icons/CrossIcon";
 import { useContext } from "react";
 import { MobileModalWrapperContext } from "./MobileModalWrapper";
 import MasterInput from "../../MasterInput";
 import MasterSelector from "../../MasterSelector";
+import Button3 from "../../Button3";
 
 const SendEnquiryMobileModal = () => {
   const { setModal } = useModal();
@@ -34,20 +34,20 @@ const SendEnquiryMobileModal = () => {
         <h2 className="text-[#0D1922] text-subheadline-m font-semibold">
           Apartment purchase enquiry
         </h2>
-        <Button
-          buttonType="secondary"
-          isCircleRounded
+        <Button3
+          variant="secondary"
           icon={<CrossIcon />}
           className="text-[#0D1922B2]"
+          roundedFull
           onClick={handleOnCrossClick}
         />
       </div>
       <div className="py-6">
-        <div className="bg-white rounded-2xl p-6 grid grid-cols-8">
+        <div className="grid grid-cols-8 p-6 bg-white rounded-2xl">
           <div className="col-span-4 aspect-square">
             <img src="/images/layout-1.png" alt="" className="w-full" />
           </div>
-          <div className="col-span-4 flex flex-col justify-between">
+          <div className="flex flex-col justify-between col-span-4">
             <h2 className="text-[#0D1922] text-subheadline-s font-semibold">
               Studio Flex, 607.08 Sqft
             </h2>
@@ -87,8 +87,8 @@ const SendEnquiryMobileModal = () => {
           </div>
         </div>
       </div>
-      <div className="grid grid-cols-8 gap-x-4 pb-4">
-        <h2 className="col-span-4 text-subheadline-s font-semibold">
+      <div className="grid grid-cols-8 pb-4 gap-x-4">
+        <h2 className="col-span-4 font-semibold text-subheadline-s">
           Specify the client data to send the request
         </h2>
         <div className="col-span-4 col-start-1 pt-6">
@@ -106,18 +106,14 @@ const SendEnquiryMobileModal = () => {
         </div>
       </div>
       <div>
-        <div className="flex gap-4 border-t w-full pt-4">
-          <Button
+        <div className="flex w-full gap-4 pt-4 border-t">
+          <Button3
+            className="justify-center w-full"
             onClick={handleOnCrossClick}
-            text="Cancel"
-            buttonType="cta"
-            className="w-full justify-center"
-          />
-          <Button
-            text="Send"
-            buttonType="fab"
-            className="w-full justify-center"
-          />
+          >
+            Cancel
+          </Button3>
+          <Button3 className="justify-center w-full">Send</Button3>
         </div>
         <p className="text-caption-m font-semibold text-[#0D192266] text-center pt-4">
           By clicking on the “Send” button, you accept the privacy policy and
diff --git a/client/src/components/searchPage/LayoutCard.tsx b/client/src/components/searchPage/LayoutCard.tsx
index 9cb8944..3a44b31 100644
--- a/client/src/components/searchPage/LayoutCard.tsx
+++ b/client/src/components/searchPage/LayoutCard.tsx
@@ -1,10 +1,10 @@
 import { useNavigate } from "react-router-dom";
-import Button from "../Button";
 import HeartIcon from "../icons/Heart";
 import { IAparmentRes } from "../../types/apartmentsRes";
 import { useEffect, useState } from "react";
-import useFavorites from "../../store/useFavorites";
+// import useFavorites from "../../store/useFavorites";
 import { apartmentRoutes } from "../../consts/apartmentsRoutes";
+import Button3 from "../Button3";
 
 interface LayoutCardProps {
   apartmentCard: IAparmentRes;
@@ -25,7 +25,7 @@ const LayoutCard = ({ apartmentCard, price }: LayoutCardProps) => {
 
   const totalArea = Number(_totalArea).toFixed(2);
   const [isFavorite, setIsFavorite] = useState(false);
-  const { setFavorites } = useFavorites();
+  // const { setFavorites } = useFavorites();
   const layoutImage = apartmentRoutes.find(
     (apr) => apr.type === unitType
   )?.layout;
@@ -36,37 +36,37 @@ const LayoutCard = ({ apartmentCard, price }: LayoutCardProps) => {
     navigate(`${id}`);
   };
 
-  const handleOnFavoriteClick = (
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent>
-  ) => {
-    e.stopPropagation();
-    const favorites = localStorage.getItem("Favorites");
+  // const handleOnFavoriteClick = (
+  //   e: React.MouseEvent<HTMLButtonElement, MouseEvent>
+  // ) => {
+  //   e.stopPropagation();
+  //   const favorites = localStorage.getItem("Favorites");
 
-    if (!favorites) {
-      setIsFavorite(true);
-      const updatedFavorites = JSON.stringify([apartmentCard]);
+  //   if (!favorites) {
+  //     setIsFavorite(true);
+  //     const updatedFavorites = JSON.stringify([apartmentCard]);
 
-      localStorage.setItem("Favorites", updatedFavorites);
-    } else {
-      const _favorites = JSON.parse(favorites) as IAparmentRes[];
+  //     localStorage.setItem("Favorites", updatedFavorites);
+  //   } else {
+  //     const _favorites = JSON.parse(favorites) as IAparmentRes[];
 
-      if (_favorites.some((apart) => apart.id === apartmentCard.id)) {
-        setIsFavorite(false);
-        const updatedFavorites = [..._favorites].filter(
-          (apart) => apart.id !== apartmentCard.id
-        );
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        setFavorites(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      } else {
-        setIsFavorite(true);
-        const updatedFavorites = [..._favorites, apartmentCard];
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      }
-    }
-  };
+  //     if (_favorites.some((apart) => apart.id === apartmentCard.id)) {
+  //       setIsFavorite(false);
+  //       const updatedFavorites = [..._favorites].filter(
+  //         (apart) => apart.id !== apartmentCard.id
+  //       );
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       setFavorites(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     } else {
+  //       setIsFavorite(true);
+  //       const updatedFavorites = [..._favorites, apartmentCard];
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     }
+  //   }
+  // };
 
   useEffect(() => {
     const favorites = localStorage.getItem("Favorites");
@@ -80,38 +80,37 @@ const LayoutCard = ({ apartmentCard, price }: LayoutCardProps) => {
 
   return (
     <div
-      className="bg-white flex flex-col p-4 rounded-2xl cursor-pointer select-none"
+      className="flex flex-col p-4 bg-white cursor-pointer select-none rounded-2xl"
       onClick={handleOnClick}
     >
-      <div className="flex gap-4 justify-between">
-        <div className="flex gap-1 flex-col">
+      <div className="flex justify-between gap-4">
+        <div className="flex flex-col gap-1">
           <p className="text-[#00BED7] text-s leading-5">{projectName}</p>
           <div className="text-[#73787C] flex gap-2 items-center w-fit">
-            <p className="text-caption-m font-semibold leading-4">
+            <p className="font-semibold leading-4 text-caption-m">
               {wing} Wing
             </p>
             <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-            <p className="text-caption-m font-semibold leading-4">
+            <p className="font-semibold leading-4 text-caption-m">
               Floor {floor}
             </p>
             <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-            <p className="text-caption-m font-semibold leading-4">
+            <p className="font-semibold leading-4 text-caption-m">
               № {unitNumber}
             </p>
           </div>
         </div>
-        <Button
-          onClick={handleOnFavoriteClick}
+        <Button3
           icon={<HeartIcon isFilled={isFavorite} />}
-          buttonType="favorite"
-          isCircleRounded
+          roundedFull
+          // onClick={handleOnFavoriteClick}
         />
       </div>
-      <div className="w-full aspect-square rounded-lg pt-6 ">
+      <div className="w-full pt-6 rounded-lg aspect-square ">
         <img
           src={`${layoutImage}`}
           alt=""
-          className="w-full aspect-square object-contain"
+          className="object-contain w-full aspect-square"
         />
       </div>
       <div className="flex flex-col gap-1 pt-6">
diff --git a/client/src/components/searchPage/LayoutOptions.tsx b/client/src/components/searchPage/LayoutOptions.tsx
index 09049d9..cd3fdeb 100644
--- a/client/src/components/searchPage/LayoutOptions.tsx
+++ b/client/src/components/searchPage/LayoutOptions.tsx
@@ -3,7 +3,6 @@ import { useEffect, useState } from "react";
 import LayoutCard from "./LayoutCard";
 import SortButton from "./SortButton";
 import SearchIcon from "../icons/SearchIcon";
-import Button from "../Button";
 import FilterIcon from "../icons/FilterIcon";
 import useModal from "../../store/useModal";
 import { MobileModalWrapper } from "../modals/mobile/MobileModalWrapper";
@@ -16,6 +15,7 @@ import { perPageInitial } from "../../consts/initialMasterplanFilters";
 import { getFilteredApartments } from "../../calc/getFilteredApartments";
 import SearchLoader from "./SearchLoader";
 import _ from "lodash";
+import Button3 from "../Button3";
 
 const LayoutOptions = () => {
   const { apartments, setApartments } = useApartments();
@@ -186,9 +186,9 @@ const LayoutOptions = () => {
   }
 
   return (
-    <section className="w-full p-6 flex flex-col">
-      <div className="flex justify-between items-center border-b">
-        <div className="flex w-full justify-between pb-4 lg:flex-row lg:items-center flex-col">
+    <section className="flex flex-col w-full p-6">
+      <div className="flex items-center justify-between border-b">
+        <div className="flex flex-col justify-between w-full pb-4 lg:flex-row lg:items-center">
           <div className="flex gap-4 font-semibold text-subheadline-s leading-7 py-[6px]">
             <h2 className="text-[#0D1922]">Units</h2>
             <p className="text-[#73787C]">
@@ -197,19 +197,20 @@ const LayoutOptions = () => {
           </div>
           <SortButton sortList={sortList} onClick={handleOnSortClick} />
         </div>
-        <div className="lg:hidden block">
-          <Button
+        <div className="block lg:hidden">
+          <Button3
             icon={<FilterIcon />}
-            text="Filters"
             className="text-[#0D1922B2]"
             onClick={handleOnFilterClick}
-          />
+          >
+            Filters
+          </Button3>
         </div>
       </div>
       {isLoading ? (
         <SearchLoader />
       ) : (
-        <div className="grid 2xl:grid-cols-4 xl:grid-cols-3 grid-cols-2 gap-4 pt-6">
+        <div className="grid grid-cols-2 gap-4 pt-6 2xl:grid-cols-4 xl:grid-cols-3">
           {apartments &&
             apartments.map((apartment, index) => (
               <LayoutCard
diff --git a/client/src/components/searchPage/SidebarFilters.tsx b/client/src/components/searchPage/SidebarFilters.tsx
index 44ba439..f45b0bf 100644
--- a/client/src/components/searchPage/SidebarFilters.tsx
+++ b/client/src/components/searchPage/SidebarFilters.tsx
@@ -1,4 +1,3 @@
-import Button from "../Button";
 import ResetIcon from "../icons/ResetIcon";
 import Checkbox from "../Checkbox";
 import MultiRangeSlider from "../MultiRangeSlider";
@@ -11,6 +10,7 @@ import {
   pageInitial,
   perPageInitial,
 } from "../../consts/initialMasterplanFilters";
+import Button3 from "../Button3";
 
 const SidebarFilters = () => {
   const {
@@ -84,17 +84,16 @@ const SidebarFilters = () => {
   return (
     <div>
       <div className="h-full w-[360px] bg-[#F3F3F2] flex-col items-center justify-between border-r lg:flex hidden">
-        <div className="w-full py-6 px-6 flex flex-col items-center">
+        <div className="flex flex-col items-center w-full px-6 py-6">
           <div className="flex justify-between border-b border-[#E2E2DC] w-full pb-4">
-            <h2 className="text-subheadline-m font-semibold">Filters</h2>
-            <Button
-              isCircleRounded
+            <h2 className="font-semibold text-subheadline-m">Filters</h2>
+            <Button3
               icon={<ResetIcon />}
-              buttonType="fab"
+              roundedFull
               onClick={handleOnResetClick}
             />
           </div>
-          <div className="flex flex-col pt-6 w-full">
+          <div className="flex flex-col w-full pt-6">
             <p className="text-[#0D1922] text-s pb-4">Rove Home</p>
             <div className="flex flex-col gap-2">
               {roveHomeTypeCheckboxes.map((checkbox) => (
@@ -106,7 +105,7 @@ const SidebarFilters = () => {
               ))}
             </div>
           </div>
-          <div className="flex flex-col pt-6 w-full">
+          <div className="flex flex-col w-full pt-6">
             <p className="text-[#0D1922] text-s pb-4">Apartment type</p>
             <div className="flex flex-col gap-2">
               {apartmentTypeCheckboxes.map((checkbox) => (
@@ -118,10 +117,10 @@ const SidebarFilters = () => {
               ))}
             </div>
           </div>
-          <div className="flex flex-col pt-6 w-full gap-8">
+          <div className="flex flex-col w-full gap-8 pt-6">
             {multirangeSliders.map((slider) => (
               <div key={slider.id} className="flex flex-col gap-2">
-                <div className="flex justify-between items-center">
+                <div className="flex items-center justify-between">
                   <p className="text-[#0D1922] text-s ">{slider.title}</p>
                   <p className="text-[#73787C] text-s">{slider.unit}</p>
                 </div>
diff --git a/client/src/components/virtualTour/ButtomPanelCompassVirualTour.tsx b/client/src/components/virtualTour/ButtomPanelCompassVirualTour.tsx
index 1e232cd..13a0067 100644
--- a/client/src/components/virtualTour/ButtomPanelCompassVirualTour.tsx
+++ b/client/src/components/virtualTour/ButtomPanelCompassVirualTour.tsx
@@ -1,6 +1,6 @@
 import useCompass from "../../store/useCompass";
 import useModal from "../../store/useModal";
-import Button from "../Button";
+import Button3 from "../Button3";
 import DisclaimerIcon from "../icons/DisclaimerIcon";
 import DisclaimerModal from "../modals/DisclaimerModal";
 
@@ -13,16 +13,18 @@ const ButtomPanelCompassVirtualTour = () => {
   };
 
   return (
-    <div className="absolute bottom-0 left-0 z-20 flex items-end justify-between w-full gap-2 pointer-events-none select-none touch-none">
+    <div className="absolute bottom-0 left-0 z-10 flex items-end justify-between w-full gap-2 select-none touch-none">
       <div className="flex flex-col gap-2">
         <div className="flex gap-2 pb-6 pl-6">
-          <Button
-            text="Disclaimer"
-            buttonType="special"
-            className="pl-2"
+          <Button3
+            variant="special"
+            size="xsmall"
             icon={<DisclaimerIcon />}
+            roundedFull
             onClick={handleOnDisclaimerClick}
-          />
+          >
+            Disclaimer
+          </Button3>
           {/* <Button text="Privacy Policy" buttonType="special" /> */}
         </div>
       </div>
@@ -31,8 +33,8 @@ const ButtomPanelCompassVirtualTour = () => {
           <img
             style={{ transform: `rotate(${currentCompassRotate - 180}deg)` }}
             src="/images/masterplan/compass.png"
-            alt="compass"
-            className=""
+            alt=""
+            className="pointer-events-none"
           />
         </div>
       </div>
diff --git a/client/src/components/virtualTour/VirtualTourCard.tsx b/client/src/components/virtualTour/VirtualTourCard.tsx
index c123b25..ed11a53 100644
--- a/client/src/components/virtualTour/VirtualTourCard.tsx
+++ b/client/src/components/virtualTour/VirtualTourCard.tsx
@@ -1,4 +1,3 @@
-import Button from "../Button";
 import ArrowLeftIcon from "../icons/ArrowLeftIcon";
 import IUnit from "../../types/IUnit";
 import BookingIcon from "../icons/BookingIcon";
@@ -182,9 +181,10 @@ function VirtualTourCard({ unit, type }: Props) {
     >
       <div className="p-4 space-y-3 bg-white sm:space-y-4 sm:p-6 sm:rounded-br-none rounded-2xl">
         <div className="flex items-center gap-4 sm:pb-4 sm:border-b border-[#E2E2DC]">
-          <Button
-            buttonType="secondary"
+          <Button3
+            variant="secondary"
             icon={<ArrowLeftIcon />}
+            onlyIcon
             onClick={() => navigate(-1)}
           />
           <p className="text-[#0D1922] sm:text-xl font-semibold">
@@ -234,12 +234,14 @@ function VirtualTourCard({ unit, type }: Props) {
         </p>
         <div className="flex gap-2">
           <Button3
-            variant="secondary"
+            // variant="secondary"
             icon={<BookingIcon className="w-4 h-4 sm:w-5 sm:h-5" />}
             className="sm:w-[216px] w-full justify-center"
             disabled
           >
-            <span className="max-sm:text-xs max-sm:font-semibold">Send Enquiry</span>
+            <span className="max-sm:text-xs max-sm:font-semibold">
+              Send Enquiry
+            </span>
           </Button3>
           <Button3
             variant="secondary"
diff --git a/client/src/components/virtualTour/VirtualTourSidebar.tsx b/client/src/components/virtualTour/VirtualTourSidebar.tsx
index 9e3d645..a7e293c 100644
--- a/client/src/components/virtualTour/VirtualTourSidebar.tsx
+++ b/client/src/components/virtualTour/VirtualTourSidebar.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from "react";
 import useSphere from "../../store/useSphere";
 import { IAppartmentComplex, ISphere } from "../../types/apartmentSphere";
-import Button from "../Button";
 import BookingIcon from "../icons/BookingIcon";
 import ChevronDownIcon from "../icons/ChevronDownIcon";
 import HeartIcon from "../icons/Heart";
@@ -13,27 +12,24 @@ import { useNavigate } from "react-router-dom";
 import useModal from "../../store/useModal";
 import { SendEnquiryModal } from "../modals/SendEnquryModal";
 import { IAparmentRes } from "../../types/apartmentsRes";
-import useFavorites from "../../store/useFavorites";
+// import useFavorites from "../../store/useFavorites";
+import Button3 from "../Button3";
 
 interface VirtualTourSidebarProps {
   appartmentSphere: null | IAppartmentComplex;
   apartment: null | IAparmentRes;
 }
 
-const VirtualTourSidebar = ({
-  appartmentSphere,
-  apartment,
-}: VirtualTourSidebarProps) => {
+const VirtualTourSidebar = ({ appartmentSphere, apartment }: VirtualTourSidebarProps) => {
   const { currentCompassRotate } = useCompass();
   const [isActive, setIsActive] = useState(false);
   const { setSelectedSphere, selectedSphere } = useSphere();
   const { setModal } = useModal();
   const navigate = useNavigate();
-  const wing =
-    apartment?.Unit_No.split("-")[0] === "W" ? "West Wing" : "East Wing";
+  const wing = apartment?.Unit_No.split("-")[0] === "W" ? "West Wing" : "East Wing";
 
   const [isFavorite, setIsFavorite] = useState(false);
-  const { setFavorites } = useFavorites();
+  // const { setFavorites } = useFavorites();
 
   const handleOnShowClick = () => {
     setIsActive((prev) => !prev);
@@ -56,47 +52,45 @@ const VirtualTourSidebar = ({
     setModal(<SendEnquiryModal />);
   };
 
-  const handleOnFavoriteClick = (
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent>
-  ) => {
-    e.stopPropagation();
-    console.log("apartment", apartment);
-    if (!apartment) return;
-    const favorites = localStorage.getItem("Favorites");
+  // const handleOnFavoriteClick = (
+  //   e: React.MouseEvent<HTMLButtonElement, MouseEvent>
+  // ) => {
+  //   e.stopPropagation();
+  //   console.log("apartment", apartment);
+  //   if (!apartment) return;
+  //   const favorites = localStorage.getItem("Favorites");
 
-    if (!favorites) {
-      setIsFavorite(true);
-      const updatedFavorites = JSON.stringify([apartment]);
+  //   if (!favorites) {
+  //     setIsFavorite(true);
+  //     const updatedFavorites = JSON.stringify([apartment]);
 
-      localStorage.setItem("Favorites", updatedFavorites);
-    } else {
-      const _favorites = JSON.parse(favorites) as IAparmentRes[];
+  //     localStorage.setItem("Favorites", updatedFavorites);
+  //   } else {
+  //     const _favorites = JSON.parse(favorites) as IAparmentRes[];
 
-      if (_favorites.some((apart) => apart.id === apartment.id)) {
-        setIsFavorite(false);
-        const updatedFavorites = [..._favorites].filter(
-          (apart) => apart.id !== apartment.id
-        );
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        setFavorites(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      } else {
-        setIsFavorite(true);
-        const updatedFavorites = [..._favorites, apartment];
-        setFavorites(updatedFavorites);
-        const convertedFavorites = JSON.stringify(updatedFavorites);
-        localStorage.setItem("Favorites", convertedFavorites);
-      }
-    }
-  };
+  //     if (_favorites.some((apart) => apart.id === apartment.id)) {
+  //       setIsFavorite(false);
+  //       const updatedFavorites = [..._favorites].filter(
+  //         (apart) => apart.id !== apartment.id
+  //       );
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       setFavorites(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     } else {
+  //       setIsFavorite(true);
+  //       const updatedFavorites = [..._favorites, apartment];
+  //       setFavorites(updatedFavorites);
+  //       const convertedFavorites = JSON.stringify(updatedFavorites);
+  //       localStorage.setItem("Favorites", convertedFavorites);
+  //     }
+  //   }
+  // };
 
   useEffect(() => {
     if (!apartment) return;
     const favorites = localStorage.getItem("Favorites");
     if (favorites) {
-      const _isFavorite = (JSON.parse(favorites) as IAparmentRes[]).some(
-        (apart) => apart.id === apartment.id
-      );
+      const _isFavorite = (JSON.parse(favorites) as IAparmentRes[]).some((apart) => apart.id === apartment.id);
       setIsFavorite(_isFavorite);
     }
   }, [apartment, apartment?.id]);
@@ -104,41 +98,28 @@ const VirtualTourSidebar = ({
   return (
     <div className="absolute w-screen h-screen grid z-[99999997] pointer-events-none select-none">
       <div className="h-screen py-[72px] px-3 w-[360px]">
-        <div className="bg-white w-full rounded-2xl p-5 flex flex-col relative rounded-ee-none">
+        <div className="relative flex flex-col w-full p-5 bg-white rounded-2xl rounded-ee-none">
           <div className="flex items-center justify-between pb-[18px] border-b gap-4">
-            <Button
-              icon={<LeftArrowIcon />}
-              buttonType="secondary"
-              className="w-fit"
-              onClick={handleOnBackClick}
-            />
+            <Button3 variant="secondary" icon={<LeftArrowIcon />} className="w-fit" onClick={handleOnBackClick} />
             {/* <p className="text-[#0D1922] font-semibold leading-6 text-left text-xl"> */}
             <p className="text-[#0D1922] font-semibold text-subheadline-s leading-6 text-left">
               {apartment
-                ? `${apartment?.Unit_Type}, ${Math.round(
-                    apartment?.Total_Area_Sqft
-                  )} Sqft`
+                ? `${apartment?.Unit_Type}, ${Math.round(apartment?.Total_Area_Sqft)} Sqft`
                 : "1 BR Squared, 609 Sqft"}
             </p>
           </div>
           <div className="pt-3">
-            <div className="flex gap-2 items-center">
+            <div className="flex items-center gap-2">
               <div className="flex flex-col">
                 <p className="text-[#00BED7] text-caption-m font-medium">
                   {apartment?.Project_Name || "Rove Home Marasi Drive"}
                 </p>
                 <div className="text-[#73787C] flex gap-2 items-center w-fit pt-1">
-                  <p className="text-caption-m font-semibold leading-4">
-                    {wing}
-                  </p>
+                  <p className="font-semibold leading-4 text-caption-m">{wing}</p>
                   <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-                  <p className="text-caption-m font-semibold leading-4">
-                    Floor {apartment?.Floor || 11}
-                  </p>
+                  <p className="font-semibold leading-4 text-caption-m">Floor {apartment?.Floor || 11}</p>
                   <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div>
-                  <p className="text-caption-m font-semibold leading-4">
-                    № {apartment?.Unit_No || 213}
-                  </p>
+                  <p className="font-semibold leading-4 text-caption-m">№ {apartment?.Unit_No || 213}</p>
                 </div>
               </div>
             </div>
@@ -147,16 +128,8 @@ const VirtualTourSidebar = ({
                 !isActive ? "max-h-0 opacity-0" : "max-h-screen opacity-100"
               }`}
             >
-              <div
-                className={`${
-                  isActive ? "my-4" : ""
-                } relative flex justify-center`}
-              >
-                <img
-                  src={appartmentSphere?.map}
-                  alt=""
-                  className="max-h-[300px]"
-                />
+              <div className={`${isActive ? "my-4" : ""} relative flex justify-center`}>
+                <img src={appartmentSphere?.map} alt="" className="max-h-[300px]" />
                 <div
                   className="absolute"
                   style={{
@@ -172,46 +145,31 @@ const VirtualTourSidebar = ({
                 <div className="flex flex-col gap-3">
                   <div className="flex justify-between text-m">
                     <p className="text-[#73787C]">Size</p>
-                    <p className="text-[#0D1922]">
-                      {Number(apartment?.Total_Area_Sqft).toFixed(2) || 609}{" "}
-                      Sqft
-                    </p>
+                    <p className="text-[#0D1922]">{Number(apartment?.Total_Area_Sqft).toFixed(2) || 609} Sqft</p>
                   </div>
                   <div className="flex justify-between text-m">
                     <p className="text-[#73787C]">Status</p>
-                    <p className="text-[#0D1922]">
-                      {apartment?.Property_Status || "Available"}
-                    </p>
+                    <p className="text-[#0D1922]">{apartment?.Property_Status || "Available"}</p>
                   </div>
                 </div>
               </div>
             </div>
             <div className="flex flex-col">
-              <h2 className="text-subheadline-s font-semibold text-[#00BED7] pt-4">
-                Unavailable
-              </h2>
+              <h2 className="text-subheadline-s font-semibold text-[#00BED7] pt-4">Unavailable</h2>
               <div className="flex gap-2 pt-4 ">
-                <Button
+                <Button3
                   icon={<BookingIcon />}
-                  text="Send Enquiry"
-                  buttonType="cta"
-                  className="flex-1 flex items-center justify-center"
+                  className="flex items-center justify-center flex-1"
                   onClick={handleOnSendEnquiryClick}
-                />
-                <Button
-                  icon={<InfoIcon />}
-                  buttonType="secondary"
-                  onClick={handleAboutComplexClick}
-                />
-                <Button
-                  icon={<HeartIcon isFilled={isFavorite} />}
-                  buttonType="secondary"
-                  onClick={handleOnFavoriteClick}
-                />
+                >
+                  Send Enquiry
+                </Button3>
+                <Button3 variant="secondary" icon={<InfoIcon />} onlyIcon onClick={handleAboutComplexClick} />
+                <Button3 variant="secondary" onlyIcon icon={<HeartIcon isFilled={isFavorite} />} />
               </div>
             </div>
           </div>
-          <div className="h-14 absolute -bottom-14 left-0 w-full  flex justify-between">
+          <div className="absolute left-0 flex justify-between w-full h-14 -bottom-14">
             <div className="flex gap-1 py-2 items-start flex-wrap pr-[9px]">
               {appartmentSphere &&
                 appartmentSphere.spheres.map((sphere) => {
@@ -219,9 +177,7 @@ const VirtualTourSidebar = ({
                     <div
                       key={sphere.id}
                       className={`font-semibold text-caption-s py-0.5 px-2 w-fit rounded-full cursor-pointer pointer-events-auto select-none text-white ${
-                        selectedSphere?.id === sphere.id
-                          ? "bg-[#00BED7]"
-                          : "bg-[#0D192266]"
+                        selectedSphere?.id === sphere.id ? "bg-[#00BED7]" : "bg-[#0D192266]"
                       }`}
                       onClick={() => handleOnLabelClick(sphere)}
                     >
@@ -234,13 +190,9 @@ const VirtualTourSidebar = ({
               onClick={handleOnShowClick}
               className="transition-all duration-300 bg-[#FFFFFFCC] px-4 py-3 w-fit h-12 rounded-ee-lg rounded-es-lg select-none cursor-pointer pointer-events-auto items-start border border-t-[#0D1922B2] active:border-[#00BED7] hover:bg-[#FFFFFF] text-[#0D1922B2] hover:text-[#0D1922]"
             >
-              <div className="flex justify-center items-center gap-2">
+              <div className="flex items-center justify-center gap-2">
                 <div className="relative">
-                  <div
-                    className={`transition-opacity duration-300 ${
-                      !isActive ? "opacity-100" : "opacity-0"
-                    }`}
-                  >
+                  <div className={`transition-opacity duration-300 ${!isActive ? "opacity-100" : "opacity-0"}`}>
                     Show
                   </div>
                   <div
@@ -251,11 +203,7 @@ const VirtualTourSidebar = ({
                     Hide
                   </div>
                 </div>
-                <ChevronDownIcon
-                  className={`transition-all duration-300 ${
-                    !isActive ? "rotate-0" : "rotate-180"
-                  }`}
-                />
+                <ChevronDownIcon className={`transition-all duration-300 ${!isActive ? "rotate-0" : "rotate-180"}`} />
               </div>
             </div>
           </div>
diff --git a/client/src/components/virtualTour/VirtualTourTopPanel.tsx b/client/src/components/virtualTour/VirtualTourTopPanel.tsx
index 147a6c3..a6493f8 100644
--- a/client/src/components/virtualTour/VirtualTourTopPanel.tsx
+++ b/client/src/components/virtualTour/VirtualTourTopPanel.tsx
@@ -1,10 +1,8 @@
-// import useModal from "../../store/useModal";
-import Button from "../Button";
 import HintIcon from "../icons/HintIcon";
 import ResizeIcon from "../icons/ResizeIcon";
-// import HelpModal from "../modals/HelpModal";
 import useFullScreen from "../../store/useFullScreen";
 import ActiveResizeIcon from "../icons/ActiveResizeIcon";
+import Button3 from "../Button3";
 
 const VirtualTourTopPanel = () => {
   // const { setModal } = useModal();
@@ -30,25 +28,16 @@ const VirtualTourTopPanel = () => {
       <div
         className={`absolute top-[62px] left-0 z-[99999998] w-full p-4 grid grid-cols-12 select-none touch-none pointer-events-none`}
       >
-        <div className="flex gap-2 col-span-1 col-start-12 justify-end">
+        <div className="flex justify-end col-span-1 col-start-12 gap-2">
           {isFullscreen ? (
-            <Button
-              buttonType="fab"
+            <Button3
               icon={<ActiveResizeIcon />}
               onClick={handleOnFullScreenClick}
             />
           ) : (
-            <Button
-              buttonType="fab"
-              icon={<ResizeIcon />}
-              onClick={handleOnFullScreenClick}
-            />
+            <Button3 icon={<ResizeIcon />} onClick={handleOnFullScreenClick} />
           )}
-          <Button
-            buttonType="fab"
-            icon={<HintIcon />}
-            // onClick={handleOnHelpClick}
-          />
+          <Button3 icon={<HintIcon />} />
         </div>
       </div>
     </>
diff --git a/client/src/data/EastWingMobilePaths.json b/client/src/data/EastWingMobilePaths.json
index 0ca1df2..dc18a4a 100644
--- a/client/src/data/EastWingMobilePaths.json
+++ b/client/src/data/EastWingMobilePaths.json
@@ -4,35 +4,35 @@
     "d": "M286.49,419.5l72.75-9.76c2.57-.35,4.49-2.55,4.49-5.15v-78.37c0-2.52,1.8-4.67,4.27-5.12l12.06-2.17c2.47-.44,4.27-2.6,4.27-5.11v-14.97c0-2.55,1.85-4.73,4.35-5.13l59.66-9.65c.54-.09,1.1-.09,1.64,0l73.38,11.77c.52.08,1.05.09,1.57,0l29.78-4.39c.51-.08,1.04-.07,1.55,0l156.39,24.43c.52.08,1.05.08,1.57,0l22.71-3.46c.52-.08,1.04-.08,1.56,0l84.15,12.95c1.88.29,3.27,1.91,3.27,3.82s1.26,3.4,3.05,3.76c53.97,10.82,128.21,10.91,129.5,10.91.04,0,.04,0,.08,0,.16,0,.66.02,1.47.04v132.1h-78.46l-419.1-44.36c-.38-.04-.75-.04-1.13,0l-173.55,19.82c-3.07.35-5.76-2.06-5.76-5.16v-21.65c0-2.6,1.92-4.81,4.49-5.15Z"
   },
   {
-    "data-name": "31 floor",
+    "data-name": "East 31 floor",
     "d": "M286.39,498.27c-2.35.23-4.39-1.62-4.39-3.98v-32.54c0-2.03,1.52-3.73,3.53-3.97l175.36-20.73c.3-.04.6-.04.89,0l416.7,44.13h76.52c2.21,0,4,1.79,4,4v31.82c0,2.21-1.79,4-4,4h-76.52l-411.65-40.11c-.26-.02-.52-.02-.77,0l-179.68,17.39Z"
   },
   {
-    "data-name": "30 floor",
+    "data-name": "East 30 floor",
     "d": "M286.34,548.3c-2.33.2-4.34-1.64-4.34-3.99v-32.76c0-2.04,1.54-3.76,3.57-3.98l180.47-19.54c.27-.03.55-.03.82,0l411.63,39.94h76.52c2.21,0,4,1.79,4,4v32.02c0,2.21-1.79,4-4,4h-76.52l-411.7-34.94c-.22-.02-.45-.02-.68,0l-179.77,15.24Z"
   },
   {
-    "data-name": "29 floor",
+    "data-name": "East 29 floor",
     "d": "M286.27,596.64c-2.31.16-4.27-1.68-4.27-3.99v-33.28c0-2.07,1.58-3.8,3.64-3.98l180.47-16.36c.23-.02.46-.02.68,0l411.69,33.45h76.52c2.21,0,4,1.79,4,4v32.52c0,2.21-1.79,4-4,4h-76.52l-412.04-28.4-180.18,12.04Z"
   },
   {
-    "data-name": "28 floor",
+    "data-name": "East 28 floor",
     "d": "M286.23,646.88c-2.29.13-4.23-1.7-4.23-3.99v-34.32c0-2.08,1.6-3.82,3.68-3.99l180.47-14.55c.2-.02.4-.02.6,0l411.74,28.44h76.52c2.21,0,4,1.79,4,4v33.54c0,2.21-1.79,4-4,4h-76.52l-412.04-23.26-180.22,10.14Z"
   },
   {
-    "data-name": "27 floor",
+    "data-name": "East 27 floor",
     "d": "M286.14,694.86c-2.26.08-4.14-1.73-4.14-4v-32.34c0-2.12,1.65-3.87,3.77-3.99l180.68-10.53,412.04,21.42h76.52c2.21,0,4,1.79,4,4v31.58c0,2.21-1.79,4-4,4h-76.52l-412.04-16.46-180.31,6.32Z"
   },
   {
-    "data-name": "26 floor",
+    "data-name": "East 26 floor",
     "d": "M286.1,744.38c-2.25.05-4.1-1.75-4.1-4v-32.85c0-2.14,1.68-3.89,3.81-4l180.64-8.53,412.04,15.92h76.52c2.21,0,4,1.79,4,4v32.08c0,2.21-1.79,4-4,4h-76.52l-412.04-10.89-180.35,4.27Z"
   },
   {
-    "data-name": "25 floor",
+    "data-name": "East 25 floor",
     "d": "M285.99,792.23c-2.22,0-4.02-1.79-4.01-4.01l.05-33.49c0-2.16,1.73-3.93,3.89-3.99l180.57-4.96,412.02,10.87,76.51.11c2.21,0,4,1.8,3.99,4.01l-.05,32.7c0,2.21-1.8,4-4.01,3.99l-76.51-.11-412.03-5.77-180.43.64Z"
   },
   {
-    "data-name": "24 floor",
+    "data-name": "East 24 floor",
     "d": "M285.97,842.59c-2.2-.02-3.97-1.8-3.97-4v-33.67c0-2.18,1.75-3.96,3.93-4l180.51-2.93,412.04,4.45h76.52c2.21,0,4,1.79,4,4v32.88c0,2.21-1.79,4-4,4h-76.52l-412.04.67-180.48-1.41Z"
   },
   {
@@ -40,79 +40,79 @@
     "d": "M282,1014.07v-149.93c0-2.88,2.35-5.2,5.22-5.18l178.99,1.65,411.51-3.62h82.27v152.49l-6.95-.13-75.33-.04-395.2,22.68-195.68-12.76c-2.72-.18-4.84-2.44-4.84-5.17Z"
   },
   {
-    "data-name": "21 floor",
+    "data-name": "East 21 floor",
     "d": "M285.66,1083.78c-2.07-.18-3.66-1.91-3.66-3.99v-42.18c0-2.3,1.94-4.13,4.24-3.99l196.1,11.69,396.15-21.13,76.46-1.12c2.23-.03,4.06,1.77,4.06,4v38.97c0,2.21-1.79,4-4,4h-76.52l-411.73,28.95c-.21.01-.41.01-.62-.01l-180.48-15.19Z"
   },
   {
-    "data-name": "20 floor",
+    "data-name": "East 20 floor",
     "d": "M285.63,1133.02c-2.05-.19-3.63-1.92-3.63-3.98v-34.09c0-2.33,1.98-4.17,4.31-3.99l179.84,13.91c.2.02.4.02.6,0l411.74-29.87h76.52c2.21,0,4,1.79,4,4v32.08c0,2.21-1.79,4-4,4h-76.52l-411.68,34.89c-.24.02-.48.02-.71,0l-180.47-16.95Z"
   },
   {
-    "data-name": "19 floor",
+    "data-name": "East 19 floor",
     "d": "M285.58,1182.93c-2.04-.21-3.58-1.93-3.58-3.97v-33.68c0-2.34,2.02-4.19,4.36-3.98l179.75,16c.23.02.46.02.7,0l411.69-35.3h76.52c2.21,0,4,1.79,4,4v31.7c0,2.21-1.79,4-4,4h-76.52l-411.63,40.26c-.27.03-.54.03-.81,0l-180.46-19.03Z"
   },
   {
-    "data-name": "18 floor",
+    "data-name": "East 18 floor",
     "d": "M285.51,1231.45c-2-.25-3.51-1.95-3.51-3.97v-32.6c0-2.37,2.05-4.22,4.4-3.98l179.92,18.18c.27.02.53.02.8,0l412.25-41.08h76.63c2.21,0,4,1.79,4,4v31.88c0,2.21-1.79,4-4,4h-76.63l-412.18,46.07c-.31.03-.63.03-.94-.01l-180.75-22.49Z"
   },
   {
-    "data-name": "17 floor",
+    "data-name": "East 17 floor",
     "d": "M285.42,1279.7c-1.97-.28-3.42-1.97-3.42-3.95v-33.15c0-2.4,2.1-4.26,4.48-3.97l179.5,21.82c.31.03.63.03.94,0l411.56-47.45h76.52c2.21,0,4,1.79,4,4v32.43c0,2.21-1.79,4-4,4h-76.52l-411.49,52.5c-.36.05-.72.04-1.08-.01l-180.48-26.22Z"
   },
   {
-    "data-name": "16 floor",
+    "data-name": "East 16 floor",
     "d": "M285.35,1329.17c-1.93-.32-3.35-1.99-3.35-3.95v-33.24c0-2.44,2.15-4.3,4.56-3.97l179.36,25.28c.36.05.72.05,1.07,0l411.5-53.29h76.52c2.21,0,4,1.79,4,4v32.55c0,2.21-1.79,4-4,4h-76.52l-411.43,58.36c-.4.06-.81.06-1.21-.01l-180.49-29.73Z"
   },
   {
-    "data-name": "15 floor",
+    "data-name": "East 15 floor",
     "d": "M285.33,1379.36c-1.93-.33-3.33-2-3.33-3.95v-34.21c0-2.45,2.18-4.33,4.6-3.96l179.26,27.34c.39.06.78.07,1.17.01l411.45-58.59h76.52c2.21,0,4,1.79,4,4v32.28c0,2.21-1.79,4-4,4h-76.21c-.21,0-.41.01-.61.05l-411.09,63.57c-.42.07-.85.06-1.28-.01l-180.48-30.53Z"
   },
   {
-    "data-name": "14 floor",
+    "data-name": "East 14 floor",
     "d": "M285.24,1425.91c-1.88-.36-3.24-2.01-3.24-3.92v-32.63c0-2.48,2.23-4.36,4.67-3.95l179.14,30.49c.42.07.86.07,1.28,0l411.09-63.85c.2-.03.41-.05.61-.05h76.21c2.21,0,4,1.79,4,4v31.98c0,2.21-1.79,4-4,4h-76.18c-.22,0-.44.02-.66.06l-410.99,68.84c-.47.08-.95.07-1.42-.02l-180.5-34.95Z"
   },
   {
-    "data-name": "13 floor",
+    "data-name": "East 13 floor",
     "d": "M285.17,1476.45c-1.85-.4-3.17-2.03-3.17-3.92v-35.32c0-2.52,2.3-4.41,4.77-3.93l178.95,35c.48.09.98.09,1.46.01l410.99-72.04c.21-.04.42-.06.63-.06l76.14-1.13c2.23-.03,4.06,1.77,4.06,4v33.39c0,2.19-1.76,3.97-3.94,4l-76.23,1.13c-.23,0-.46.03-.68.07l-410.91,77.2c-.52.1-1.05.09-1.57-.02l-180.5-38.38Z"
   },
   {
-    "data-name": "12 floor",
+    "data-name": "East 12 floor",
     "d": "M285.11,1523.63c-1.82-.42-3.11-2.03-3.11-3.9v-34.56c0-2.55,2.34-4.44,4.83-3.92l178.85,37.79c.51.11,1.04.12,1.56.02l412.12-76.66c.2-.04.41-.06.61-.06l74.92-2.22c2.25-.06,4.12,1.74,4.12,4v32.69c0,2.16-1.72,3.93-3.88,4l-75.13,2.22c-.22,0-.44.03-.66.07l-412.04,81.73c-.55.11-1.12.11-1.67-.02l-180.51-41.18Z"
   },
   {
-    "data-name": "11 floor",
+    "data-name": "East 11 floor",
     "d": "M285.07,1573.59c-1.8-.43-3.07-2.04-3.07-3.89v-34.4c0-2.56,2.37-4.47,4.87-3.91l178.76,39.79c.54.12,1.1.13,1.64.02l410.89-80.8c.22-.04.44-.07.66-.07l76.07-2.21c2.25-.07,4.12,1.74,4.12,4v32.55c0,2.16-1.72,3.94-3.88,4l-76.28,2.21c-.24.01-.47.04-.7.09l-410.81,85.85c-.58.12-1.17.11-1.75-.03l-180.51-43.2Z"
   },
   {
-    "data-name": "10 floor",
+    "data-name": "East 10 floor",
     "d": "M285.03,1623.62c-1.78-.45-3.03-2.05-3.03-3.88v-34.07c0-2.57,2.4-4.48,4.91-3.89l178.68,41.72c.57.13,1.16.14,1.73.02l410.85-85.97c.21-.05.43-.07.65-.08l76.02-3.29c2.27-.1,4.17,1.72,4.17,4v32.24c0,2.15-1.69,3.91-3.83,4l-76.34,3.3c-.23.01-.46.04-.69.09l-410.77,90.99c-.6.13-1.23.12-1.84-.03l-180.51-45.15Z"
   },
   {
-    "data-name": "9 floor",
+    "data-name": "East 9 floor",
     "d": "M284.96,1672.11c-1.75-.47-2.96-2.06-2.96-3.86v-34.09c0-2.61,2.45-4.52,4.98-3.88l178.55,45.12c.61.16,1.24.16,1.85.03l410.76-91.87c.23-.05.47-.08.7-.09l75.99-3.29c2.27-.1,4.17,1.72,4.17,4v32.3c0,2.14-1.69,3.9-3.83,4l-76.31,3.3c-.25.01-.5.05-.75.1l-410.68,96.89c-.65.15-1.32.14-1.96-.03l-180.51-48.63Z"
   },
   {
-    "data-name": "8 floor",
+    "data-name": "East 8 floor",
     "d": "M285.91,1721.51c-1.72-.49-2.91-2.06-2.91-3.85v-34.3c0-2.63,2.49-4.55,5.03-3.87l178.44,47.62c.64.17,1.32.18,1.96.03l410.74-98.22c.21-.05.42-.09.64-.1l75.9-5.51c2.32-.17,4.29,1.67,4.29,3.99v32.53c0,2.09-1.62,3.83-3.71,3.99l-76.46,5.54c-.23.02-.46.06-.69.11l-410.66,103.27c-.68.17-1.39.16-2.07-.03l-180.51-51.2Z"
   },
   {
-    "data-name": "7 floor",
+    "data-name": "East 7 floor",
     "d": "M284.85,1770.29c-1.69-.51-2.85-2.06-2.85-3.83v-34.07c0-2.66,2.54-4.57,5.1-3.85l178.33,50.75c.67.19,1.38.2,2.06.03l410.69-102.27c.2-.05.41-.08.62-.1l75.86-6.57c2.34-.21,4.34,1.64,4.34,3.98v32.33c0,2.08-1.59,3.81-3.66,3.99l-76.52,6.63c-.22.02-.45.06-.67.11l-410.62,107.3c-.71.18-1.46.17-2.16-.04l-180.53-54.39Z"
   },
   {
-    "data-name": "6 floor",
+    "data-name": "East 6 floor",
     "d": "M284.81,1819.36c-1.67-.52-2.81-2.07-2.81-3.82v-33.86c0-2.68,2.57-4.6,5.13-3.84l178.26,52.62c.7.21,1.43.22,2.14.04l410.67-106.32c.2-.05.4-.08.6-.1l75.81-7.64c2.36-.23,4.4,1.62,4.4,3.98v32.15c0,2.06-1.56,3.78-3.6,3.98l-76.59,7.71c-.22.02-.43.06-.65.12l-410.59,111.32c-.73.19-1.51.18-2.24-.05l-180.53-56.29Z"
   },
   {
-    "data-name": "5 floor",
+    "data-name": "East 5 floor",
     "d": "M284.76,1868.94c-1.65-.53-2.76-2.07-2.76-3.8v-33.92c0-2.69,2.61-4.62,5.18-3.82l178.16,54.94c.73.22,1.5.24,2.23.03l410.59-112.16c.21-.06.43-.1.65-.12l75.78-7.65c2.35-.23,4.4,1.62,4.4,3.98v32.23c0,2.06-1.55,3.78-3.6,3.98l-76.56,7.73c-.23.02-.47.07-.7.13l-410.52,117.18c-.76.21-1.58.2-2.33-.05l-180.53-58.68Z"
   },
   {
-    "data-name": "Podium",
+    "data-name": "Podium Level",
     "d": "M470,1946.14v57.66c0,1.73,1.1,3.26,2.74,3.8l126.89,42.22c33.98,11.31,70.07,14.87,105.6,10.42l254.77-31.91v-210.33h-2.59l-50.22,3.62c-20.48,1.47-40.74,5.13-60.44,10.92l-373.89,109.76c-1.7.5-2.87,2.06-2.87,3.84Z"
   },
   {
-    "data-name": "Ground",
+    "data-name": "Ground Level",
     "d": "M567.92,2093.89l-255.08-92.93c-2.61-.95-5.37.98-5.37,3.75v113.19c0,1.51-.86,2.9-2.22,3.58l-2.04,1.02c-1.36.67-2.22,2.06-2.22,3.58v2.6c0,.88.35,1.72.97,2.34.62.62.97,1.47.97,2.34v65.11c0,1.58.93,3.02,2.38,3.66l186.32,82.4c.7.31,1.48.41,2.23.29l462.74-72.01c1.95-.31,3.39-1.98,3.39-3.96v-124.09c0-2.42-2.13-4.28-4.52-3.97l-230.26,30.33c-42.07,6.02-100.37,3.44-157.29-17.23Z"
   }
 ]
diff --git a/client/src/data/WestWingMobilePaths.json b/client/src/data/WestWingMobilePaths.json
index c1f7ff0..daf0d10 100644
--- a/client/src/data/WestWingMobilePaths.json
+++ b/client/src/data/WestWingMobilePaths.json
@@ -108,11 +108,11 @@
     "d": "M619.52,1876.99c1.99-.26,3.48-1.96,3.48-3.97v-34.43c0-2.4-2.1-4.26-4.49-3.97l-181.23,22.23c-.84.1-1.69-.06-2.43-.47l-30.71-17.08c-.32-.18-.67-.32-1.03-.4l-320.51-75.21c-.26-.06-.52-.1-.79-.1l-76.69-2.46c-2.26-.07-4.13,1.74-4.13,4v32.65c0,2.13,1.68,3.89,3.81,3.99l77.02,3.58c.25.01.5.04.75.1l320.51,76.98c.37.09.72.23,1.05.42l30.67,17.48c.76.44,1.64.61,2.5.5l182.2-23.84Z"
   },
   {
-    "data-name": "Podium",
+    "data-name": "Podium Level",
     "d": "M33.35,1820H.85l-.85.06v209.32l424.5-53.06c2-.25,3.5-1.95,3.5-3.96v-46.9c0-1.47-.81-2.83-2.11-3.53l-30.3-16.25c-7.19-3.85-14.82-6.82-22.73-8.82l-268.83-68.05c-23.1-5.85-46.85-8.81-70.68-8.81Z"
   },
   {
-    "data-name": "Ground",
+    "data-name": "Ground Level",
     "d": "M558.05,2102.19v21.04c0,1.97-1.43,3.65-3.38,3.95L4.62,2213.03c-2.43.38-4.62-1.5-4.62-3.95v-123.76c0-2.01,1.49-3.71,3.48-3.97l581-76.75c2.4-.32,4.52,1.55,4.52,3.96v74.6c0,2.02-1.5,3.72-3.5,3.97l-22.78,2.85c-1.2.15-1.4,1.81-.26,2.23.45.17.75.61.75,1.09v3.04c0,1.49-1.11,2.74-2.58,2.92-1.47.19-2.58,1.44-2.58,2.93Z"
   }
 ]
diff --git a/client/src/data/floorPaths.json b/client/src/data/floorPaths.json
index a8814a6..c85a695 100644
--- a/client/src/data/floorPaths.json
+++ b/client/src/data/floorPaths.json
@@ -7,14 +7,6 @@
     "data-name": "Sky Garden",
     "d": "M2450.23,1858.75v-55.15c0-2.22-1.81-4.02-4.04-4l-145.49.14h-53.38l-220.63-1.41h-125.46l-318,2.79-138.31-1.27c-2.23-.02-4.04,1.77-4.04,4v115.8c0,2.11,1.64,3.86,3.74,4l151.21,9.85,305.4-17.51,58.2.03,7.86.14,271.8,9.8,38.36,3.28,186.91-3.59c2.18-.05,3.92-1.82,3.92-4v-54.9c0-2.21-1.79-4-4-4h-10.05c-2.21,0-4-1.79-4-4Z"
   },
-  {
-    "data-name": "Podium",
-    "d": "M1587.83,2640.32v43.12c0,1.72,1.1,3.25,2.74,3.8l85.47,28.43c33.98,11.3,70.04,14.85,105.57,10.41l509.72-63.82c2-.25,3.5-1.95,3.5-3.96v-35.08c0-1.48-.81-2.83-2.11-3.53l-20.56-11.04c-7.19-3.87-14.83-6.84-22.75-8.85l-197.74-50.14c-23.14-5.87-46.91-8.83-70.79-8.83h-17.05l-31.71,2.28c-20.47,1.47-40.72,5.13-60.41,10.91l-281.01,82.46c-1.7.5-2.87,2.07-2.87,3.84Z"
-  },
-  {
-    "data-name": "Ground",
-    "d": "M1663.06,2753.99l-195.69-71.53c-2.61-.95-5.37.98-5.37,3.76v85.81c0,1.51-.86,2.9-2.21,3.58l-.58.28c-1.35.68-2.21,2.07-2.21,3.58v1.47c0,.68.27,1.33.75,1.81s.75,1.13.75,1.81v49.84c0,1.58.93,3.01,2.38,3.65l143.04,63.47c.71.31,1.48.42,2.24.3l786.46-122.79c1.94-.31,3.38-1.98,3.38-3.95v-15.56c0-1.16.86-2.13,2-2.27,1.14-.14,2-1.11,2-2.27v-2.36c0-.37-.23-.71-.58-.84-.88-.33-.73-1.62.2-1.73l16.88-2.11c2-.25,3.5-1.95,3.5-3.97v-56.06c0-2.41-2.13-4.28-4.52-3.96l-631,83.39c-32.48,4.66-77.48,2.66-121.42-13.35Z"
-  },
   {
     "data-name": "East 31 floor",
     "d": "M1445.56,1520.63c-2.35.24-4.39-1.61-4.39-3.98v-23.81c0-2.02,1.51-3.73,3.52-3.97l134.43-16.16c.3-.03.61-.03.91,0l321.48,34.61h58.14c2.21,0,4,1.79,4,4v23.24c0,2.21-1.79,4-4,4h-58.14l-317.6-31.46c-.26-.03-.52-.03-.78,0l-137.57,13.53Z"
@@ -214,5 +206,13 @@
   {
     "data-name": "West 5 floor",
     "d": "M2442.66,2585.29c1.99-.26,3.48-1.96,3.48-3.97v-24.64c0-2.4-2.1-4.26-4.48-3.97l-139.39,16.95c-.83.1-1.68-.06-2.41-.47l-23.48-12.95c-.32-.18-.67-.31-1.03-.39l-248.56-57.83c-.26-.06-.52-.09-.78-.1l-58.52-1.86c-2.26-.07-4.13,1.74-4.13,4v23.29c0,2.14,1.69,3.9,3.82,4l58.85,2.7c.25.02.5.05.74.11l248.57,59.19c.37.09.72.23,1.04.41l23.45,13.25c.75.43,1.62.6,2.48.49l140.35-18.21Z"
+  },
+  {
+    "data-name": "Podium Level",
+    "d": "M1587.83,2640.32v43.12c0,1.72,1.1,3.25,2.74,3.8l85.47,28.43c33.98,11.3,70.04,14.85,105.57,10.41l509.72-63.82c2-.25,3.5-1.95,3.5-3.96v-35.08c0-1.48-.81-2.83-2.11-3.53l-20.56-11.04c-7.19-3.87-14.83-6.84-22.75-8.85l-197.74-50.14c-23.14-5.87-46.91-8.83-70.79-8.83h-17.05l-31.71,2.28c-20.47,1.47-40.72,5.13-60.41,10.91l-281.01,82.46c-1.7.5-2.87,2.07-2.87,3.84Z"
+  },
+  {
+    "data-name": "Ground Level",
+    "d": "M1663.06,2753.99l-195.69-71.53c-2.61-.95-5.37.98-5.37,3.76v85.81c0,1.51-.86,2.9-2.21,3.58l-.58.28c-1.35.68-2.21,2.07-2.21,3.58v1.47c0,.68.27,1.33.75,1.81s.75,1.13.75,1.81v49.84c0,1.58.93,3.01,2.38,3.65l143.04,63.47c.71.31,1.48.42,2.24.3l786.46-122.79c1.94-.31,3.38-1.98,3.38-3.95v-15.56c0-1.16.86-2.13,2-2.27,1.14-.14,2-1.11,2-2.27v-2.36c0-.37-.23-.71-.58-.84-.88-.33-.73-1.62.2-1.73l16.88-2.11c2-.25,3.5-1.95,3.5-3.97v-56.06c0-2.41-2.13-4.28-4.52-3.96l-631,83.39c-32.48,4.66-77.48,2.66-121.42-13.35Z"
   }
 ]
diff --git a/client/src/index.css b/client/src/index.css
index 48f183d..40d9336 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -53,7 +53,7 @@ body {
 
 @layer components {
   .infinite-animation {
-    animation: infiniter 75s linear infinite;
+    animation: infiniter 300s linear infinite;
   }
 
   @keyframes infiniter {
@@ -171,6 +171,7 @@ body {
   }
 
   input[type="number"].input_number {
+    appearance: textfield;
     -moz-appearance: textfield;
   }
 
diff --git a/client/src/main.tsx b/client/src/main.tsx
index 99e9e23..09fcc63 100644
--- a/client/src/main.tsx
+++ b/client/src/main.tsx
@@ -14,7 +14,6 @@ import AboutProjectsPage from "./pages/AboutProjectsPage";
 import SearchPage from "./pages/SearchPage";
 import FavoritesPage from "./pages/FavoritesPage";
 import TestPage from "./pages/TestPage";
-import FloorSelectionMobilePage from "./pages/FloorSelectionMobilePage";
 
 const router = createBrowserRouter([
   {
@@ -37,10 +36,6 @@ const router = createBrowserRouter([
         path: "masterplan/:complexId/wing",
         element: <ComplexWingPage />,
       },
-      {
-        path: "masterplan/:complexId/wing/:wing",
-        element: <FloorSelectionMobilePage />,
-      },
       {
         path: "virtual-tour/:unitType",
         element: <VirtualTourPage />,
diff --git a/client/src/pages/AboutProjectsPage.tsx b/client/src/pages/AboutProjectsPage.tsx
index 4ea3ce7..9ebe6de 100644
--- a/client/src/pages/AboutProjectsPage.tsx
+++ b/client/src/pages/AboutProjectsPage.tsx
@@ -2,12 +2,12 @@ import { useNavigate } from "react-router-dom";
 import AdvantageCard from "../components/AboutProject/AdvantageCard";
 import PlaceCard from "../components/AboutProject/PlaceCard";
 import UnitCard from "../components/AboutProject/UnitCard";
-import Button2 from "../components/Button2";
 import ArrowLeftIcon from "../components/icons/ArrowLeftIcon";
 import Logo2Icon from "../components/icons/Logo2Icon";
 import ConsultantCard from "../components/AboutProject/ConsultantCard";
 import Slider from "../components/AboutProject/Slider";
 import SliderMobile from "../components/AboutProject/SliderMobile";
+import Button3 from "../components/Button3";
 
 function AboutProjectsPage() {
   const navigate = useNavigate();
@@ -16,12 +16,12 @@ function AboutProjectsPage() {
     <div className="mt-[58px] sm:py-16 py-10 sm:space-y-[100px] space-y-20 select-none overflow-x-hidden">
       <div className="px-4 space-y-16 lg:px-6">
         <div className="space-y-4 lg:space-y-6 sm:space-y-5">
-          <Button2
+          <Button3
             icon={<ArrowLeftIcon />}
-            onClick={() => navigate("/masterplan/1/wing")}
+            onClick={() => navigate(-1)}
           >
             Masterplan
-          </Button2>
+          </Button3>
           <p className="lg:text-[56px] sm:text-[40px] text-[28px] text-[#0D1922] font-mixcase -tracking-[1.68px] leading-none">
             Rove Home this residence a complete ecosystem that has everything
             you’ll ever need. This isn’t just where you’ll live.
@@ -277,12 +277,12 @@ function AboutProjectsPage() {
                     </p>
                   </div>
                 </div>
-                <Button2
+                <Button3
                   onClick={() => navigate("/about")}
                   className="max-lg:min-w-48 min-w-40"
                 >
                   Learn more
-                </Button2>
+                </Button3>
               </div>
               <div className="w-full">
                 <img
diff --git a/client/src/pages/ComplexPage.tsx b/client/src/pages/ComplexPage.tsx
index 184ca6d..61773f8 100644
--- a/client/src/pages/ComplexPage.tsx
+++ b/client/src/pages/ComplexPage.tsx
@@ -1,13 +1,21 @@
+import { isMobile } from "react-device-detect";
 import ButtomPanelCompass from "../components/ButtomPanelCompass";
 import ComplexTopPanel from "../components/complexPage/ComplexTopPanel";
 import SequenceSlider from "../components/complexPage/SequenceSlider";
+import SequenceSliderMobile from "../components/complexPage/SequenceSliderMobile";
 
 function ComplexPage() {
   return (
-    <div className="overflow-hidden h-screen w-screen select-none">
-      <ComplexTopPanel />
-      <SequenceSlider path={"/images/sequence"} />
-      <ButtomPanelCompass />
+    <div className="w-screen h-screen overflow-hidden select-none">
+      {!isMobile ? (
+        <>
+          <ComplexTopPanel />
+          <SequenceSlider path={"/images/sequence"} />
+          <ButtomPanelCompass />
+        </>
+      ) : (
+        <SequenceSliderMobile />
+      )}
     </div>
   );
 }
diff --git a/client/src/pages/ComplexWingPage.tsx b/client/src/pages/ComplexWingPage.tsx
index 3c42030..f1a954f 100644
--- a/client/src/pages/ComplexWingPage.tsx
+++ b/client/src/pages/ComplexWingPage.tsx
@@ -1,11 +1,11 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import { useEffect, useRef, useState } from "react";
+import { useRef, useState } from "react";
 import FloorPath from "../components/FloorPath";
 import floorPaths from "../data/floorPaths.json";
 import ArrowLeftIcon from "../components/icons/ArrowLeftIcon";
 import Button3 from "../components/Button3";
 import InfoIcon from "../components/icons/InfoIcon";
-import Header from "../components/Header";
+// import Header from "../components/Header";
 import { useNavigate } from "react-router-dom";
 import { isMobile } from "react-device-detect";
 
@@ -13,31 +13,37 @@ import FloorPopup from "../components/FloorPopup";
 import FloorSidebarContainer from "../components/FloorSidebarContainer";
 import FloorPlan from "../components/FloorPlan";
 import FloorPlanSkyGarden from "../components/FloorPlanSkyGarden";
+import FloorLabels from "../components/FloorLabels";
+import SelectWingMobile from "../components/SelectWingMobile";
+import FloorSelectionMobilePage from "./FloorSelectionMobilePage";
+import IPath from "../types/IPath";
+import FloorPlanRooftop from "../components/FloorPlanRooftop";
+import FloorPlanPodiumLevel from "../components/FloorPlanPodiumLevel";
+import FloorPlanGroundLevel from "../components/FloorPlanGroundLevel";
 
 function ComplexWingPage() {
   const ref = useRef<HTMLImageElement>(null);
   const [imageWidth, setImageWidth] = useState(0);
   const [imageHeight, setImageHeight] = useState(0);
-  const [scaled, setScaled] = useState(false);
   const [mousePos, setMousePos] = useState<[number, number]>([0, 0]);
   const navigate = useNavigate();
-  const [hoveredFloorPath, setHoveredFloorPath] =
-    useState<SVGPathElement | null>(null);
+  const [hoveredFloorPath, setHoveredFloorPath] = useState<SVGPathElement | null>(null);
   // const [selectedFloorPath, setSelectedFloorPath] =
   //   useState<SVGPathElement | null>(null);
   const [sidebarComponent, setSidebarComponent] = useState<{
     element: JSX.Element;
-    name: "Floor" | "Rooftop" | "Sky Garden" | "Podium" | "Ground";
+    name: "Floor" | "Rooftop" | "Sky Garden" | "Podium Level" | "Ground Level";
     desc?: string;
   } | null>(null);
+  const [selectedWing, setSelectedWing] = useState<"east" | "west" | null>(null);
 
-  function handleResize() {
-    if (window.innerHeight > window.innerWidth) {
-      setScaled(true);
-    } else {
-      setScaled(false);
-    }
-  }
+  // function handleResize() {
+  //   if (window.innerHeight > window.innerWidth) {
+  //     setScaled(true);
+  //   } else {
+  //     setScaled(false);
+  //   }
+  // }
 
   function handleMouseEnter(e: React.MouseEvent<SVGPathElement>) {
     setHoveredFloorPath(e.currentTarget);
@@ -54,28 +60,39 @@ function ComplexWingPage() {
     setHoveredFloorPath(null);
   }
 
-  function handleClick(e: React.MouseEvent<SVGPathElement>) {
-    if (e.currentTarget.dataset["name"]?.includes("floor")) {
-      const wing = e.currentTarget.dataset["name"]
-        .split(" ")[0]
-        .toLowerCase() as "east" | "west";
-      const floor = e.currentTarget.dataset["name"].split(" ")[1];
+  function handleClick(path: IPath) {
+    console.log("path", path);
+
+    if (path["data-name"].includes("floor")) {
+      const wing = path["data-name"].split(" ")[0].toLowerCase() as "east" | "west";
+      const floor = path["data-name"].split(" ")[1];
       setSidebarComponent({
         element: <FloorPlan wing={wing} floor={floor} />,
         name: "Floor",
       });
-    } else if (e.currentTarget.dataset["name"] === "Sky Garden") {
+    } else if (path["data-name"] === "Sky Garden") {
       setSidebarComponent({
         element: <FloorPlanSkyGarden />,
         name: "Sky Garden",
         desc: "22-23 floor",
       });
-    } else if (e.currentTarget.dataset["name"] === "Rooftop") {
-      //
-    } else if (e.currentTarget.dataset["name"] === "Podium") {
-      //
-    } else if (e.currentTarget.dataset["name"] === "Ground") {
-      //
+    } else if (path["data-name"] === "Rooftop") {
+      setSidebarComponent({
+        element: <FloorPlanRooftop />,
+        name: "Rooftop",
+        desc: "32 floor",
+      });
+    } else if (path["data-name"] === "Podium Level") {
+      setSidebarComponent({
+        element: <FloorPlanPodiumLevel />,
+        name: "Podium Level",
+        desc: "4 floor",
+      });
+    } else if (path["data-name"] === "Ground Level") {
+      setSidebarComponent({
+        element: <FloorPlanGroundLevel />,
+        name: "Ground Level",
+      });
     }
   }
 
@@ -84,110 +101,142 @@ function ComplexWingPage() {
     setImageHeight(ref.current!.naturalHeight);
   }
 
-  useEffect(() => {
-    handleResize();
+  // useEffect(() => {
+  //   handleResize();
 
-    window.addEventListener("resize", handleResize);
+  //   window.addEventListener("resize", handleResize);
 
-    return () => {
-      window.removeEventListener("resize", handleResize);
-    };
-  }, []);
+  //   return () => {
+  //     window.removeEventListener("resize", handleResize);
+  //   };
+  // }, []);
 
   return (
-    <div
-      className="relative overflow-hidden select-none h-dvh"
-      onMouseMove={handleMouseMove}
-    >
-      <Header />
+    <>
+      {!isMobile ? (
+        <div className="relative overflow-hidden select-none h-dvh" onMouseMove={handleMouseMove}>
+          {/* <Header /> */}
 
-      <FloorPopup
-        visible={!!hoveredFloorPath}
-        mousePos={[mousePos[0], mousePos[1]]}
-        path={hoveredFloorPath}
-      />
+          <FloorPopup visible={!!hoveredFloorPath} mousePos={[mousePos[0], mousePos[1]]} path={hoveredFloorPath} />
 
-      <div className="absolute top-0 left-0 z-10 w-full">
-        <div className="p-3 mt-14">
-          <div className="flex sm:gap-2 max-sm:justify-between">
-            <div className="">
-              <Button3
-                size="small"
-                icon={<ArrowLeftIcon />}
-                onlyIcon
-                onClick={() =>
-                  isMobile ? navigate("/") : navigate("/masterplan/1")
-                }
-              />
-            </div>
-            <div className="font-semibold text-center text-white sm:hidden">
-              <p className="text-base">ROVE Home Marasi Drive</p>
-              <p className="text-xs">Select a wing</p>
-            </div>
-            <div className="">
-              <Button3
-                variant="secondary"
-                icon={<InfoIcon />}
-                onClick={() => navigate("/about-projects")}
-                className="max-sm:hidden"
-              >
-                About Projects
-              </Button3>
-              <Button3
-                variant="secondary"
-                icon={<InfoIcon />}
-                onlyIcon
-                onClick={() => navigate("/about-projects")}
-                className="sm:hidden"
-              />
+          <div className="absolute top-0 left-0 z-10 w-full">
+            <div className="p-3 mt-14">
+              <div className="flex sm:gap-2 max-sm:justify-between">
+                <div className="">
+                  <Button3
+                    size="small"
+                    icon={<ArrowLeftIcon />}
+                    onlyIcon
+                    onClick={() => (isMobile ? navigate("/") : navigate("/masterplan/1"))}
+                  />
+                </div>
+                <div className="font-semibold text-center text-white sm:hidden">
+                  <p className="text-base">ROVE Home Marasi Drive</p>
+                  <p className="text-xs">Select a wing</p>
+                </div>
+                <div className="">
+                  <Button3
+                    variant="secondary"
+                    icon={<InfoIcon className="w-5 h-5" />}
+                    className="max-sm:hidden"
+                    onClick={() => navigate("/about-projects")}
+                  >
+                    About Projects
+                  </Button3>
+                  <Button3
+                    variant="secondary"
+                    icon={<InfoIcon />}
+                    onlyIcon
+                    className="sm:hidden"
+                    onClick={() => navigate("/about-projects")}
+                  />
+                </div>
+              </div>
             </div>
           </div>
+
+          <div className={`h-dvh transition-all duration-300 ${sidebarComponent ? "-translate-x-1/4" : ""}`}>
+            <img
+              ref={ref}
+              src="/images/sequenceWing.jpg"
+              alt=""
+              className="object-cover w-full h-full"
+              onLoad={() => handleLoadedData()}
+            />
+
+            {!isMobile ? (
+              <svg
+                viewBox={`0 0 ${imageWidth} ${imageHeight}`}
+                preserveAspectRatio="xMidYMid slice"
+                className="absolute top-0 left-0 w-full h-full"
+              >
+                {floorPaths.map((floorPath, index) => (
+                  <FloorPath
+                    key={index}
+                    {...floorPath}
+                    selected={false}
+                    onMouseEnter={handleMouseEnter}
+                    onMouseLeave={handleMouseLeave}
+                    onClick={() => handleClick(floorPath)}
+                  />
+                ))}
+
+                <FloorLabels />
+              </svg>
+            ) : (
+              <></>
+            )}
+          </div>
         </div>
-      </div>
+      ) : (
+        <div className="relative overflow-hidden select-none">
+          {!selectedWing ? (
+            <div className="">
+              <div className="fixed top-0 left-0 z-10 flex items-start justify-between w-full p-3 mt-14">
+                <Button3 icon={<ArrowLeftIcon />} onlyIcon onClick={() => navigate("/masterplan/1")} />
+                <div className="font-semibold text-center text-white">
+                  <p className="text-base capitalize">ROVE Home Marasi Drive</p>
+                  <p className="text-xs">Select a wing</p>
+                </div>
+                <Button3
+                  variant="secondary"
+                  icon={<InfoIcon className="w-5 h-5" />}
+                  onlyIcon
+                  onClick={() => navigate("/about-projects")}
+                />
+              </div>
 
-      <div
-        className={`h-dvh transition-all duration-300 ${
-          scaled ? "scale-150 -translate-x-[1%]" : ""
-        } ${sidebarComponent ? "-translate-x-1/4" : ""}`}
-      >
-        <img
-          ref={ref}
-          src="/images/sequenceWing.jpg"
-          alt=""
-          className="object-cover w-full h-full"
-          onLoad={() => handleLoadedData()}
-        />
+              <div className="scale-150 h-dvh">
+                <img
+                  ref={ref}
+                  src="/images/sequenceWing.jpg"
+                  alt=""
+                  className="object-cover w-full h-full"
+                  onLoad={() => handleLoadedData()}
+                />
+                <svg
+                  viewBox={`0 0 ${imageWidth} ${imageHeight}`}
+                  preserveAspectRatio="xMidYMid slice"
+                  className="absolute top-0 left-0 w-full h-full"
+                >
+                  <SelectWingMobile onClick={(wing) => setSelectedWing(wing)} />
 
-        {!isMobile ? (
-          <svg
-            viewBox={`0 0 ${imageWidth} ${imageHeight}`}
-            preserveAspectRatio="xMidYMid slice"
-            className="absolute top-0 left-0 w-full h-full"
-          >
-            {floorPaths.map((floorPath) => (
-              <FloorPath
-                {...floorPath}
-                selected={false}
-                onMouseEnter={handleMouseEnter}
-                onMouseLeave={handleMouseLeave}
-                onClick={handleClick}
-              />
-            ))}
-          </svg>
-        ) : (
-          <svg
-            viewBox={`0 0 ${imageWidth} ${imageHeight}`}
-            preserveAspectRatio="xMidYMid slice"
-            className="absolute top-0 left-0 w-full h-full"
-          ></svg>
-        )}
-      </div>
+                  <FloorLabels />
+                </svg>
+              </div>
+            </div>
+          ) : (
+            <FloorSelectionMobilePage
+              wing={selectedWing}
+              onUnselectWing={() => setSelectedWing(null)}
+              onSelectPath={(path) => (path ? handleClick(path) : console.log(path))}
+            />
+          )}
+        </div>
+      )}
 
-      <FloorSidebarContainer
-        sidebarComponent={sidebarComponent}
-        onClose={() => setSidebarComponent(null)}
-      />
-    </div>
+      <FloorSidebarContainer sidebarComponent={sidebarComponent} onClose={() => setSidebarComponent(null)} />
+    </>
   );
 }
 
diff --git a/client/src/pages/FavoritesPage.tsx b/client/src/pages/FavoritesPage.tsx
index 88db827..71df11a 100644
--- a/client/src/pages/FavoritesPage.tsx
+++ b/client/src/pages/FavoritesPage.tsx
@@ -6,12 +6,11 @@ import HeartIcon from "../components/icons/HeartIcon";
 import UnitModalForSearchPage from "../components/modals/UnitModalForSearchPage";
 import unitTypes from "../data/unitTypes.json";
 import HeartFilledIcon from "../components/icons/HeartFilledIcon";
-import Button from "../components/Button";
 import BookingIcon from "../components/icons/BookingIcon";
 import IUnit from "../types/IUnit";
-import Button2 from "../components/Button2";
 import SearchIcon from "../components/icons/SearchIcon";
 import { useNavigate } from "react-router-dom";
+import Button3 from "../components/Button3";
 
 function FavoritesPage() {
   const { favoriteUnits, setFavoriteUnits } = useFavoritesStore();
@@ -300,13 +299,13 @@ function FavoritesPage() {
                   </p>
                 </div>
                 <div className="">
-                  <Button
-                    buttonType="cta"
+                  <Button3
                     icon={<BookingIcon />}
-                    text="Send Enquiry"
-                    className="justify-center text-sm disabled:hover:bg-[#ECEDEE] w-full"
+                    className="justify-center w-full text-sm"
                     disabled
-                  />
+                  >
+                    Send Enquiry
+                  </Button3>
                 </div>
               </div>
             ))}
@@ -327,14 +326,14 @@ function FavoritesPage() {
                 <p>Apartments added from the 3D model will also appear here.</p>
               </div>
             </div>
-            <Button2
+            <Button3
               icon={<SearchIcon className="w-6 h-6" />}
               size="large"
               className="max-sm:w-full"
               onClick={() => navigate("/search")}
             >
               Search
-            </Button2>
+            </Button3>
           </div>
         )}
       </div>
diff --git a/client/src/pages/FloorSelectionMobilePage.tsx b/client/src/pages/FloorSelectionMobilePage.tsx
index 0a2a922..5a5e1b4 100644
--- a/client/src/pages/FloorSelectionMobilePage.tsx
+++ b/client/src/pages/FloorSelectionMobilePage.tsx
@@ -1,24 +1,26 @@
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import _eastWingPaths from "../data/EastWingMobilePaths.json";
 import _westWingPaths from "../data/WestWingMobilePaths.json";
 import { Transition } from "react-transition-group";
-import { useNavigate, useParams } from "react-router-dom";
 import ArrowLeftIcon from "../components/icons/ArrowLeftIcon";
 import InfoIcon from "../components/icons/InfoIcon";
 import EastWingFloorLabels from "../components/EastWingFloorLabels";
 import WestWingFloorLabels from "../components/WestWingFloorLabels";
 import Button3 from "../components/Button3";
-
-interface IPath {
-  "data-name": string;
-  d: string;
-}
+import IPath from "../types/IPath";
+import IFloorPopupItem from "../types/IFloorPopupItem";
+import { useNavigate } from "react-router-dom";
 
 const eastWingPaths = _eastWingPaths as IPath[];
 const westWingPaths = _westWingPaths as IPath[];
 
-function FloorSelectionMobilePage() {
-  const { wing } = useParams();
+interface Props {
+  wing: "east" | "west";
+  onUnselectWing: () => void;
+  onSelectPath: (path: IPath | null) => void;
+}
+
+function FloorSelectionMobilePage({ wing, onUnselectWing, onSelectPath }: Props) {
   const imageRef = useRef<HTMLImageElement>(null);
   const [width, setWidth] = useState<number>();
   const [height, setHeight] = useState<number>();
@@ -26,9 +28,13 @@ function FloorSelectionMobilePage() {
   const [selectedPathName, setSelectedPathName] = useState<string | null>(null);
   const [touched, setTouched] = useState<boolean>(false);
   const [moved, setMoved] = useState<boolean>(false);
+  // const navigate = useNavigate();
+  const [floorSidebarComponent] = useState<JSX.Element | null>(null);
+
+  const [, setName] = useState<string>();
+  const [items, setItems] = useState<IFloorPopupItem[]>([]);
+
   const navigate = useNavigate();
-  const [floorSidebarComponent] =
-    useState<JSX.Element | null>(null);
 
   function handleLoad() {
     setWidth(imageRef.current!.naturalWidth);
@@ -58,64 +64,147 @@ function FloorSelectionMobilePage() {
   }
 
   function handleClickExplore() {
-    if (!wing) return;
-
-    if (selectedPathName?.includes("floor")) {
-      const floor = +selectedPathName.replace(" floor", "");
-      console.log("floor", floor);
-    }
+    console.log("selectedPath", selectedPath);
+    onSelectPath(selectedPath);
   }
 
-  // useEffect(() => {
-  //   if (!selectedPathName) return;
+  useEffect(() => {
+    if (!selectedPath) return;
 
-  //   if (selectedPathName.includes("floor")) {
-  //     const floorNumber = +selectedPathName.replace(" floor", "");
+    const name = selectedPath["data-name"];
 
-  //     if (floorNumber > 24) {
-  //     } else {
-  //     }
-  //   }
-  // }, [selectedPathName]);
+    if (name?.includes("floor")) {
+      const floor = name.split(" ")[1];
+      const wing = name.split(" ")[0];
+      setName(`${floor} floor`);
+
+      if (wing === "East") {
+        setItems([
+          {
+            count: 7,
+            title: "Studio²",
+          },
+          {
+            count: 8,
+            title: "1 Bedroom",
+          },
+          {
+            count: 1,
+            title: "2 Bedroom²",
+          },
+        ]);
+      } else {
+        if (+floor > 21) {
+          // upper
+          setItems([
+            {
+              count: 5,
+              title: "Studio²",
+            },
+            {
+              count: 8,
+              title: "1 Bedroom",
+            },
+            {
+              count: 2,
+              title: "2 Bedroom²",
+            },
+          ]);
+        } else {
+          // lower
+          setItems([
+            {
+              count: 6,
+              title: "Studio Flex",
+            },
+            {
+              count: 3,
+              title: "Studio²",
+            },
+            {
+              count: 6,
+              title: "1 Bedroom",
+            },
+            {
+              count: 1,
+              title: "2 Bedroom²",
+            },
+          ]);
+        }
+      }
+    } else {
+      setName(name);
+
+      switch (name) {
+        case "Rooftop":
+          setItems([
+            {
+              count: 10,
+              title: "Amenities",
+            },
+          ]);
+          break;
+
+        case "Sky Garden":
+          setItems([
+            {
+              count: 3,
+              title: "Indoor Amenities",
+            },
+            {
+              count: 14,
+              title: "Outdoor Amenities",
+            },
+          ]);
+          break;
+
+        case "Podium Level":
+          setItems([
+            {
+              count: 13,
+              title: "Indoor Amenities",
+            },
+            {
+              count: 14,
+              title: "Outdoor Amenities",
+            },
+          ]);
+          break;
+
+        case "Ground Level":
+          setItems([
+            {
+              count: 7,
+              title: "Amenities",
+            },
+          ]);
+          break;
+
+        default:
+          break;
+      }
+    }
+  }, [selectedPath]);
 
   return (
-    <div
-      onTouchStart={handleTouchStart}
-      onTouchMove={handleTouchMove}
-      onTouchEnd={handleTouchEnd}
-    >
+    <div onTouchStart={handleTouchStart} onTouchMove={handleTouchMove} onTouchEnd={handleTouchEnd}>
       <div className="fixed top-0 left-0 z-10 flex justify-between w-full p-3 mt-14">
-        <div>
-          {/* <button
-            className="p-2.5 rounded-lg bg-[#00BED7] text-white"
-            onClick={() => navigate(-1)}
-          >
-            <ArrowLeftIcon />
-          </button> */}
-          <Button3
-            size="small"
-            icon={<ArrowLeftIcon />}
-            onlyIcon
-            onClick={() => navigate("/masterplan/1/wing")}
-          />
-        </div>
+        <Button3 size="small" icon={<ArrowLeftIcon />} onlyIcon onClick={onUnselectWing} />
         <div className="font-semibold text-white">
           <p className="text-base capitalize">{wing} Wing</p>
           <p className="text-xs">Select a floor</p>
         </div>
-        <div className="">
-          <button className="p-2.5 rounded-lg bg-white">
-            <InfoIcon />
-          </button>
-        </div>
+        <Button3
+          variant="secondary"
+          icon={<InfoIcon className="w-5 h-5" />}
+          onlyIcon
+          onClick={() => navigate("/about-projects")}
+        />
       </div>
 
       <img
         ref={imageRef}
-        src={`/images/${
-          (wing === "east" && "EastWingMobile") ||
-          (wing === "west" && "WestWingMobile")
-        }.jpg`}
+        src={`/images/${(wing === "east" && "EastWingMobile") || (wing === "west" && "WestWingMobile")}.jpg`}
         alt=""
         className="object-cover w-full h-full"
         onLoad={handleLoad}
@@ -133,9 +222,7 @@ function FloorSelectionMobilePage() {
               key={index}
               {...path}
               className={`fill-[#00bed766] transition-[fill] ${
-                selectedPath && path["data-name"] === selectedPathName
-                  ? "fill-[#00bed7]/80"
-                  : "fill-[#00bed7]/40"
+                selectedPath && path["data-name"] === selectedPathName ? "fill-[#00bed7]/80" : "fill-[#00bed7]/40"
               }`}
               onClick={() => handleClickPath(path)}
             />
@@ -148,13 +235,9 @@ function FloorSelectionMobilePage() {
               key={index}
               {...path}
               className={`fill-[#00bed766] transition-[fill] ${
-                selectedPath && path["data-name"] === selectedPathName
-                  ? "fill-[#00bed7]/80"
-                  : "fill-[#00bed7]/40"
+                selectedPath && path["data-name"] === selectedPathName ? "fill-[#00bed7]/80" : "fill-[#00bed7]/40"
               }`}
-              onClick={() => (
-                setSelectedPath(path), setSelectedPathName(path["data-name"])
-              )}
+              onClick={() => (setSelectedPath(path), setSelectedPathName(path["data-name"]))}
             />
           ))}
 
@@ -171,28 +254,15 @@ function FloorSelectionMobilePage() {
             <div className="w-full p-4 space-y-4 bg-white rounded-lg">
               <div className="relative flex items-start justify-between pb-4 border-b border-[#E2E2DC]">
                 <div>
-                  <p className="font-semibold text-[#0D1922]">
-                    {selectedPathName}
-                  </p>
+                  <p className="font-semibold text-[#0D1922]">{selectedPathName}</p>
                   <div className="">
-                    <p className="text-[#0D1922]/70 text-xs font-semibold capitalize">
-                      {wing} Wing
-                    </p>
+                    <p className="text-[#0D1922]/70 text-xs font-semibold capitalize">{wing} Wing</p>
                     {/* <div className="w-1 h-1 bg-[#E2E2DC] rounded-full"></div> */}
                     {/* <p></p> */}
                   </div>
                 </div>
-                <button
-                  className="p-2.5 absolute -top-2.5 -right-2.5"
-                  onClick={() => setSelectedPath(null)}
-                >
-                  <svg
-                    width={16}
-                    height={16}
-                    viewBox="0 0 16 16"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
+                <button className="p-2.5 absolute -top-2.5 -right-2.5" onClick={() => setSelectedPath(null)}>
+                  <svg width={16} height={16} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
                     <path
                       fillRule="evenodd"
                       clipRule="evenodd"
@@ -204,19 +274,24 @@ function FloorSelectionMobilePage() {
                 </button>
               </div>
 
+              <div className="grid grid-cols-2 gap-2">
+                {items.map((item, index) => (
+                  <div key={index} className="flex items-center gap-2">
+                    <div className="flex items-center justify-center w-5 h-5 rounded-full bg-[#00BED7] text-white text-[10px] font-semibold font-mono">
+                      {item.count}
+                    </div>
+                    <p className="text-xs">{item.title}</p>
+                  </div>
+                ))}
+              </div>
+
               <div className="">
                 <button
                   className="text-white bg-[#00BED7] py-2.5 px-3 rounded-lg w-full text-xs font-semibold flex justify-center items-center gap-1"
                   onClick={handleClickExplore}
                 >
                   <span>Explore</span>
-                  <svg
-                    width={17}
-                    height={16}
-                    viewBox="0 0 17 16"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
+                  <svg width={17} height={16} viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
                     <path
                       fillRule="evenodd"
                       clipRule="evenodd"
diff --git a/client/src/pages/UnitTypesItemPage.tsx b/client/src/pages/UnitTypesItemPage.tsx
index 817ce95..12c1bd6 100644
--- a/client/src/pages/UnitTypesItemPage.tsx
+++ b/client/src/pages/UnitTypesItemPage.tsx
@@ -1,10 +1,10 @@
 import unitTypes from "../data/unitTypes.json";
 // import { useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
-import Button from "../components/Button";
 import LeftArrowSliderIcon from "../components/icons/LeftArrowSliderIcon";
 import VirtualTourIcon from "../components/icons/VirtualTourIcon";
 import { useState } from "react";
+import Button3 from "../components/Button3";
 
 function UnitTypesItemPage() {
   const params = useParams();
@@ -15,21 +15,21 @@ function UnitTypesItemPage() {
 
   return (
     <div className="mt-[58px] lg:p-6 p-4 flex max-lg:flex-col gap-4 select-none">
-      <div className="flex-1 flex flex-col gap-4">
+      <div className="flex flex-col flex-1 gap-4">
         <div className="flex items-center gap-4">
-          <Button
-            buttonType="cta"
+          <Button3
             icon={<LeftArrowSliderIcon />}
+            onlyIcon
             onClick={() => navigate("..")}
           />
-          <p className="lg:text-2xl text-xl font-semibold">{unitType?.title}</p>
+          <p className="text-xl font-semibold lg:text-2xl">{unitType?.title}</p>
         </div>
-        <div className="flex-1 flex max-sm:flex-col justify-between lg:gap-10 gap-4 bg-white rounded-2xl lg:p-10 sm:p-8 p-4">
-          <div className="sm:w-1/3 max-sm:order-last space-y-4">
+        <div className="flex justify-between flex-1 gap-4 p-4 bg-white max-sm:flex-col lg:gap-10 rounded-2xl lg:p-10 sm:p-8">
+          <div className="space-y-4 sm:w-1/3 max-sm:order-last">
             <div className="max-lg:hidden border-b border-[#E2E2DC] pb-2">
               <p className="text-xl font-semibold">Legend</p>
             </div>
-            <div className="grid max-lg:grid-cols-2 gap-2">
+            <div className="grid gap-2 max-lg:grid-cols-2">
               {unitType?.legends.map((legend, index) => (
                 <div className="flex  gap-2 items-center max-lg:bg-[#F3F3F2] max-lg:p-2 rounded-lg font-semibold text-[10px]">
                   <div className="min-w-4 min-h-4 bg-[#00BED7] text-white rounded-full text-[10px] font-semibold flex items-center justify-center">
@@ -40,7 +40,7 @@ function UnitTypesItemPage() {
               ))}
             </div>
           </div>
-          <div className="sm:w-2/3 flex flex-col sm:items-center justify-between lg:gap-10 gap-6">
+          <div className="flex flex-col justify-between gap-6 sm:w-2/3 sm:items-center lg:gap-10">
             {unitType?.images.length && unitType?.images.length > 1 ? (
               <>
                 <div className="max-w-[628px] max-h-[628px] max-sm:order-last">
@@ -107,11 +107,11 @@ function UnitTypesItemPage() {
       </div>
 
       <div className="lg:w-[376px] lg:flex flex-col grid lg:grid-cols-1 sm:grid-cols-2 grid-cols-1 sm:gap-2 gap-3">
-        <div className="overflow-hidden bg-white rounded-2xl lg:col-start-auto sm:col-start-2 sm:row-start-auto row-start-2">
+        <div className="row-start-2 overflow-hidden bg-white rounded-2xl lg:col-start-auto sm:col-start-2 sm:row-start-auto">
           <img
             src="/images/pages/UnitTypesItem/studio-flex.jpg"
             alt=""
-            className="aspect-square object-cover"
+            className="object-cover aspect-square"
           />
         </div>
         <div
@@ -134,20 +134,21 @@ function UnitTypesItemPage() {
               ))}
             </div>
           </div>
-          <p className="sm:text-sm text-xs">
+          <p className="text-xs sm:text-sm">
             Up to {unitType?.sqft.toFixed(0)} Sqft
           </p>
           {/* <p className="text-xl text-[#00BED7]">from AED 1,668,888</p> */}
         </div>
         {unitType?.tourAvailable && (
-          <div className="sm:p-8 p-4 bg-white rounded-2xl lg:col-start-auto sm:col-start-2 h-fit">
-            <Button
-              buttonType="secondary"
+          <div className="p-4 bg-white sm:p-8 rounded-2xl lg:col-start-auto sm:col-start-2 h-fit">
+            <Button3
+              variant="secondary"
               icon={<VirtualTourIcon />}
-              text="3D tour"
               className="flex items-center justify-center w-full"
               onClick={() => navigate(`/virtual-tour/${unitType.type}`)}
-            />
+            >
+              3D tour
+            </Button3>
           </div>
         )}
       </div>
diff --git a/client/src/pages/VirtualTourPage.tsx b/client/src/pages/VirtualTourPage.tsx
index 997fc41..41867ce 100644
--- a/client/src/pages/VirtualTourPage.tsx
+++ b/client/src/pages/VirtualTourPage.tsx
@@ -8,12 +8,12 @@ import ButtomPanelCompassVirtualTour from "../components/virtualTour/ButtomPanel
 import _apartment from "../data/apartments.json";
 import useModal from "../store/useModal";
 import LoaderModal from "../components/modals/LoaderModal";
-import Button from "../components/Button";
 import ArrowLeftIcon from "../components/icons/ArrowLeftIcon";
 import IUnit from "../types/IUnit";
 import api from "../utils/api";
 import VirtualTourCard from "../components/virtualTour/VirtualTourCard";
 import { isMobile } from "react-device-detect";
+import Button3 from "../components/Button3";
 
 const apartments = _apartment as IAppartmentComplex[];
 const tours = [
@@ -98,9 +98,9 @@ const VirtualTour = () => {
         <VirtualTourCard unit={unit} type={unitType} />
       ) : (
         <div className="absolute top-[calc(58px+1rem)] left-4 z-[99999993]">
-          <Button
-            buttonType="cta"
+          <Button3
             icon={<ArrowLeftIcon />}
+            onlyIcon
             onClick={() => navigate(-1)}
           />
         </div>
diff --git a/client/src/types/IFloorPopupItem.ts b/client/src/types/IFloorPopupItem.ts
new file mode 100644
index 0000000..ab69759
--- /dev/null
+++ b/client/src/types/IFloorPopupItem.ts
@@ -0,0 +1,6 @@
+interface IFloorPopupItem {
+  count: number;
+  title: string;
+}
+
+export default IFloorPopupItem;
diff --git a/client/src/types/IPath.ts b/client/src/types/IPath.ts
new file mode 100644
index 0000000..64f663f
--- /dev/null
+++ b/client/src/types/IPath.ts
@@ -0,0 +1,6 @@
+interface IPath {
+  "data-name": string;
+  d: string;
+}
+
+export default IPath;