diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 85bf2ac..ad97b8c 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -57,24 +57,16 @@ export default function AboutPage() {
           useInvertedBackground="noInvert"
           members={[
             {
-              id: "1",
-              name: "Victoria Ashford",
-              imageSrc: "https://img.b2bpic.net/free-photo/friendly-successful-business-woman-posing-with-arms-crossed_74855-2813.jpg"
+              id: "1",              name: "Victoria Ashford",              imageSrc: "https://img.b2bpic.net/free-photo/friendly-successful-business-woman-posing-with-arms-crossed_74855-2813.jpg"
             },
             {
-              id: "2",
-              name: "Richard Sterling",
-              imageSrc: "https://img.b2bpic.net/free-photo/businesswoman-leader-modern-office-with-businesspeople-workin_1139-956.jpg"
+              id: "2",              name: "Richard Sterling",              imageSrc: "https://img.b2bpic.net/free-photo/businesswoman-leader-modern-office-with-businesspeople-workin_1139-956.jpg"
             },
             {
-              id: "3",
-              name: "Margaret Chen",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-successful-entrepreneur_1098-3855.jpg"
+              id: "3",              name: "Margaret Chen",              imageSrc: "https://img.b2bpic.net/free-photo/close-up-successful-entrepreneur_1098-3855.jpg"
             },
             {
-              id: "4",
-              name: "James Mitchell",
-              imageSrc: "https://img.b2bpic.net/free-photo/smiling-businesswoman-looking-through-window_1262-1977.jpg"
+              id: "4",              name: "James Mitchell",              imageSrc: "https://img.b2bpic.net/free-photo/smiling-businesswoman-looking-through-window_1262-1977.jpg"
             }
           ]}
         />
@@ -102,8 +94,7 @@ export default function AboutPage() {
         copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
         columns={[
           {
-            title: "Properties",
-            items: [
+            title: "Properties",            items: [
               { label: "Featured Listings", href: "/properties" },
               { label: "Coming Soon", href: "#" },
               { label: "Sold Properties", href: "#" },
@@ -111,8 +102,7 @@ export default function AboutPage() {
             ]
           },
           {
-            title: "Company",
-            items: [
+            title: "Company",            items: [
               { label: "About Us", href: "/about" },
               { label: "Our Team", href: "/about" },
               { label: "Market Insights", href: "#" },
@@ -120,8 +110,7 @@ export default function AboutPage() {
             ]
           },
           {
-            title: "Services",
-            items: [
+            title: "Services",            items: [
               { label: "Property Sales", href: "#" },
               { label: "Acquisitions", href: "#" },
               { label: "Valuations", href: "#" },
@@ -129,8 +118,7 @@ export default function AboutPage() {
             ]
           },
           {
-            title: "Contact",
-            items: [
+            title: "Contact",            items: [
               { label: "Schedule Tour", href: "/contact" },
               { label: "Contact Form", href: "/contact" },
               { label: "Support", href: "#" },
diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 94a5d08..5b9e53f 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -6,6 +6,7 @@ import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
 import { useBlogPosts } from "@/hooks/useBlogPosts";
+import Link from 'next/link';
 
 export default function BlogPage() {
     const { posts, isLoading } = useBlogPosts();
@@ -29,12 +30,11 @@ export default function BlogPage() {
                         brandName="Prestige Realty"
                         navItems={[
                             { name: "Home", id: "/" },
-                            { name: "Properties", id: "properties" },
-                            { name: "About", id: "about" },
-                            { name: "Team", id: "team" },
-                            { name: "Contact", id: "contact" }
+                            { name: "Properties", id: "/properties" },
+                            { name: "About", id: "/about" },
+                            { name: "Contact", id: "/contact" }
                         ]}
-                        button={{ text: "Schedule Tour", href: "contact" }}
+                        button={{ text: "Schedule Tour", href: "/contact" }}
                     />
                 </div>
 
@@ -88,14 +88,14 @@ export default function BlogPage() {
                             },
                             {
                                 title: "Contact",                                items: [
-                                    { label: "Schedule Tour", href: "#contact" },
-                                    { label: "Contact Form", href: "#contact" },
+                                    { label: "Schedule Tour", href: "/contact" },
+                                    { label: "Contact Form", href: "/contact" },
                                     { label: "Support", href: "#" },
                                     { label: "Inquiries", href: "#" }
                                 ]
                             }
                         ]}
-                        onPrivacyClick={null}
+                        onPrivacyClick={() => console.log('Privacy clicked')}
                     />
                 </div>
             </ReactLenis>
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index e72a800..ac0906a 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -45,29 +45,19 @@ export default function ContactPage() {
           animationType="slide-up"
           faqs={[
             {
-              id: "1",
-              title: "How do you ensure property confidentiality?",
-              content: "We implement multi-layered confidentiality protocols including non-disclosure agreements, private showings by appointment only, and discretionary market positioning. Our network operates under strict privacy standards respected across the luxury real estate industry."
+              id: "1",              title: "How do you ensure property confidentiality?",              content: "We implement multi-layered confidentiality protocols including non-disclosure agreements, private showings by appointment only, and discretionary market positioning. Our network operates under strict privacy standards respected across the luxury real estate industry."
             },
             {
-              id: "2",
-              title: "What is the typical timeline for selling a luxury property?",
-              content: "Most luxury properties sell within 3-6 months with our strategic marketing approach. Complex or ultra-high-value properties may extend to 9-12 months. We prioritize finding the right buyer at the right price rather than rushing to sale."
+              id: "2",              title: "What is the typical timeline for selling a luxury property?",              content: "Most luxury properties sell within 3-6 months with our strategic marketing approach. Complex or ultra-high-value properties may extend to 9-12 months. We prioritize finding the right buyer at the right price rather than rushing to sale."
             },
             {
-              id: "3",
-              title: "Do you handle international property transactions?",
-              content: "Yes, we specialize in international acquisitions and sales. Our team manages cross-border transactions, currency considerations, tax implications, and all regulatory requirements. We work with vetted international partners in key markets."
+              id: "3",              title: "Do you handle international property transactions?",              content: "Yes, we specialize in international acquisitions and sales. Our team manages cross-border transactions, currency considerations, tax implications, and all regulatory requirements. We work with vetted international partners in key markets."
             },
             {
-              id: "4",
-              title: "How is your commission structured?",
-              content: "We offer flexible commission models based on transaction complexity, property value, and scope of services. Typical buyer commissions range from 2-3%, while seller representation is negotiable. We discuss transparent pricing before engagement."
+              id: "4",              title: "How is your commission structured?",              content: "We offer flexible commission models based on transaction complexity, property value, and scope of services. Typical buyer commissions range from 2-3%, while seller representation is negotiable. We discuss transparent pricing before engagement."
             },
             {
-              id: "5",
-              title: "What makes your portfolio evaluation process unique?",
-              content: "Our proprietary valuation methodology combines comparable market analysis, investment potential assessment, and lifestyle positioning. We consider not just current market value but future appreciation potential and investment returns."
+              id: "5",              title: "What makes your portfolio evaluation process unique?",              content: "Our proprietary valuation methodology combines comparable market analysis, investment potential assessment, and lifestyle positioning. We consider not just current market value but future appreciation potential and investment returns."
             }
           ]}
         />
@@ -95,8 +85,7 @@ export default function ContactPage() {
         copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
         columns={[
           {
-            title: "Properties",
-            items: [
+            title: "Properties",            items: [
               { label: "Featured Listings", href: "/properties" },
               { label: "Coming Soon", href: "#" },
               { label: "Sold Properties", href: "#" },
@@ -104,8 +93,7 @@ export default function ContactPage() {
             ]
           },
           {
-            title: "Company",
-            items: [
+            title: "Company",            items: [
               { label: "About Us", href: "/about" },
               { label: "Our Team", href: "/about" },
               { label: "Market Insights", href: "#" },
@@ -113,8 +101,7 @@ export default function ContactPage() {
             ]
           },
           {
-            title: "Services",
-            items: [
+            title: "Services",            items: [
               { label: "Property Sales", href: "#" },
               { label: "Acquisitions", href: "#" },
               { label: "Valuations", href: "#" },
@@ -122,8 +109,7 @@ export default function ContactPage() {
             ]
           },
           {
-            title: "Contact",
-            items: [
+            title: "Contact",            items: [
               { label: "Schedule Tour", href: "/contact" },
               { label: "Contact Form", href: "/contact" },
               { label: "Support", href: "#" },
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 996af5d..b6c6e68 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -5,31 +5,20 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 
 const notoSans = Noto_Sans({
-  variable: "--font-noto-sans",
-  subsets: ["latin"],
+  variable: "--font-noto-sans",  subsets: ["latin"],
 });
 
 export const metadata: Metadata = {
-  title: "Prestige Realty | Luxury Real Estate Portfolio",
-  description: "Discover exceptional luxury properties and expert real estate services. Browse our curated portfolio of premium estates and book your private consultation today.",
-  keywords: ["luxury real estate", "premium properties", "estate sales", "high-end homes", "real estate investment"],
+  title: "Prestige Realty | Luxury Real Estate Portfolio",  description: "Discover exceptional luxury properties and expert real estate services. Browse our curated portfolio of premium estates and book your private consultation today.",  keywords: ["luxury real estate", "premium properties", "estate sales", "high-end homes", "real estate investment"],
   openGraph: {
-    title: "Prestige Realty | Luxury Real Estate Portfolio",
-    description: "Discover exceptional luxury properties and expert real estate services tailored for discerning clients worldwide.",
-    siteName: "Prestige Realty",
-    type: "website",
-    images: [
+    title: "Prestige Realty | Luxury Real Estate Portfolio",    description: "Discover exceptional luxury properties and expert real estate services tailored for discerning clients worldwide.",    siteName: "Prestige Realty",    type: "website",    images: [
       {
-        url: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912529.jpg",
-        alt: "Luxury oceanfront estate"
+        url: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912529.jpg",        alt: "Luxury oceanfront estate"
       }
     ]
   },
   twitter: {
-    card: "summary_large_image",
-    title: "Prestige Realty | Luxury Real Estate",
-    description: "Premium property portfolio and exclusive real estate services for elite clientele.",
-    images: ["https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912529.jpg"]
+    card: "summary_large_image",    title: "Prestige Realty | Luxury Real Estate",    description: "Premium property portfolio and exclusive real estate services for elite clientele.",    images: ["https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912529.jpg"]
   }
 };
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 6b6c833..0a81272 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -51,11 +51,8 @@ export default function HomePage() {
             { text: "Schedule Consultation", href: "/contact" }
           ]}
           dashboard={{
-            title: "Market Intelligence Hub",
-            logoIcon: Building2,
-            imageSrc: "https://img.b2bpic.net/free-photo/house-model-compass-plan-background-real-estate-concept_1423-179.jpg",
-            searchPlaceholder: "Search properties by location...",
-            sidebarItems: [
+            title: "Market Intelligence Hub",            logoIcon: Building2,
+            imageSrc: "https://img.b2bpic.net/free-photo/house-model-compass-plan-background-real-estate-concept_1423-179.jpg",            searchPlaceholder: "Search properties by location...",            sidebarItems: [
               { icon: Home, active: true },
               { icon: MapPin },
               { icon: TrendingUp }
@@ -66,33 +63,26 @@ export default function HomePage() {
             ],
             stats: [
               {
-                title: "Portfolio Value",
-                values: [2400000000, 3100000000, 3850000000],
-                valuePrefix: "$",
-                description: "Total managed assets"
+                title: "Portfolio Value",                values: [2400000000, 3100000000, 3850000000],
+                valuePrefix: "$",                description: "Total managed assets"
               },
               {
-                title: "Properties Sold",
-                values: [156, 203, 287],
+                title: "Properties Sold",                values: [156, 203, 287],
                 description: "Successful transactions"
               },
               {
-                title: "Client Satisfaction",
-                values: [94, 96, 98],
-                valueSuffix: "%",
-                description: "Customer satisfaction rate"
+                title: "Client Satisfaction",                values: [94, 96, 98],
+                valueSuffix: "%",                description: "Customer satisfaction rate"
               }
             ],
-            chartTitle: "Market Performance",
-            chartData: [
+            chartTitle: "Market Performance",            chartData: [
               { value: 75 },
               { value: 85 },
               { value: 92 },
               { value: 88 },
               { value: 95 }
             ],
-            listTitle: "Recent Acquisitions",
-            listItems: [
+            listTitle: "Recent Acquisitions",            listItems: [
               { icon: Home, title: "Beachfront Villa, Malibu", status: "Sold" },
               { icon: Building2, title: "Manhattan Penthouse", status: "Listed" },
               { icon: MapPin, title: "Swiss Alpine Estate", status: "Under Offer" }
@@ -125,27 +115,19 @@ export default function HomePage() {
           features={[
             {
               id: 1,
-              title: "Property Evaluation & Valuation",
-              description: "Expert market analysis and comprehensive property assessments leveraging decades of industry experience and proprietary market data",
-              imageSrc: "https://img.b2bpic.net/free-photo/view-luxurious-villa-with-modern-architectural-design_23-2151694112.jpg"
+              title: "Property Evaluation & Valuation",              description: "Expert market analysis and comprehensive property assessments leveraging decades of industry experience and proprietary market data",              imageSrc: "https://img.b2bpic.net/free-photo/view-luxurious-villa-with-modern-architectural-design_23-2151694112.jpg"
             },
             {
               id: 2,
-              title: "Luxury Marketing & Exposure",
-              description: "Global marketing campaigns targeting high-net-worth individuals through premium channels and exclusive networks",
-              imageSrc: "https://img.b2bpic.net/free-photo/woman-working-with-laptop-coffee-shop_53876-26321.jpg"
+              title: "Luxury Marketing & Exposure",              description: "Global marketing campaigns targeting high-net-worth individuals through premium channels and exclusive networks",              imageSrc: "https://img.b2bpic.net/free-photo/woman-working-with-laptop-coffee-shop_53876-26321.jpg"
             },
             {
               id: 3,
-              title: "Concierge Transaction Services",
-              description: "White-glove service managing every detail from due diligence through closing with absolute confidentiality",
-              imageSrc: "https://img.b2bpic.net/free-photo/female-staff-giving-boarding-pass-businessman_107420-85088.jpg"
+              title: "Concierge Transaction Services",              description: "White-glove service managing every detail from due diligence through closing with absolute confidentiality",              imageSrc: "https://img.b2bpic.net/free-photo/female-staff-giving-boarding-pass-businessman_107420-85088.jpg"
             },
             {
               id: 4,
-              title: "Portfolio Management",
-              description: "Strategic investment guidance for diversified real estate portfolios with emphasis on appreciation and income optimization",
-              imageSrc: "https://img.b2bpic.net/free-photo/business-people-working-with-ipad-high-angle_23-2150103567.jpg"
+              title: "Portfolio Management",              description: "Strategic investment guidance for diversified real estate portfolios with emphasis on appreciation and income optimization",              imageSrc: "https://img.b2bpic.net/free-photo/business-people-working-with-ipad-high-angle_23-2150103567.jpg"
             }
           ]}
         />
@@ -180,34 +162,64 @@ export default function HomePage() {
           useInvertedBackground="invertDefault"
           testimonials={[
             {
-              id: "1",
-              name: "Catherine Sterling, CEO of Sterling Industries",
-              date: "Date: 15 November 2024",
-              title: "Exceptional service and outstanding market knowledge",
-              quote: "The team at Prestige Realty demonstrated unparalleled expertise in marketing our oceanfront estate. Their global network and strategic positioning resulted in a sale well above market expectations within six months.",
-              tag: "Premium Client",
-              avatarSrc: "https://img.b2bpic.net/free-photo/portrait-smiling-successful-businesswoman-looking-into-camera-sitting-restaurant-business-lady-with-stylish-hairstyle-wears-elegant-suit-business-meeting-attractive-appearance_8353-12611.jpg",
-              imageSrc: "https://img.b2bpic.net/free-photo/beautiful-shot-resort-lanzarote-spain-sunny-day_181624-23163.jpg"
+              id: "1",              name: "Catherine Sterling, CEO of Sterling Industries",              date: "Date: 15 November 2024",              title: "Exceptional service and outstanding market knowledge",              quote: "The team at Prestige Realty demonstrated unparalleled expertise in marketing our oceanfront estate. Their global network and strategic positioning resulted in a sale well above market expectations within six months.",              tag: "Premium Client",              avatarSrc: "https://img.b2bpic.net/free-photo/portrait-smiling-successful-businesswoman-looking-into-camera-sitting-restaurant-business-lady-with-stylish-hairstyle-wears-elegant-suit-business-meeting-attractive-appearance_8353-12611.jpg",              imageSrc: "https://img.b2bpic.net/free-photo/beautiful-shot-resort-lanzarote-spain-sunny-day_181624-23163.jpg"
             },
             {
-              id: "2",
-              name: "James Pemberton, Venture Capital",
-              date: "Date: 22 October 2024",
-              title: "Professional handling of confidential transactions",
-              quote: "Managing acquisitions for my portfolio required absolute discretion. Prestige Realty's concierge service and understanding of privacy requirements made them the obvious choice for our high-value deals.",
-              tag: "Portfolio Investor",
-              avatarSrc: "https://img.b2bpic.net/free-photo/content-beautiful-businesswoman-standing-window_1262-1778.jpg",
-              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912525.jpg"
+              id: "2",              name: "James Pemberton, Venture Capital",              date: "Date: 22 October 2024",              title: "Professional handling of confidential transactions",              quote: "Managing acquisitions for my portfolio required absolute discretion. Prestige Realty's concierge service and understanding of privacy requirements made them the obvious choice for our high-value deals.",              tag: "Portfolio Investor",              avatarSrc: "https://img.b2bpic.net/free-photo/content-beautiful-businesswoman-standing-window_1262-1778.jpg",              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912525.jpg"
             },
             {
-              id: "3",
-              name: "Victoria Chen, International Investor",
-              date: "Date: 8 September 2024",
-              title: "Flawless international transaction expertise",
-              quote: "Acquiring a penthouse for our family required navigating complex international protocols. The team's expertise with cross-border transactions and local market knowledge was invaluable and made the process seamless.",
-              tag: "Elite Investor",
-              avatarSrc: "https://img.b2bpic.net/free-photo/happy-professional_1098-12931.jpg",
-              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912526.jpg"
+              id: "3",              name: "Victoria Chen, International Investor",              date: "Date: 8 September 2024",              title: "Flawless international transaction expertise",              quote: "Acquiring a penthouse for our family required navigating complex international protocols. The team's expertise with cross-border transactions and local market knowledge was invaluable and made the process seamless.",              tag: "Elite Investor",              avatarSrc: "https://img.b2bpic.net/free-photo/happy-professional_1098-12931.jpg",              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912526.jpg"
+            }
+          ]}
+        />
+      </div>
+
+      <div id="team" data-section="team">
+        <TeamCardTen
+          title="Our leadership combines decades of luxury real estate expertise with an unwavering commitment to client success and market innovation."
+          tag="The Team"
+          memberVariant="card"
+          useInvertedBackground="noInvert"
+          members={[
+            {
+              id: "1",              name: "Victoria Ashford",              imageSrc: "https://img.b2bpic.net/free-photo/friendly-successful-business-woman-posing-with-arms-crossed_74855-2813.jpg"
+            },
+            {
+              id: "2",              name: "Richard Sterling",              imageSrc: "https://img.b2bpic.net/free-photo/businesswoman-leader-modern-office-with-businesspeople-workin_1139-956.jpg"
+            },
+            {
+              id: "3",              name: "Margaret Chen",              imageSrc: "https://img.b2bpic.net/free-photo/close-up-successful-entrepreneur_1098-3855.jpg"
+            },
+            {
+              id: "4",              name: "James Mitchell",              imageSrc: "https://img.b2bpic.net/free-photo/smiling-businesswoman-looking-through-window_1262-1977.jpg"
+            }
+          ]}
+        />
+      </div>
+
+      <div id="contact" data-section="contact">
+        <ContactFaq
+          ctaTitle="Schedule Your Private Consultation"
+          ctaDescription="Connect with our team to discuss your luxury real estate goals and explore exclusive opportunities tailored to your vision."
+          ctaIcon={Phone}
+          ctaButton={{ text: "Book Consultation", href: "#" }}
+          useInvertedBackground="invertDefault"
+          animationType="slide-up"
+          faqs={[
+            {
+              id: "1",              title: "How do you ensure property confidentiality?",              content: "We implement multi-layered confidentiality protocols including non-disclosure agreements, private showings by appointment only, and discretionary market positioning. Our network operates under strict privacy standards respected across the luxury real estate industry."
+            },
+            {
+              id: "2",              title: "What is the typical timeline for selling a luxury property?",              content: "Most luxury properties sell within 3-6 months with our strategic marketing approach. Complex or ultra-high-value properties may extend to 9-12 months. We prioritize finding the right buyer at the right price rather than rushing to sale."
+            },
+            {
+              id: "3",              title: "Do you handle international property transactions?",              content: "Yes, we specialize in international acquisitions and sales. Our team manages cross-border transactions, currency considerations, tax implications, and all regulatory requirements. We work with vetted international partners in key markets."
+            },
+            {
+              id: "4",              title: "How is your commission structured?",              content: "We offer flexible commission models based on transaction complexity, property value, and scope of services. Typical buyer commissions range from 2-3%, while seller representation is negotiable. We discuss transparent pricing before engagement."
+            },
+            {
+              id: "5",              title: "What makes your portfolio evaluation process unique?",              content: "Our proprietary valuation methodology combines comparable market analysis, investment potential assessment, and lifestyle positioning. We consider not just current market value but future appreciation potential and investment returns."
             }
           ]}
         />
@@ -218,8 +230,7 @@ export default function HomePage() {
         copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
         columns={[
           {
-            title: "Properties",
-            items: [
+            title: "Properties",            items: [
               { label: "Featured Listings", href: "/properties" },
               { label: "Coming Soon", href: "#" },
               { label: "Sold Properties", href: "#" },
@@ -227,8 +238,7 @@ export default function HomePage() {
             ]
           },
           {
-            title: "Company",
-            items: [
+            title: "Company",            items: [
               { label: "About Us", href: "/about" },
               { label: "Our Team", href: "/about" },
               { label: "Market Insights", href: "#" },
@@ -236,8 +246,7 @@ export default function HomePage() {
             ]
           },
           {
-            title: "Services",
-            items: [
+            title: "Services",            items: [
               { label: "Property Sales", href: "#" },
               { label: "Acquisitions", href: "#" },
               { label: "Valuations", href: "#" },
@@ -245,8 +254,7 @@ export default function HomePage() {
             ]
           },
           {
-            title: "Contact",
-            items: [
+            title: "Contact",            items: [
               { label: "Schedule Tour", href: "/contact" },
               { label: "Contact Form", href: "/contact" },
               { label: "Support", href: "#" },
diff --git a/src/app/properties/page.tsx b/src/app/properties/page.tsx
index 5931a9a..8fb38bd 100644
--- a/src/app/properties/page.tsx
+++ b/src/app/properties/page.tsx
@@ -45,48 +45,20 @@ export default function PropertiesPage() {
           useInvertedBackground="invertDefault"
           products={[
             {
-              id: "prop-001",
-              brand: "Prestige Realty",
-              name: "Oceanfront Modern Estate",
-              price: "$8,500,000",
-              rating: 5,
-              reviewCount: "12",
-              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912529.jpg",
-              imageAlt: "Oceanfront modern estate with panoramic sea views",
-              onProductClick: () => window.open('#', '_blank')
+              id: "prop-001",              brand: "Prestige Realty",              name: "Oceanfront Modern Estate",              price: "$8,500,000",              rating: 5,
+              reviewCount: "12",              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912529.jpg",              imageAlt: "Oceanfront modern estate with panoramic sea views",              onProductClick: () => window.open('#', '_blank')
             },
             {
-              id: "prop-002",
-              brand: "Prestige Realty",
-              name: "Historic Downtown Penthouse",
-              price: "$6,200,000",
-              rating: 5,
-              reviewCount: "18",
-              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912527.jpg",
-              imageAlt: "Historic downtown penthouse with city skyline views",
-              onProductClick: () => window.open('#', '_blank')
+              id: "prop-002",              brand: "Prestige Realty",              name: "Historic Downtown Penthouse",              price: "$6,200,000",              rating: 5,
+              reviewCount: "18",              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912527.jpg",              imageAlt: "Historic downtown penthouse with city skyline views",              onProductClick: () => window.open('#', '_blank')
             },
             {
-              id: "prop-003",
-              brand: "Prestige Realty",
-              name: "Hillside Villa with Vineyards",
-              price: "$7,400,000",
-              rating: 5,
-              reviewCount: "14",
-              imageSrc: "https://img.b2bpic.net/free-photo/view-luxurious-villa-with-modern-architectural-design_23-2151694041.jpg",
-              imageAlt: "Hillside villa surrounded by private vineyards",
-              onProductClick: () => window.open('#', '_blank')
+              id: "prop-003",              brand: "Prestige Realty",              name: "Hillside Villa with Vineyards",              price: "$7,400,000",              rating: 5,
+              reviewCount: "14",              imageSrc: "https://img.b2bpic.net/free-photo/view-luxurious-villa-with-modern-architectural-design_23-2151694041.jpg",              imageAlt: "Hillside villa surrounded by private vineyards",              onProductClick: () => window.open('#', '_blank')
             },
             {
-              id: "prop-004",
-              brand: "Prestige Realty",
-              name: "Contemporary Lake House",
-              price: "$5,900,000",
-              rating: 5,
-              reviewCount: "11",
-              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912524.jpg",
-              imageAlt: "Contemporary architecture overlooking pristine lake",
-              onProductClick: () => window.open('#', '_blank')
+              id: "prop-004",              brand: "Prestige Realty",              name: "Contemporary Lake House",              price: "$5,900,000",              rating: 5,
+              reviewCount: "11",              imageSrc: "https://img.b2bpic.net/free-photo/minimalist-architecture-space_23-2151912524.jpg",              imageAlt: "Contemporary architecture overlooking pristine lake",              onProductClick: () => window.open('#', '_blank')
             }
           ]}
           gridVariant="bento-grid"
@@ -117,8 +89,7 @@ export default function PropertiesPage() {
         copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
         columns={[
           {
-            title: "Properties",
-            items: [
+            title: "Properties",            items: [
               { label: "Featured Listings", href: "/properties" },
               { label: "Coming Soon", href: "#" },
               { label: "Sold Properties", href: "#" },
@@ -126,8 +97,7 @@ export default function PropertiesPage() {
             ]
           },
           {
-            title: "Company",
-            items: [
+            title: "Company",            items: [
               { label: "About Us", href: "/about" },
               { label: "Our Team", href: "/about" },
               { label: "Market Insights", href: "#" },
@@ -135,8 +105,7 @@ export default function PropertiesPage() {
             ]
           },
           {
-            title: "Services",
-            items: [
+            title: "Services",            items: [
               { label: "Property Sales", href: "#" },
               { label: "Acquisitions", href: "#" },
               { label: "Valuations", href: "#" },
@@ -144,8 +113,7 @@ export default function PropertiesPage() {
             ]
           },
           {
-            title: "Contact",
-            items: [
+            title: "Contact",            items: [
               { label: "Schedule Tour", href: "/contact" },
               { label: "Contact Form", href: "/contact" },
               { label: "Support", href: "#" },
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index ffb467d..6b9cf81 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -11,6 +11,7 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
 import { useProductDetail } from "@/hooks/useProductDetail";
 import { useCart } from "@/hooks/useCart";
 import { useCheckout } from "@/hooks/useCheckout";
+import Link from 'next/link';
 
 interface ProductPageProps {
     params: Promise<{ id: string }>;
@@ -82,14 +83,14 @@ export default function ProductPage({ params }: ProductPageProps) {
             >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
-                    <NavbarStyleCentered
-                        brandName="Prestige Realty"
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" }
-                        ]}
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                    />
+                        <NavbarStyleCentered
+                            brandName="Prestige Realty"
+                            navItems={[
+                                { name: "Home", id: "/" },
+                                { name: "Shop", id: "/shop" }
+                            ]}
+                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        />
                     </div>
                     <main className="min-h-screen flex items-center justify-center pt-20">
                         <p className="text-foreground">Loading product...</p>
@@ -155,91 +156,91 @@ export default function ProductPage({ params }: ProductPageProps) {
         >
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
-                <NavbarStyleCentered
-                    brandName="Prestige Realty"
-                    navItems={[
-                        { name: "Home", id: "/" },
-                        { name: "Shop", id: "/shop" }
-                    ]}
-                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                />
+                    <NavbarStyleCentered
+                        brandName="Prestige Realty"
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "Shop", id: "/shop" }
+                        ]}
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    />
                 </div>
                 <div id="product-detail-card" data-section="product-detail-card">
-                <ProductDetailCard
-                    layout="page"
-                    name={product.name}
-                    price={product.price}
-                    salePrice={meta.salePrice}
-                    rating={product.rating || 0}
-                    description={product.description}
-                    images={images}
-                    variants={variants.length > 0 ? variants : undefined}
-                    quantity={quantityVariant}
-                    ribbon={meta.ribbon}
-                    inventoryStatus={meta.inventoryStatus}
-                    inventoryQuantity={meta.inventoryQuantity}
-                    sku={meta.sku}
-                    buttons={[
-                        { text: "Add To Cart", onClick: handleAddToCart },
-                        { text: "Buy Now", onClick: handleBuyNow },
-                    ]}
-                />
+                    <ProductDetailCard
+                        layout="page"
+                        name={product.name}
+                        price={product.price}
+                        salePrice={meta.salePrice}
+                        rating={product.rating || 0}
+                        description={product.description}
+                        images={images}
+                        variants={variants.length > 0 ? variants : undefined}
+                        quantity={quantityVariant}
+                        ribbon={meta.ribbon}
+                        inventoryStatus={meta.inventoryStatus}
+                        inventoryQuantity={meta.inventoryQuantity}
+                        sku={meta.sku}
+                        buttons={[
+                            { text: "Add To Cart", onClick: handleAddToCart },
+                            { text: "Buy Now", onClick: handleBuyNow },
+                        ]}
+                    />
                 </div>
                 <div id="product-cart" data-section="product-cart">
-                <ProductCart
-                    isOpen={cartOpen}
-                    onClose={() => setCartOpen(false)}
-                    items={cartItems}
-                    onQuantityChange={updateQuantity}
-                    onRemove={removeItem}
-                    total={`$${cartTotal}`}
-                    buttons={[
-                        {
-                            text: isCheckoutLoading ? "Processing..." : "Check Out",                            onClick: handleCheckout,
-                        },
-                    ]}
-                />
+                    <ProductCart
+                        isOpen={cartOpen}
+                        onClose={() => setCartOpen(false)}
+                        items={cartItems}
+                        onQuantityChange={updateQuantity}
+                        onRemove={removeItem}
+                        total={`$${cartTotal}`}
+                        buttons={[
+                            {
+                                text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
+                            },
+                        ]}
+                    />
                 </div>
                 <div id="footer" data-section="footer">
-                <FooterBaseCard
-                    logoText="Prestige Realty"
-                    copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
-                    columns={[
-                        {
-                            title: "Properties",                            items: [
-                                { label: "Featured Listings", href: "/properties" },
-                                { label: "Coming Soon", href: "#" },
-                                { label: "Sold Properties", href: "#" },
-                                { label: "Portfolio Search", href: "#" }
-                            ]
-                        },
-                        {
-                            title: "Company",                            items: [
-                                { label: "About Us", href: "/about" },
-                                { label: "Our Team", href: "#team" },
-                                { label: "Market Insights", href: "#" },
-                                { label: "Careers", href: "#" }
-                            ]
-                        },
-                        {
-                            title: "Services",                            items: [
-                                { label: "Property Sales", href: "#" },
-                                { label: "Acquisitions", href: "#" },
-                                { label: "Valuations", href: "#" },
-                                { label: "Portfolio Management", href: "#" }
-                            ]
-                        },
-                        {
-                            title: "Contact",                            items: [
-                                { label: "Schedule Tour", href: "#contact" },
-                                { label: "Contact Form", href: "#contact" },
-                                { label: "Support", href: "#" },
-                                { label: "Inquiries", href: "#" }
-                            ]
-                        }
-                    ]
-                    onPrivacyClick={null}
-                />
+                    <FooterBaseCard
+                        logoText="Prestige Realty"
+                        copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
+                        columns={[
+                            {
+                                title: "Properties",                                items: [
+                                    { label: "Featured Listings", href: "/properties" },
+                                    { label: "Coming Soon", href: "#" },
+                                    { label: "Sold Properties", href: "#" },
+                                    { label: "Portfolio Search", href: "#" }
+                                ]
+                            },
+                            {
+                                title: "Company",                                items: [
+                                    { label: "About Us", href: "/about" },
+                                    { label: "Our Team", href: "#team" },
+                                    { label: "Market Insights", href: "#" },
+                                    { label: "Careers", href: "#" }
+                                ]
+                            },
+                            {
+                                title: "Services",                                items: [
+                                    { label: "Property Sales", href: "#" },
+                                    { label: "Acquisitions", href: "#" },
+                                    { label: "Valuations", href: "#" },
+                                    { label: "Portfolio Management", href: "#" }
+                                ]
+                            },
+                            {
+                                title: "Contact",                                items: [
+                                    { label: "Schedule Tour", href: "/contact" },
+                                    { label: "Contact Form", href: "/contact" },
+                                    { label: "Support", href: "#" },
+                                    { label: "Inquiries", href: "#" }
+                                ]
+                            }
+                        ]}
+                        onPrivacyClick={() => console.log('Privacy clicked')}
+                    />
                 </div>
             </ReactLenis>
         </ThemeProvider>
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index ea3ba9b..e4d81b8 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -7,6 +7,7 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
 import { useProductCatalog } from "@/hooks/useProductCatalog";
 import { useState } from "react";
+import Link from 'next/link';
 
 export default function ShopPage() {
     const {
@@ -35,14 +36,14 @@ export default function ShopPage() {
             >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
-                    <NavbarStyleCentered
-                        brandName="Prestige Realty"
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" }
-                        ]}
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                    />
+                        <NavbarStyleCentered
+                            brandName="Prestige Realty"
+                            navItems={[
+                                { name: "Home", id: "/" },
+                                { name: "Shop", id: "/shop" }
+                            ]}
+                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        />
                     </div>
                     <main className="min-h-screen flex items-center justify-center pt-20">
                         <p className="text-foreground">Loading products...</p>
@@ -67,66 +68,66 @@ export default function ShopPage() {
         >
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
-                <NavbarStyleCentered
-                    brandName="Prestige Realty"
-                    navItems={[
-                        { name: "Home", id: "/" },
-                        { name: "Shop", id: "/shop" }
-                    ]}
-                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                />
+                    <NavbarStyleCentered
+                        brandName="Prestige Realty"
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "Shop", id: "/shop" }
+                        ]}
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    />
                 </div>
                 <div id="product-catalog" data-section="product-catalog">
-                <ProductCatalog
-                    layout="page"
-                    products={products}
-                    searchValue={search}
-                    onSearchChange={setSearch}
-                    searchPlaceholder="Search products..."
-                    filters={filters}
-                    emptyMessage="No products found"
-                />
+                    <ProductCatalog
+                        layout="page"
+                        products={products}
+                        searchValue={search}
+                        onSearchChange={setSearch}
+                        searchPlaceholder="Search products..."
+                        filters={filters}
+                        emptyMessage="No products found"
+                    />
                 </div>
                 <div id="footer" data-section="footer">
-                <FooterBaseCard
-                    logoText="Prestige Realty"
-                    copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
-                    columns={[
-                        {
-                            title: "Properties",                            items: [
-                                { label: "Featured Listings", href: "/properties" },
-                                { label: "Coming Soon", href: "#" },
-                                { label: "Sold Properties", href: "#" },
-                                { label: "Portfolio Search", href: "#" }
-                            ]
-                        },
-                        {
-                            title: "Company",                            items: [
-                                { label: "About Us", href: "/about" },
-                                { label: "Our Team", href: "#team" },
-                                { label: "Market Insights", href: "#" },
-                                { label: "Careers", href: "#" }
-                            ]
-                        },
-                        {
-                            title: "Services",                            items: [
-                                { label: "Property Sales", href: "#" },
-                                { label: "Acquisitions", href: "#" },
-                                { label: "Valuations", href: "#" },
-                                { label: "Portfolio Management", href: "#" }
-                            ]
-                        },
-                        {
-                            title: "Contact",                            items: [
-                                { label: "Schedule Tour", href: "#contact" },
-                                { label: "Contact Form", href: "#contact" },
-                                { label: "Support", href: "#" },
-                                { label: "Inquiries", href: "#" }
-                            ]
-                        }
-                    ]
-                    onPrivacyClick={null}
-                />
+                    <FooterBaseCard
+                        logoText="Prestige Realty"
+                        copyrightText="© 2025 Prestige Realty. All rights reserved. Luxury real estate excellence."
+                        columns={[
+                            {
+                                title: "Properties",                                items: [
+                                    { label: "Featured Listings", href: "/properties" },
+                                    { label: "Coming Soon", href: "#" },
+                                    { label: "Sold Properties", href: "#" },
+                                    { label: "Portfolio Search", href: "#" }
+                                ]
+                            },
+                            {
+                                title: "Company",                                items: [
+                                    { label: "About Us", href: "/about" },
+                                    { label: "Our Team", href: "#team" },
+                                    { label: "Market Insights", href: "#" },
+                                    { label: "Careers", href: "#" }
+                                ]
+                            },
+                            {
+                                title: "Services",                                items: [
+                                    { label: "Property Sales", href: "#" },
+                                    { label: "Acquisitions", href: "#" },
+                                    { label: "Valuations", href: "#" },
+                                    { label: "Portfolio Management", href: "#" }
+                                ]
+                            },
+                            {
+                                title: "Contact",                                items: [
+                                    { label: "Schedule Tour", href: "/contact" },
+                                    { label: "Contact Form", href: "/contact" },
+                                    { label: "Support", href: "#" },
+                                    { label: "Inquiries", href: "#" }
+                                ]
+                            }
+                        ]}
+                        onPrivacyClick={() => console.log('Privacy clicked')}
+                    />
                 </div>
             </ReactLenis>
         </ThemeProvider>