diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 316cb0e..5695d01 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import HeroBillboard from '@/components/sections/hero/HeroBillboard';
 import AboutMetric from '@/components/sections/about/AboutMetric';
-import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import { Award, Users, Target, Shield, CheckCircle, Star } from 'lucide-react';
+import { Star, CheckCircle, FileText, Clock, Users, Award, Building, TrendingUp } from 'lucide-react';
 
 export default function AboutPage() {
   return (
@@ -25,134 +25,63 @@ export default function AboutPage() {
         <NavbarLayoutFloatingOverlay
           brandName="Construction Property LA"
           navItems={[
-            { name: "Home", id: "/" },
-            { name: "About", id: "/about" },
-            { name: "Services", id: "/services" },
-            { name: "Portfolio", id: "/portfolio" },
-            { name: "Contact", id: "/contact" }
+            {"name":"Home","id":"/"},
+            {"name":"About","id":"/about"},
+            {"name":"Services","id":"/services"},
+            {"name":"Portfolio","id":"/portfolio"},
+            {"name":"Contact","id":"/contact"},
+            {"name":"Shop","id":"/shop"}
           ]}
-          button={{
-            text: "Get Free Estimate",
-            href: "/contact"
-          }}
+          button={{ text: "Get Free Estimate", href: "/contact" }}
         />
       </div>
-
-      <div id="about-story" data-section="about-story">
+      <div id="hero" data-section="hero">
+        <HeroBillboard
+          title="About Construction Property LA"
+          description="Family-owned construction company serving Los Angeles since 2018. We specialize in luxury remodeling, ADUs, and full home renovations with transparent pricing and exceptional craftsmanship."
+          background={{"variant":"plain"}}
+          buttons={[{"text":"Our Story","href":"#our-story"},{"text":"Meet Our Team","href":"#team"}]}
+          imageSrc="https://img.b2bpic.net/free-photo/beautiful-kitchen-interior-design_23-2150976526.jpg"
+          imageAlt="Construction Property LA team at work"
+        />
+      </div>
+      <div id="company-values" data-section="company-values">
         <AboutMetric
-          title="Construction Property LA was founded on the belief that home remodeling should be transparent, professional, and stress-free. Our team combines decades of construction expertise with modern project management to deliver exceptional results for Los Angeles homeowners."
+          title="Built on Trust, Driven by Excellence"
           useInvertedBackground={false}
+          metricsAnimation="slide-up"
           metrics={[
-            { icon: Award, label: "Years Experience", value: "15+" },
-            { icon: Users, label: "Projects Completed", value: "500+" },
-            { icon: Target, label: "Client Satisfaction", value: "98%" },
-            { icon: Shield, label: "Licensed & Bonded", value: "Fully" }
+            {"icon":Star,"label":"5-Star Rated","value":"100+ Reviews"},
+            {"icon":CheckCircle,"label":"Licensed & Insured","value":"Fully Compliant"},
+            {"icon":FileText,"label":"Projects Completed","value":"500+"},
+            {"icon":Clock,"label":"Years in Business","value":"7+"}
           ]}
         />
       </div>
-
-      <div id="our-values" data-section="our-values">
+      <div id="team-expertise" data-section="team-expertise">
         <AboutMetric
-          title="Our commitment to excellence extends beyond construction. We prioritize clear communication, fair pricing, and delivering projects on time and within budget."
+          title="Our Expert Team Delivers Results"
           useInvertedBackground={false}
+          metricsAnimation="slide-up"
           metrics={[
-            { icon: CheckCircle, label: "Quality Guarantee", value: "100%" },
-            { icon: Star, label: "5-Star Reviews", value: "Consistent" }
+            {"icon":Users,"label":"Team Members","value":"15+"},
+            {"icon":Award,"label":"Certifications","value":"Multiple"},
+            {"icon":Building,"label":"Specializations","value":"8 Areas"},
+            {"icon":TrendingUp,"label":"Client Satisfaction","value":"98%"}
           ]}
         />
       </div>
-
-      <div id="team-testimonials" data-section="team-testimonials">
-        <TestimonialCardSix
-          title="Meet Our Team Through Client Experiences"
-          description="Our skilled professionals are the backbone of every successful project. Here's what clients say about working with our team."
-          textboxLayout="default"
-          useInvertedBackground={false}
-          animationType="slide-up"
-          testimonials={[
-            {
-              id: "1",
-              name: "Maria Gonzalez",
-              handle: "West Hollywood, CA",
-              testimonial: "The project manager was incredibly knowledgeable and kept us informed every step of the way. True professionals.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=7",
-              imageAlt: "Maria Gonzalez"
-            },
-            {
-              id: "2",
-              name: "James Wilson",
-              handle: "Manhattan Beach, CA",
-              testimonial: "Their attention to detail is unmatched. Every aspect of our renovation was handled with care and precision.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=8",
-              imageAlt: "James Wilson"
-            },
-            {
-              id: "3",
-              name: "Lisa Chen",
-              handle: "Venice, CA",
-              testimonial: "From design consultations to final walkthrough, the team exceeded our expectations at every turn.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=9",
-              imageAlt: "Lisa Chen"
-            },
-            {
-              id: "4",
-              name: "Robert Davis",
-              handle: "Brentwood, CA",
-              testimonial: "Professional, punctual, and passionate about their work. Couldn't ask for a better remodeling team.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=10",
-              imageAlt: "Robert Davis"
-            },
-            {
-              id: "5",
-              name: "Amanda Foster",
-              handle: "Sherman Oaks, CA",
-              testimonial: "The craftsmanship is exceptional. They transformed our outdated kitchen into a modern masterpiece.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=11",
-              imageAlt: "Amanda Foster"
-            },
-            {
-              id: "6",
-              name: "Carlos Rodriguez",
-              handle: "El Segundo, CA",
-              testimonial: "Transparent pricing, quality work, and genuine care for customer satisfaction. Highly recommended.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=12",
-              imageAlt: "Carlos Rodriguez"
-            }
+      <div id="footer" data-section="footer">
+        <FooterBase
+          logoText="Construction Property LA"
+          columns={[
+            {"title":"Company","items":[{"label":"About Us","href":"/about"},{"label":"Our Team","href":"/about"},{"label":"Service Areas","href":"/services"}]},
+            {"title":"Services","items":[{"label":"Kitchen Remodeling","href":"/services"},{"label":"Bathroom Remodeling","href":"/services"},{"label":"Full Renovations","href":"/services"},{"label":"ADU Construction","href":"/services"}]},
+            {"title":"Contact","items":[{"label":"Get Free Estimate","href":"/contact"},{"label":"View Portfolio","href":"/portfolio"},{"label":"Testimonials","href":"/#testimonials"}]}
           ]}
+          copyrightText="© 2025 Construction Property LA. All rights reserved. Licensed & Insured."
         />
       </div>
-
-      <FooterBase
-        logoText="Construction Property LA"
-        columns={[
-          {
-            title: "Company",
-            items: [
-              { label: "About Us", href: "/about" },
-              { label: "Our Team", href: "/about" },
-              { label: "Service Areas", href: "/services" }
-            ]
-          },
-          {
-            title: "Services",
-            items: [
-              { label: "Kitchen Remodeling", href: "/services" },
-              { label: "Bathroom Remodeling", href: "/services" },
-              { label: "Full Renovations", href: "/services" },
-              { label: "ADU Construction", href: "/services" }
-            ]
-          },
-          {
-            title: "Contact",
-            items: [
-              { label: "Get Free Estimate", href: "/contact" },
-              { label: "View Portfolio", href: "/portfolio" },
-              { label: "Testimonials", href: "/#testimonials" }
-            ]
-          }
-        ]}
-        copyrightText="© 2025 Construction Property LA. All rights reserved. Licensed & Insured."
-      />
     </ThemeProvider>
   );
 }
\ No newline at end of file
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 073ed8b..a250891 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -5,7 +5,7 @@ import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatin
 import ContactCenter from '@/components/sections/contact/ContactCenter';
 import AboutMetric from '@/components/sections/about/AboutMetric';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import { Phone, Mail, MapPin, Clock } from 'lucide-react';
+import { Phone, Mail, MapPin, Clock, Calendar, MessageSquare, CheckCircle, Star } from 'lucide-react';
 
 export default function ContactPage() {
   return (
@@ -25,87 +25,66 @@ export default function ContactPage() {
         <NavbarLayoutFloatingOverlay
           brandName="Construction Property LA"
           navItems={[
-            { name: "Home", id: "/" },
-            { name: "About", id: "/about" },
-            { name: "Services", id: "/services" },
-            { name: "Portfolio", id: "/portfolio" },
-            { name: "Contact", id: "/contact" }
+            {"name":"Home","id":"/"},
+            {"name":"About","id":"/about"},
+            {"name":"Services","id":"/services"},
+            {"name":"Portfolio","id":"/portfolio"},
+            {"name":"Contact","id":"/contact"},
+            {"name":"Shop","id":"/shop"}
           ]}
-          button={{
-            text: "Get Free Estimate",
-            href: "/contact"
-          }}
+          button={{ text: "Call Now", href: "tel:+1234567890" }}
         />
       </div>
-
-      <div id="contact-form" data-section="contact-form">
+      <div id="contact-hero" data-section="contact-hero">
         <ContactCenter
-          tag="Get Started Today"
-          title="Schedule Your Free Consultation"
-          description="Ready to transform your space? Contact Construction Property LA for a no-obligation consultation. We'll discuss your vision, provide transparent pricing, and create a custom plan for your project."
-          background={{ variant: "sparkles-gradient" }}
+          tag="Get Your Free Estimate"
+          title="Ready to Transform Your Space?"
+          description="Schedule your no-obligation consultation today. We'll assess your project, discuss your vision, and provide transparent pricing."
+          background={{"variant":"radial-gradient"}}
           useInvertedBackground={false}
-          inputPlaceholder="Enter your email address"
-          buttonText="Request Free Estimate"
-          termsText="We respect your privacy and will respond within 24 hours. No spam, just honest project consultation."
+          inputPlaceholder="Your email address"
+          buttonText="Schedule Consultation"
+          termsText="We respect your privacy. You'll hear from us within 24 hours."
+          tagIcon={Calendar}
         />
       </div>
-
-      <div id="contact-info" data-section="contact-info">
+      <div id="contact-methods" data-section="contact-methods">
         <AboutMetric
-          title="Ready to discuss your remodeling project? Reach out through any of these channels and we'll get back to you quickly with answers to your questions."
+          title="Multiple Ways to Connect With Us"
           useInvertedBackground={false}
+          metricsAnimation="slide-up"
           metrics={[
-            { icon: Phone, label: "Call Direct", value: "(323) 555-0123" },
-            { icon: Mail, label: "Email Us", value: "hello@cpla.com" },
-            { icon: MapPin, label: "Service Area", value: "LA County" },
-            { icon: Clock, label: "Response Time", value: "24 Hours" }
+            {"icon":Phone,"label":"Call Us","value":"(323) 555-0123"},
+            {"icon":Mail,"label":"Email Us","value":"hello@cpla.com"},
+            {"icon":MapPin,"label":"Visit Us","value":"Downtown LA"},
+            {"icon":Clock,"label":"Hours","value":"Mon-Sat 8-6"}
           ]}
         />
       </div>
-
-      <div id="consultation-process" data-section="consultation-process">
+      <div id="response-guarantee" data-section="response-guarantee">
         <AboutMetric
-          title="Our consultation process is designed to understand your vision, assess your space, and provide you with a detailed proposal that includes timeline, materials, and transparent pricing."
+          title="Our Commitment to You"
           useInvertedBackground={false}
+          metricsAnimation="slide-up"
           metrics={[
-            { icon: Phone, label: "Initial Call", value: "30 Minutes" },
-            { icon: MapPin, label: "Site Visit", value: "Free" }
+            {"icon":MessageSquare,"label":"Response Time","value":"< 2 Hours"},
+            {"icon":CheckCircle,"label":"Free Estimates","value":"Always"},
+            {"icon":Star,"label":"Satisfaction","value":"Guaranteed"},
+            {"icon":Calendar,"label":"Scheduling","value":"Flexible"}
           ]}
         />
       </div>
-
-      <FooterBase
-        logoText="Construction Property LA"
-        columns={[
-          {
-            title: "Company",
-            items: [
-              { label: "About Us", href: "/about" },
-              { label: "Our Team", href: "/about" },
-              { label: "Service Areas", href: "/services" }
-            ]
-          },
-          {
-            title: "Services",
-            items: [
-              { label: "Kitchen Remodeling", href: "/services" },
-              { label: "Bathroom Remodeling", href: "/services" },
-              { label: "Full Renovations", href: "/services" },
-              { label: "ADU Construction", href: "/services" }
-            ]
-          },
-          {
-            title: "Contact",
-            items: [
-              { label: "Get Free Estimate", href: "/contact" },
-              { label: "View Portfolio", href: "/portfolio" },
-              { label: "Testimonials", href: "/#testimonials" }
-            ]
-          }
-        ]}
-        copyrightText="© 2025 Construction Property LA. All rights reserved. Licensed & Insured."
-      />
+      <div id="footer" data-section="footer">
+        <FooterBase
+          logoText="Construction Property LA"
+          columns={[
+            {"title":"Company","items":[{"label":"About Us","href":"/about"},{"label":"Our Team","href":"/about"},{"label":"Service Areas","href":"/services"}]},
+            {"title":"Services","items":[{"label":"Kitchen Remodeling","href":"/services"},{"label":"Bathroom Remodeling","href":"/services"},{"label":"Full Renovations","href":"/services"},{"label":"ADU Construction","href":"/services"}]},
+            {"title":"Contact","items":[{"label":"Get Free Estimate","href":"/contact"},{"label":"View Portfolio","href":"/portfolio"},{"label":"Testimonials","href":"/#testimonials"}]}
+          ]}
+          copyrightText="© 2025 Construction Property LA. All rights reserved. Licensed & Insured."
+        />
+      </div>
     </ThemeProvider>
   );
 }
\ No newline at end of file
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 554eeb0..c89ba06 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -10,8 +10,7 @@ import ProductCardOne from '@/components/sections/product/ProductCardOne';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
 import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import { Star, CheckCircle, FileText, Clock, MessageSquare, DollarSign, Zap, Users } from 'lucide-react';
-import Link from 'next/link';
+import { Star, CheckCircle, FileText, Clock, MessageSquare, DollarSign, Zap, Users, Mail } from 'lucide-react';
 
 export default function HomePage() {
   return (
@@ -31,46 +30,39 @@ export default function HomePage() {
         <NavbarLayoutFloatingOverlay
           brandName="Construction Property LA"
           navItems={[
-            { name: "Home", id: "/" },
-            { name: "About", id: "/about" },
-            { name: "Services", id: "/services" },
-            { name: "Portfolio", id: "/portfolio" },
-            { name: "Contact", id: "/contact" }
+            {"name":"Home","id":"/"},
+            {"name":"About","id":"/about"},
+            {"name":"Services","id":"/services"},
+            {"name":"Portfolio","id":"/portfolio"},
+            {"name":"Contact","id":"/contact"},
+            {"name":"Shop","id":"/shop"}
           ]}
-          button={{
-            text: "Get Free Estimate",
-            href: "/contact"
-          }}
+          button={{ text: "Get Free Estimate", href: "/contact" }}
         />
       </div>
-
       <div id="hero" data-section="hero">
         <HeroBillboard
           title="Luxury Remodeling. Built With Precision."
           description="Los Angeles' trusted full-service construction and remodeling team — delivering exceptional craftsmanship, transparent pricing, and seamless project management from design to completion."
-          background={{ variant: "plain" }}
-          buttons={[
-            { text: "Get a Free Estimate", href: "/contact" },
-            { text: "View Our Work", href: "/portfolio" }
-          ]}
-          imageSrc="https://img.b2bpic.net/free-photo/elegant-young-woman-bikini-male-shirt-posing-with-glass-water-kitchen_627829-11345.jpg?_wi=1"
+          background={{"variant":"plain"}}
+          buttons={[{"text":"Get a Free Estimate","href":"contact"},{"text":"View Our Work","href":"portfolio"}]}
+          imageSrc="https://img.b2bpic.net/free-photo/elegant-young-woman-bikini-male-shirt-posing-with-glass-water-kitchen_627829-11345.jpg"
           imageAlt="Luxury kitchen remodeling in Los Angeles"
         />
       </div>
-
       <div id="trust-bar" data-section="trust-bar">
         <AboutMetric
           title="Why Los Angeles Homeowners Trust Construction Property LA"
           useInvertedBackground={false}
+          metricsAnimation="slide-up"
           metrics={[
-            { icon: Star, label: "5-Star Rated", value: "LA Leaders" },
-            { icon: CheckCircle, label: "Licensed & Insured", value: "Fully Compliant" },
-            { icon: FileText, label: "Permits Managed", value: "In-House" },
-            { icon: Clock, label: "On-Time Delivery", value: "Guaranteed" }
+            {"icon":Star,"label":"5-Star Rated","value":"LA Leaders"},
+            {"icon":CheckCircle,"label":"Licensed & Insured","value":"Fully Compliant"},
+            {"icon":FileText,"label":"Permits Managed","value":"In-House"},
+            {"icon":Clock,"label":"On-Time Delivery","value":"Guaranteed"}
           ]}
         />
       </div>
-
       <div id="what-we-do" data-section="what-we-do">
         <FeatureCardTwentyFour
           title="Designed. Permitted. Built. Perfected."
@@ -79,37 +71,12 @@ export default function HomePage() {
           useInvertedBackground={false}
           animationType="slide-up"
           features={[
-            {
-              id: "1",
-              title: "Kitchen Remodeling",
-              author: "Expert Craftsmanship",
-              description: "Custom layouts, luxury cabinetry, structural wall removal, premium finishes.",
-              tags: ["Design", "Execution", "Premium"],
-              imageSrc: "https://img.b2bpic.net/free-photo/basin-black-faucet-green-bathroom-with-lighting-cozy-spa-nook_169016-69326.jpg?_wi=1",
-              imageAlt: "Kitchen remodeling project"
-            },
-            {
-              id: "2",
-              title: "Full Home Renovations",
-              author: "Complete Transformation",
-              description: "Complete redesigns including flooring, roofing, windows, structural upgrades.",
-              tags: ["Scope", "Quality", "Professional"],
-              imageSrc: "https://img.b2bpic.net/free-photo/beautiful-kitchen-interior-design_23-2150976526.jpg?_wi=1",
-              imageAlt: "Full home renovation project"
-            },
-            {
-              id: "3",
-              title: "ADUs & Additions",
-              author: "Property Enhancement",
-              description: "Maximize your property value with seamless expansions and well-designed additions.",
-              tags: ["Value", "Design", "Innovation"],
-              imageSrc: "https://img.b2bpic.net/free-photo/man-train-wagon-outdoors_23-2148232296.jpg?_wi=1",
-              imageAlt: "ADU construction project"
-            }
+            {"id":"1","title":"Kitchen Remodeling","author":"Expert Craftsmanship","description":"Custom layouts, luxury cabinetry, structural wall removal, premium finishes.","tags":["Design","Execution","Premium"],"imageSrc":"https://img.b2bpic.net/free-photo/basin-black-faucet-green-bathroom-with-lighting-cozy-spa-nook_169016-69326.jpg","imageAlt":"Kitchen remodeling project"},
+            {"id":"2","title":"Full Home Renovations","author":"Complete Transformation","description":"Complete redesigns including flooring, roofing, windows, structural upgrades.","tags":["Scope","Quality","Professional"],"imageSrc":"https://img.b2bpic.net/free-photo/beautiful-kitchen-interior-design_23-2150976526.jpg","imageAlt":"Full home renovation project"},
+            {"id":"3","title":"ADUs & Additions","author":"Property Enhancement","description":"Maximize your property value with seamless expansions and well-designed additions.","tags":["Value","Design","Innovation"],"imageSrc":"https://img.b2bpic.net/free-photo/man-train-wagon-outdoors_23-2148232296.jpg","imageAlt":"ADU construction project"}
           ]}
         />
       </div>
-
       <div id="why-choose-us" data-section="why-choose-us">
         <MetricCardThree
           title="Why Clients Choose Construction Property LA"
@@ -118,14 +85,13 @@ export default function HomePage() {
           useInvertedBackground={false}
           animationType="slide-up"
           metrics={[
-            { id: "1", icon: MessageSquare, title: "Clear Communication", value: "Always" },
-            { id: "2", icon: DollarSign, title: "Fair Pricing", value: "Transparent" },
-            { id: "3", icon: Zap, title: "Fast Turnaround", value: "6 Weeks" },
-            { id: "4", icon: Users, title: "Expert Team", value: "7 Managers" }
+            {"id":"1","icon":MessageSquare,"title":"Clear Communication","value":"Always"},
+            {"id":"2","icon":DollarSign,"title":"Fair Pricing","value":"Transparent"},
+            {"id":"3","icon":Zap,"title":"Fast Turnaround","value":"6 Weeks"},
+            {"id":"4","icon":Users,"title":"Expert Team","value":"7 Managers"}
           ]}
         />
       </div>
-
       <div id="featured-project" data-section="featured-project">
         <ProductCardOne
           title="Featured Project"
@@ -135,31 +101,12 @@ export default function HomePage() {
           animationType="slide-up"
           gridVariant="bento-grid"
           products={[
-            {
-              id: "1",
-              name: "Luxury Full Renovation",
-              price: "Complete Transformation",
-              imageSrc: "https://img.b2bpic.net/free-photo/workers-talking-phone-doing-paperwork_23-2147668775.jpg?_wi=1",
-              imageAlt: "Before and after kitchen renovation"
-            },
-            {
-              id: "2",
-              name: "Structural Excellence",
-              price: "Wall Removal & Updates",
-              imageSrc: "https://img.b2bpic.net/free-photo/worker-checking-structure_1122-1522.jpg?_wi=1",
-              imageAlt: "Structural engineering work"
-            },
-            {
-              id: "3",
-              name: "Bathroom Spa Design",
-              price: "Luxury Finishes",
-              imageSrc: "https://img.b2bpic.net/free-photo/basin-black-faucet-green-bathroom-with-lighting-cozy-spa-nook_169016-69326.jpg?_wi=2",
-              imageAlt: "Luxury bathroom remodel"
-            }
+            {"id":"1","name":"Luxury Full Renovation","price":"Complete Transformation","imageSrc":"https://img.b2bpic.net/free-photo/workers-talking-phone-doing-paperwork_23-2147668775.jpg","imageAlt":"Before and after kitchen renovation"},
+            {"id":"2","name":"Structural Excellence","price":"Wall Removal & Updates","imageSrc":"https://img.b2bpic.net/free-photo/worker-checking-structure_1122-1522.jpg","imageAlt":"Structural engineering work"},
+            {"id":"3","name":"Bathroom Spa Design","price":"Luxury Finishes","imageSrc":"https://img.b2bpic.net/free-photo/basin-black-faucet-green-bathroom-with-lighting-cozy-spa-nook_169016-69326.jpg","imageAlt":"Luxury bathroom remodel"}
           ]}
         />
       </div>
-
       <div id="testimonials" data-section="testimonials">
         <TestimonialCardSix
           title="What Los Angeles Homeowners Are Saying"
@@ -168,102 +115,39 @@ export default function HomePage() {
           useInvertedBackground={false}
           animationType="slide-up"
           testimonials={[
-            {
-              id: "1",
-              name: "Sarah Johnson",
-              handle: "Los Angeles, CA",
-              testimonial: "From start to finish, the experience was outstanding. The permit process went smoothly, communication was excellent, and the final result exceeded expectations.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=1",
-              imageAlt: "Sarah Johnson"
-            },
-            {
-              id: "2",
-              name: "Michael Chen",
-              handle: "Santa Monica, CA",
-              testimonial: "Completed exactly on time. Even fixed small issues without being asked. This team truly cares about quality and customer satisfaction.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=2",
-              imageAlt: "Michael Chen"
-            },
-            {
-              id: "3",
-              name: "Emily Rodriguez",
-              handle: "Beverly Hills, CA",
-              testimonial: "Most affordable quote we received with no hidden fees. The attention to detail was incredible. They took the space down to the studs and rebuilt beautifully.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=3",
-              imageAlt: "Emily Rodriguez"
-            },
-            {
-              id: "4",
-              name: "David Kim",
-              handle: "Pasadena, CA",
-              testimonial: "Responded within minutes to every question. Professional, organized, and truly knowledgeable. Highly recommend for any remodeling project.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=4",
-              imageAlt: "David Kim"
-            },
-            {
-              id: "5",
-              name: "Jessica Martinez",
-              handle: "Culver City, CA",
-              testimonial: "The permit handling was seamless. They managed everything with the city and we didn't have to worry about a thing. Exceptional service.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=5",
-              imageAlt: "Jessica Martinez"
-            },
-            {
-              id: "6",
-              name: "Robert Thompson",
-              handle: "Long Beach, CA",
-              testimonial: "Best decision we made. Clear communication throughout. No surprises. Final walkthrough was perfect. Will definitely work with them again.",
-              imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=6",
-              imageAlt: "Robert Thompson"
-            }
+            {"id":"1","name":"Sarah Johnson","handle":"Los Angeles, CA","testimonial":"From start to finish, the experience was outstanding. The permit process went smoothly, communication was excellent, and the final result exceeded expectations.","imageSrc":"https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg","imageAlt":"Sarah Johnson"},
+            {"id":"2","name":"Michael Chen","handle":"Santa Monica, CA","testimonial":"Completed exactly on time. Even fixed small issues without being asked. This team truly cares about quality and customer satisfaction.","imageSrc":"https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg","imageAlt":"Michael Chen"},
+            {"id":"3","name":"Emily Rodriguez","handle":"Beverly Hills, CA","testimonial":"Most affordable quote we received with no hidden fees. The attention to detail was incredible. They took the space down to the studs and rebuilt beautifully.","imageSrc":"https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg","imageAlt":"Emily Rodriguez"},
+            {"id":"4","name":"David Kim","handle":"Pasadena, CA","testimonial":"Responded within minutes to every question. Professional, organized, and truly knowledgeable. Highly recommend for any remodeling project.","imageSrc":"https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg","imageAlt":"David Kim"},
+            {"id":"5","name":"Jessica Martinez","handle":"Culver City, CA","testimonial":"The permit handling was seamless. They managed everything with the city and we didn't have to worry about a thing. Exceptional service.","imageSrc":"https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg","imageAlt":"Jessica Martinez"},
+            {"id":"6","name":"Robert Thompson","handle":"Long Beach, CA","testimonial":"Best decision we made. Clear communication throughout. No surprises. Final walkthrough was perfect. Will definitely work with them again.","imageSrc":"https://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg","imageAlt":"Robert Thompson"}
           ]}
         />
       </div>
-
       <div id="cta" data-section="cta">
         <ContactCenter
           tag="Ready to Transform?"
           title="Let's Build Something Exceptional"
           description="Schedule your free on-site consultation today. No obligation. Just honest conversation about your project."
-          background={{ variant: "radial-gradient" }}
+          background={{"variant":"radial-gradient"}}
           useInvertedBackground={false}
           inputPlaceholder="Your email address"
           buttonText="Schedule Consultation"
           termsText="We respect your privacy. You'll hear from us within 24 hours."
+          tagIcon={Mail}
+        />
+      </div>
+      <div id="footer" data-section="footer">
+        <FooterBase
+          logoText="Construction Property LA"
+          columns={[
+            {"title":"Company","items":[{"label":"About Us","href":"/about"},{"label":"Our Team","href":"/about"},{"label":"Service Areas","href":"/services"}]},
+            {"title":"Services","items":[{"label":"Kitchen Remodeling","href":"/services"},{"label":"Bathroom Remodeling","href":"/services"},{"label":"Full Renovations","href":"/services"},{"label":"ADU Construction","href":"/services"}]},
+            {"title":"Contact","items":[{"label":"Get Free Estimate","href":"/contact"},{"label":"View Portfolio","href":"/portfolio"},{"label":"Testimonials","href":"/#testimonials"}]}
+          ]}
+          copyrightText="© 2025 Construction Property LA. All rights reserved. Licensed & Insured."
         />
       </div>
-
-      <FooterBase
-        logoText="Construction Property LA"
-        columns={[
-          {
-            title: "Company",
-            items: [
-              { label: "About Us", href: "/about" },
-              { label: "Our Team", href: "/about" },
-              { label: "Service Areas", href: "/services" }
-            ]
-          },
-          {
-            title: "Services",
-            items: [
-              { label: "Kitchen Remodeling", href: "/services" },
-              { label: "Bathroom Remodeling", href: "/services" },
-              { label: "Full Renovations", href: "/services" },
-              { label: "ADU Construction", href: "/services" }
-            ]
-          },
-          {
-            title: "Contact",
-            items: [
-              { label: "Get Free Estimate", href: "/contact" },
-              { label: "View Portfolio", href: "/portfolio" },
-              { label: "Testimonials", href: "/#testimonials" }
-            ]
-          }
-        ]}
-        copyrightText="© 2025 Construction Property LA. All rights reserved. Licensed & Insured."
-      />
     </ThemeProvider>
   );
 }
\ No newline at end of file
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 399b6f5..e77c715 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -42,6 +42,7 @@ export default function ShopPage() {
                                 {"name":"Contact","id":"contact"},
                                 {"name":"Shop","id":"/shop"}
                             ]}
+                            button={{ text: "Cart", onClick: () => {} }}
                         />
                     </div>
                     <main className="min-h-screen flex items-center justify-center pt-20">
@@ -88,6 +89,7 @@ export default function ShopPage() {
                             {"name":"Contact","id":"contact"},
                             {"name":"Shop","id":"/shop"}
                         ]}
+                        button={{ text: "Cart", onClick: () => {} }}
                     />
                 </div>
                 <div id="productCatalog" data-section="productCatalog">