diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 3ee5740..6b15793 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -46,29 +46,19 @@ export default function AboutPage() {
           description="Five core principles that set Construction Property LA apart from typical contractors."
           tabs={[
             {
-              id: "communication",
-              label: "Clear Communication",
-              description: "Our project managers (Jeffery, Andrew, Duane, Paul, Micah, Tristan, Justin) are known for being responsive and organized. You'll receive daily updates, transparent timelines, and instant answers to your questions."
+              id: "communication",              label: "Clear Communication",              description: "Our project managers (Jeffery, Andrew, Duane, Paul, Micah, Tristan, Justin) are known for being responsive and organized. You'll receive daily updates, transparent timelines, and instant answers to your questions."
             },
             {
-              id: "pricing",
-              label: "Fair & Transparent Pricing",
-              description: "Detailed estimates with zero surprises. We break down every cost, explain the value, and stick to our quotes. No hidden fees. No unexpected charges mid-project."
+              id: "pricing",              label: "Fair & Transparent Pricing",              description: "Detailed estimates with zero surprises. We break down every cost, explain the value, and stick to our quotes. No hidden fees. No unexpected charges mid-project."
             },
             {
-              id: "speed",
-              label: "Fast Turnaround",
-              description: "Many full kitchen remodels completed in as little as 6 weeks. We respect your time and run efficient, organized job sites with minimal disruption to your home."
+              id: "speed",              label: "Fast Turnaround",              description: "Many full kitchen remodels completed in as little as 6 weeks. We respect your time and run efficient, organized job sites with minimal disruption to your home."
             },
             {
-              id: "permits",
-              label: "Permit & Plan Handling",
-              description: "We manage all drawings, city submissions, and compliance approvals in-house. No back-and-forth with permits or surprise code issues—we handle it all."
+              id: "permits",              label: "Permit & Plan Handling",              description: "We manage all drawings, city submissions, and compliance approvals in-house. No back-and-forth with permits or surprise code issues—we handle it all."
             },
             {
-              id: "detail",
-              label: "Attention to Detail",
-              description: "We fix what others miss—even small issues you didn't know existed. Every corner, every finish, every connection is inspected and perfected before we leave."
+              id: "detail",              label: "Attention to Detail",              description: "We fix what others miss—even small issues you didn't know existed. Every corner, every finish, every connection is inspected and perfected before we leave."
             }
           ]}
           imageSrc="https://img.b2bpic.net/free-photo/medium-shot-people-working-construction_23-2150772878.jpg"
@@ -85,46 +75,22 @@ export default function AboutPage() {
           description="The trusted leaders who oversee every Construction Property LA project with precision and care."
           members={[
             {
-              id: "1",
-              name: "Jeffery",
-              role: "Senior Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/happy-builder-hardhat_1398-1726.jpg",
-              imageAlt: "professional man contractor manager confident portrait"
+              id: "1",              name: "Jeffery",              role: "Senior Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/happy-builder-hardhat_1398-1726.jpg",              imageAlt: "professional man contractor manager confident portrait"
             },
             {
-              id: "2",
-              name: "Andrew",
-              role: "Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/foreman-with-arms-crossed_23-2147711019.jpg",
-              imageAlt: "professional man construction manager friendly portrait"
+              id: "2",              name: "Andrew",              role: "Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/foreman-with-arms-crossed_23-2147711019.jpg",              imageAlt: "professional man construction manager friendly portrait"
             },
             {
-              id: "3",
-              name: "Duane",
-              role: "Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/contractor-talking-phone_23-2147710780.jpg",
-              imageAlt: "professional man contractor supervisor experienced portrait"
+              id: "3",              name: "Duane",              role: "Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/contractor-talking-phone_23-2147710780.jpg",              imageAlt: "professional man contractor supervisor experienced portrait"
             },
             {
-              id: "4",
-              name: "Paul",
-              role: "Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/senior-businessman-architect-hard-hat_1303-18998.jpg",
-              imageAlt: "professional man construction skilled leader portrait"
+              id: "4",              name: "Paul",              role: "Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/senior-businessman-architect-hard-hat_1303-18998.jpg",              imageAlt: "professional man construction skilled leader portrait"
             },
             {
-              id: "5",
-              name: "Micah",
-              role: "Construction Supervisor",
-              imageSrc: "https://img.b2bpic.net/free-photo/businessman-talking-mobile-phone-holding-digital-tablet_107420-65922.jpg",
-              imageAlt: "professional man supervisor construction confident portrait"
+              id: "5",              name: "Micah",              role: "Construction Supervisor",              imageSrc: "https://img.b2bpic.net/free-photo/businessman-talking-mobile-phone-holding-digital-tablet_107420-65922.jpg",              imageAlt: "professional man supervisor construction confident portrait"
             },
             {
-              id: "6",
-              name: "Tristan",
-              role: "Construction Supervisor",
-              imageSrc: "https://img.b2bpic.net/free-photo/smiling-handsome-young-businessman-standing-outside-wall-holding-folder-hand_23-2148026632.jpg",
-              imageAlt: "professional man construction supervisor experienced portrait"
+              id: "6",              name: "Tristan",              role: "Construction Supervisor",              imageSrc: "https://img.b2bpic.net/free-photo/smiling-handsome-young-businessman-standing-outside-wall-holding-folder-hand_23-2148026632.jpg",              imageAlt: "professional man construction supervisor experienced portrait"
             }
           ]}
           gridVariant="three-columns-all-equal-width"
@@ -141,19 +107,11 @@ export default function AboutPage() {
           showRating={false}
           testimonials={[
             {
-              id: "1",
-              name: "Sarah Johnson",
-              handle: "Los Angeles Homeowner",
-              testimonial: "From start to finish, the experience was outstanding. The permit process went smoothly, communication was excellent, and the final result exceeded expectations. Our kitchen is now the heart of our home.",
-              rating: 5,
+              id: "1",              name: "Sarah Johnson",              handle: "Los Angeles Homeowner",              testimonial: "From start to finish, the experience was outstanding. The permit process went smoothly, communication was excellent, and the final result exceeded expectations. Our kitchen is now the heart of our home.",              rating: 5,
               icon: Quote
             },
             {
-              id: "2",
-              name: "Michael Chen",
-              handle: "Beverly Hills Resident",
-              testimonial: "The team completed our bathroom remodel exactly on schedule and within budget. They fixed small issues we didn't even notice—that attention to detail set them apart from every other contractor we interviewed.",
-              rating: 5,
+              id: "2",              name: "Michael Chen",              handle: "Beverly Hills Resident",              testimonial: "The team completed our bathroom remodel exactly on schedule and within budget. They fixed small issues we didn't even notice—that attention to detail set them apart from every other contractor we interviewed.",              rating: 5,
               icon: Quote
             }
           ]}
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 18e01f0..48759b8 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -47,19 +47,13 @@ export default function ContactPage() {
           ctaIcon={Calendar}
           faqs={[
             {
-              id: "1",
-              title: "What should I prepare for the consultation?",
-              content: "Bring photos of the space you want to remodel, any design ideas or Pinterest boards, your budget range, and a rough timeline. This helps us understand your vision and provide accurate estimates."
+              id: "1",              title: "What should I prepare for the consultation?",              content: "Bring photos of the space you want to remodel, any design ideas or Pinterest boards, your budget range, and a rough timeline. This helps us understand your vision and provide accurate estimates."
             },
             {
-              id: "2",
-              title: "How long is the consultation?",
-              content: "Typically 30–45 minutes. We'll walk through the space, discuss your goals, and take photos and measurements. We'll follow up within 3 business days with a detailed estimate."
+              id: "2",              title: "How long is the consultation?",              content: "Typically 30–45 minutes. We'll walk through the space, discuss your goals, and take photos and measurements. We'll follow up within 3 business days with a detailed estimate."
             },
             {
-              id: "3",
-              title: "Do you offer free estimates?",
-              content: "Yes. The initial consultation and estimate are completely free with no obligation to hire us. We're confident in our work and want you to feel comfortable before committing."
+              id: "3",              title: "Do you offer free estimates?",              content: "Yes. The initial consultation and estimate are completely free with no obligation to hire us. We're confident in our work and want you to feel comfortable before committing."
             }
           ]}
           useInvertedBackground={false}
@@ -74,34 +68,22 @@ export default function ContactPage() {
           description="Everything you need to know about working with Construction Property LA."
           faqs={[
             {
-              id: "1",
-              title: "How much does a typical kitchen remodel cost?",
-              content: "Kitchen remodel costs vary widely based on scope, finishes, and structural work. A mid-range kitchen remodel typically runs $50,000–$120,000. A luxury remodel with premium cabinetry and appliances can exceed $200,000. We'll provide a detailed estimate after an on-site consultation."
+              id: "1",              title: "How much does a typical kitchen remodel cost?",              content: "Kitchen remodel costs vary widely based on scope, finishes, and structural work. A mid-range kitchen remodel typically runs $50,000–$120,000. A luxury remodel with premium cabinetry and appliances can exceed $200,000. We'll provide a detailed estimate after an on-site consultation."
             },
             {
-              id: "2",
-              title: "How long does the permit process take?",
-              content: "We manage permits in-house, which typically takes 2–4 weeks depending on the scope and complexity of your project. Once approved, construction can begin. Our experience with LA city requirements means fewer delays and faster approvals."
+              id: "2",              title: "How long does the permit process take?",              content: "We manage permits in-house, which typically takes 2–4 weeks depending on the scope and complexity of your project. Once approved, construction can begin. Our experience with LA city requirements means fewer delays and faster approvals."
             },
             {
-              id: "3",
-              title: "Can you work with my existing design or architect?",
-              content: "Absolutely. We're happy to work with your architect or designer. We can also provide design recommendations and coordinate with professionals to bring your vision to life."
+              id: "3",              title: "Can you work with my existing design or architect?",              content: "Absolutely. We're happy to work with your architect or designer. We can also provide design recommendations and coordinate with professionals to bring your vision to life."
             },
             {
-              id: "4",
-              title: "What's your project timeline for a full home renovation?",
-              content: "A full 3–4 bedroom home renovation typically takes 3–6 months, depending on scope and unforeseen issues. A kitchen remodel often takes 6–12 weeks. We provide a detailed timeline during the planning phase."
+              id: "4",              title: "What's your project timeline for a full home renovation?",              content: "A full 3–4 bedroom home renovation typically takes 3–6 months, depending on scope and unforeseen issues. A kitchen remodel often takes 6–12 weeks. We provide a detailed timeline during the planning phase."
             },
             {
-              id: "5",
-              title: "Do you handle permits and city approvals?",
-              content: "Yes. Permit and planning management is included in our service. We handle all drawings, submissions, inspections, and approvals. This is one of our biggest strengths—you don't have to deal with city bureaucracy."
+              id: "5",              title: "Do you handle permits and city approvals?",              content: "Yes. Permit and planning management is included in our service. We handle all drawings, submissions, inspections, and approvals. This is one of our biggest strengths—you don't have to deal with city bureaucracy."
             },
             {
-              id: "6",
-              title: "What if we discover structural issues during construction?",
-              content: "We always build a contingency buffer into estimates for unexpected issues. If major problems arise, we'll notify you immediately with options and costs. Transparency is key—no surprise invoices."
+              id: "6",              title: "What if we discover structural issues during construction?",              content: "We always build a contingency buffer into estimates for unexpected issues. If major problems arise, we'll notify you immediately with options and costs. Transparency is key—no surprise invoices."
             }
           ]}
           textboxLayout="default"
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 8f4bb4f..78d5dd6 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,41 +6,27 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 
 const publicSans = Public_Sans({
-  variable: "--font-public-sans",
-  subsets: ["latin"],
+  variable: "--font-public-sans",  subsets: ["latin"],
 });
 
 const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
+  variable: "--font-inter",  subsets: ["latin"],
 });
 
 export const metadata: Metadata = {
-  title: "Luxury Home Remodeling Los Angeles | Construction Property LA",
-  description: "Award-winning home remodeling contractor in Los Angeles. Expert kitchen, bathroom, and full home renovations with transparent pricing and on-time delivery.",
-  keywords: "home remodeling Los Angeles, kitchen remodel LA, bathroom renovation, ADU builder, general contractor, luxury renovation",
-  metadataBase: new URL("https://constructionpropertyLA.com"),
+  title: "Luxury Home Remodeling Los Angeles | Construction Property LA",  description: "Award-winning home remodeling contractor in Los Angeles. Expert kitchen, bathroom, and full home renovations with transparent pricing and on-time delivery.",  keywords: "home remodeling Los Angeles, kitchen remodel LA, bathroom renovation, ADU builder, general contractor, luxury renovation",  metadataBase: new URL("https://constructionpropertyLA.com"),
   alternates: {
     canonical: "https://constructionpropertyLA.com"
   },
   openGraph: {
-    title: "Luxury Home Remodeling Los Angeles | Construction Property LA",
-    description: "Expert home remodeling contractor serving Los Angeles with transparent pricing, clear communication, and exceptional craftsmanship.",
-    url: "https://constructionpropertyLA.com",
-    siteName: "Construction Property LA",
-    type: "website",
-    images: [
+    title: "Luxury Home Remodeling Los Angeles | Construction Property LA",    description: "Expert home remodeling contractor serving Los Angeles with transparent pricing, clear communication, and exceptional craftsmanship.",    url: "https://constructionpropertyLA.com",    siteName: "Construction Property LA",    type: "website",    images: [
       {
-        url: "https://img.b2bpic.net/free-photo/woman-man-working-laptop-home-modern-kitchen_651396-3535.jpg",
-        alt: "Luxury kitchen remodeling by Construction Property LA"
+        url: "https://img.b2bpic.net/free-photo/woman-man-working-laptop-home-modern-kitchen_651396-3535.jpg",        alt: "Luxury kitchen remodeling by Construction Property LA"
       }
     ]
   },
   twitter: {
-    card: "summary_large_image",
-    title: "Luxury Home Remodeling Los Angeles | Construction Property LA",
-    description: "Expert home remodeling contractor serving Los Angeles with transparent pricing and exceptional craftsmanship.",
-    images: ["https://img.b2bpic.net/free-photo/woman-man-working-laptop-home-modern-kitchen_651396-3535.jpg"]
+    card: "summary_large_image",    title: "Luxury Home Remodeling Los Angeles | Construction Property LA",    description: "Expert home remodeling contractor serving Los Angeles with transparent pricing and exceptional craftsmanship.",    images: ["https://img.b2bpic.net/free-photo/woman-man-working-laptop-home-modern-kitchen_651396-3535.jpg"]
   },
   robots: {
     index: true,
diff --git a/src/app/page.tsx b/src/app/page.tsx
index eb854af..ac5a4df 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -79,10 +79,7 @@ export default function HomePage() {
           description="From full-home renovations to kitchen remodels, ADUs, additions, structural upgrades, and emergency restoration — we handle every detail under one roof. No outsourcing chaos. No hidden costs. No miscommunication."
           features={[
             {
-              id: "1",
-              title: "Kitchen Remodeling",
-              description: "Custom layouts, luxury cabinetry, structural wall removal, premium finishes. We transform kitchens into stunning culinary spaces with attention to every detail.",
-              media: {
+              id: "1",              title: "Kitchen Remodeling",              description: "Custom layouts, luxury cabinetry, structural wall removal, premium finishes. We transform kitchens into stunning culinary spaces with attention to every detail.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/woman-man-working-laptop-home-modern-kitchen_651396-3535.jpg"
               },
               items: [
@@ -93,10 +90,7 @@ export default function HomePage() {
               reverse: false
             },
             {
-              id: "2",
-              title: "Bathroom Remodeling",
-              description: "Spa-inspired transformations with expert plumbing and tile craftsmanship. Create your personal retreat with luxury fixtures and thoughtful design.",
-              media: {
+              id: "2",              title: "Bathroom Remodeling",              description: "Spa-inspired transformations with expert plumbing and tile craftsmanship. Create your personal retreat with luxury fixtures and thoughtful design.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/bangkok-thailand-august-12-2016-beautiful-luxury-bathroom_1203-2725.jpg"
               },
               items: [
@@ -107,10 +101,7 @@ export default function HomePage() {
               reverse: true
             },
             {
-              id: "3",
-              title: "Full Home Renovations",
-              description: "Complete redesigns including flooring, roofing, windows, structural upgrades. We manage every phase for a seamless transformation.",
-              media: {
+              id: "3",              title: "Full Home Renovations",              description: "Complete redesigns including flooring, roofing, windows, structural upgrades. We manage every phase for a seamless transformation.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/young-couple-moving-into-new-home_23-2149199085.jpg"
               },
               items: [
@@ -121,10 +112,7 @@ export default function HomePage() {
               reverse: false
             },
             {
-              id: "4",
-              title: "ADUs & Home Additions",
-              description: "Maximize your property value with seamless expansions. ADU conversions, detached units, and second-story additions that enhance functionality and value.",
-              media: {
+              id: "4",              title: "ADUs & Home Additions",              description: "Maximize your property value with seamless expansions. ADU conversions, detached units, and second-story additions that enhance functionality and value.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/long-shot-men-working-together-roof_23-2149343674.jpg"
               },
               items: [
@@ -135,10 +123,7 @@ export default function HomePage() {
               reverse: true
             },
             {
-              id: "5",
-              title: "Structural & Foundation Work",
-              description: "Load-bearing wall removal, retaining walls, foundation reinforcement, and earthquake retrofitting. Engineering-backed precision for your home's integrity.",
-              media: {
+              id: "5",              title: "Structural & Foundation Work",              description: "Load-bearing wall removal, retaining walls, foundation reinforcement, and earthquake retrofitting. Engineering-backed precision for your home's integrity.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/young-people-visiting-relatives_23-2149039171.jpg"
               },
               items: [
@@ -149,10 +134,7 @@ export default function HomePage() {
               reverse: false
             },
             {
-              id: "6",
-              title: "Fire & Water Damage Restoration",
-              description: "Rapid response, full rebuild, total peace of mind. We handle emergency mitigation through complete restoration with insurance coordination.",
-              media: {
+              id: "6",              title: "Fire & Water Damage Restoration",              description: "Rapid response, full rebuild, total peace of mind. We handle emergency mitigation through complete restoration with insurance coordination.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/shocked-woman-calling-plumber-while-collecting-water-leaking-from-ceiling-using-utensil_657921-1199.jpg"
               },
               items: [
@@ -175,29 +157,19 @@ export default function HomePage() {
           description="Five core principles that set Construction Property LA apart from typical contractors."
           tabs={[
             {
-              id: "communication",
-              label: "Clear Communication",
-              description: "Our project managers (Jeffery, Andrew, Duane, Paul, Micah, Tristan, Justin) are known for being responsive and organized. You'll receive daily updates, transparent timelines, and instant answers to your questions."
+              id: "communication",              label: "Clear Communication",              description: "Our project managers (Jeffery, Andrew, Duane, Paul, Micah, Tristan, Justin) are known for being responsive and organized. You'll receive daily updates, transparent timelines, and instant answers to your questions."
             },
             {
-              id: "pricing",
-              label: "Fair & Transparent Pricing",
-              description: "Detailed estimates with zero surprises. We break down every cost, explain the value, and stick to our quotes. No hidden fees. No unexpected charges mid-project."
+              id: "pricing",              label: "Fair & Transparent Pricing",              description: "Detailed estimates with zero surprises. We break down every cost, explain the value, and stick to our quotes. No hidden fees. No unexpected charges mid-project."
             },
             {
-              id: "speed",
-              label: "Fast Turnaround",
-              description: "Many full kitchen remodels completed in as little as 6 weeks. We respect your time and run efficient, organized job sites with minimal disruption to your home."
+              id: "speed",              label: "Fast Turnaround",              description: "Many full kitchen remodels completed in as little as 6 weeks. We respect your time and run efficient, organized job sites with minimal disruption to your home."
             },
             {
-              id: "permits",
-              label: "Permit & Plan Handling",
-              description: "We manage all drawings, city submissions, and compliance approvals in-house. No back-and-forth with permits or surprise code issues—we handle it all."
+              id: "permits",              label: "Permit & Plan Handling",              description: "We manage all drawings, city submissions, and compliance approvals in-house. No back-and-forth with permits or surprise code issues—we handle it all."
             },
             {
-              id: "detail",
-              label: "Attention to Detail",
-              description: "We fix what others miss—even small issues you didn't know existed. Every corner, every finish, every connection is inspected and perfected before we leave."
+              id: "detail",              label: "Attention to Detail",              description: "We fix what others miss—even small issues you didn't know existed. Every corner, every finish, every connection is inspected and perfected before we leave."
             }
           ]}
           imageSrc="https://img.b2bpic.net/free-photo/medium-shot-people-working-construction_23-2150772878.jpg"
@@ -214,46 +186,22 @@ export default function HomePage() {
           description="The trusted leaders who oversee every Construction Property LA project with precision and care."
           members={[
             {
-              id: "1",
-              name: "Jeffery",
-              role: "Senior Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/happy-builder-hardhat_1398-1726.jpg",
-              imageAlt: "professional man contractor manager confident portrait"
+              id: "1",              name: "Jeffery",              role: "Senior Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/happy-builder-hardhat_1398-1726.jpg",              imageAlt: "professional man contractor manager confident portrait"
             },
             {
-              id: "2",
-              name: "Andrew",
-              role: "Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/foreman-with-arms-crossed_23-2147711019.jpg",
-              imageAlt: "professional man construction manager friendly portrait"
+              id: "2",              name: "Andrew",              role: "Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/foreman-with-arms-crossed_23-2147711019.jpg",              imageAlt: "professional man construction manager friendly portrait"
             },
             {
-              id: "3",
-              name: "Duane",
-              role: "Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/contractor-talking-phone_23-2147710780.jpg",
-              imageAlt: "professional man contractor supervisor experienced portrait"
+              id: "3",              name: "Duane",              role: "Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/contractor-talking-phone_23-2147710780.jpg",              imageAlt: "professional man contractor supervisor experienced portrait"
             },
             {
-              id: "4",
-              name: "Paul",
-              role: "Project Manager",
-              imageSrc: "https://img.b2bpic.net/free-photo/senior-businessman-architect-hard-hat_1303-18998.jpg",
-              imageAlt: "professional man construction skilled leader portrait"
+              id: "4",              name: "Paul",              role: "Project Manager",              imageSrc: "https://img.b2bpic.net/free-photo/senior-businessman-architect-hard-hat_1303-18998.jpg",              imageAlt: "professional man construction skilled leader portrait"
             },
             {
-              id: "5",
-              name: "Micah",
-              role: "Construction Supervisor",
-              imageSrc: "https://img.b2bpic.net/free-photo/businessman-talking-mobile-phone-holding-digital-tablet_107420-65922.jpg",
-              imageAlt: "professional man supervisor construction confident portrait"
+              id: "5",              name: "Micah",              role: "Construction Supervisor",              imageSrc: "https://img.b2bpic.net/free-photo/businessman-talking-mobile-phone-holding-digital-tablet_107420-65922.jpg",              imageAlt: "professional man supervisor construction confident portrait"
             },
             {
-              id: "6",
-              name: "Tristan",
-              role: "Construction Supervisor",
-              imageSrc: "https://img.b2bpic.net/free-photo/smiling-handsome-young-businessman-standing-outside-wall-holding-folder-hand_23-2148026632.jpg",
-              imageAlt: "professional man construction supervisor experienced portrait"
+              id: "6",              name: "Tristan",              role: "Construction Supervisor",              imageSrc: "https://img.b2bpic.net/free-photo/smiling-handsome-young-businessman-standing-outside-wall-holding-folder-hand_23-2148026632.jpg",              imageAlt: "professional man construction supervisor experienced portrait"
             }
           ]}
           gridVariant="three-columns-all-equal-width"
@@ -270,40 +218,20 @@ export default function HomePage() {
           showRating={true}
           testimonials={[
             {
-              id: "1",
-              name: "Sarah Johnson",
-              handle: "Los Angeles Homeowner",
-              testimonial: "From start to finish, the experience was outstanding. The permit process went smoothly, communication was excellent, and the final result exceeded expectations. Our kitchen is now the heart of our home.",
-              rating: 5,
-              imageSrc: "https://img.b2bpic.net/free-photo/businessman-smiling-camera_107420-95907.jpg",
-              imageAlt: "woman happy homeowner satisfied smiling portrait"
+              id: "1",              name: "Sarah Johnson",              handle: "Los Angeles Homeowner",              testimonial: "From start to finish, the experience was outstanding. The permit process went smoothly, communication was excellent, and the final result exceeded expectations. Our kitchen is now the heart of our home.",              rating: 5,
+              imageSrc: "https://img.b2bpic.net/free-photo/businessman-smiling-camera_107420-95907.jpg",              imageAlt: "woman happy homeowner satisfied smiling portrait"
             },
             {
-              id: "2",
-              name: "Michael Chen",
-              handle: "Beverly Hills Resident",
-              testimonial: "The team completed our bathroom remodel exactly on schedule and within budget. They fixed small issues we didn't even notice—that attention to detail set them apart from every other contractor we interviewed.",
-              rating: 5,
-              imageSrc: "https://img.b2bpic.net/free-photo/handsome-business-man-engineer-hard-hat-building_1303-21143.jpg",
-              imageAlt: "man professional happy satisfied client portrait"
+              id: "2",              name: "Michael Chen",              handle: "Beverly Hills Resident",              testimonial: "The team completed our bathroom remodel exactly on schedule and within budget. They fixed small issues we didn't even notice—that attention to detail set them apart from every other contractor we interviewed.",              rating: 5,
+              imageSrc: "https://img.b2bpic.net/free-photo/handsome-business-man-engineer-hard-hat-building_1303-21143.jpg",              imageAlt: "man professional happy satisfied client portrait"
             },
             {
-              id: "3",
-              name: "Emily Rodriguez",
-              handle: "Pasadena Homeowner",
-              testimonial: "Most affordable quote with no hidden fees. The whole process was transparent. Jeffery and his team responded to every question within minutes. Highly recommend.",
-              rating: 5,
-              imageSrc: "https://img.b2bpic.net/free-photo/young-handsome-man-car-showroom_1303-17443.jpg",
-              imageAlt: "woman professional satisfied homeowner portrait smiling"
+              id: "3",              name: "Emily Rodriguez",              handle: "Pasadena Homeowner",              testimonial: "Most affordable quote with no hidden fees. The whole process was transparent. Jeffery and his team responded to every question within minutes. Highly recommend.",              rating: 5,
+              imageSrc: "https://img.b2bpic.net/free-photo/young-handsome-man-car-showroom_1303-17443.jpg",              imageAlt: "woman professional satisfied homeowner portrait smiling"
             },
             {
-              id: "4",
-              name: "David Kim",
-              handle: "Culver City Resident",
-              testimonial: "They took our kitchen down to the studs and rebuilt it beautifully. The project manager, Andrew, was amazing—professional, on-time, and genuinely cared about our satisfaction. Best contractor experience I've had.",
-              rating: 5,
-              imageSrc: "https://img.b2bpic.net/free-photo/male-worker-with-arms-crossed-standing-factory_107420-96042.jpg",
-              imageAlt: "man asian satisfied homeowner happy portrait"
+              id: "4",              name: "David Kim",              handle: "Culver City Resident",              testimonial: "They took our kitchen down to the studs and rebuilt it beautifully. The project manager, Andrew, was amazing—professional, on-time, and genuinely cared about our satisfaction. Best contractor experience I've had.",              rating: 5,
+              imageSrc: "https://img.b2bpic.net/free-photo/male-worker-with-arms-crossed-standing-factory_107420-96042.jpg",              imageAlt: "man asian satisfied homeowner happy portrait"
             }
           ]}
           textboxLayout="default"
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 442d06d..e5d76a0 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -45,10 +45,7 @@ export default function ServicesPage() {
           description="From full-home renovations to kitchen remodels, ADUs, additions, structural upgrades, and emergency restoration — we handle every detail under one roof. No outsourcing chaos. No hidden costs. No miscommunication."
           features={[
             {
-              id: "1",
-              title: "Kitchen Remodeling",
-              description: "Custom layouts, luxury cabinetry, structural wall removal, premium finishes. We transform kitchens into stunning culinary spaces with attention to every detail.",
-              media: {
+              id: "1",              title: "Kitchen Remodeling",              description: "Custom layouts, luxury cabinetry, structural wall removal, premium finishes. We transform kitchens into stunning culinary spaces with attention to every detail.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/woman-man-working-laptop-home-modern-kitchen_651396-3535.jpg"
               },
               items: [
@@ -59,10 +56,7 @@ export default function ServicesPage() {
               reverse: false
             },
             {
-              id: "2",
-              title: "Bathroom Remodeling",
-              description: "Spa-inspired transformations with expert plumbing and tile craftsmanship. Create your personal retreat with luxury fixtures and thoughtful design.",
-              media: {
+              id: "2",              title: "Bathroom Remodeling",              description: "Spa-inspired transformations with expert plumbing and tile craftsmanship. Create your personal retreat with luxury fixtures and thoughtful design.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/bangkok-thailand-august-12-2016-beautiful-luxury-bathroom_1203-2725.jpg"
               },
               items: [
@@ -73,10 +67,7 @@ export default function ServicesPage() {
               reverse: true
             },
             {
-              id: "3",
-              title: "Full Home Renovations",
-              description: "Complete redesigns including flooring, roofing, windows, structural upgrades. We manage every phase for a seamless transformation.",
-              media: {
+              id: "3",              title: "Full Home Renovations",              description: "Complete redesigns including flooring, roofing, windows, structural upgrades. We manage every phase for a seamless transformation.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/young-couple-moving-into-new-home_23-2149199085.jpg"
               },
               items: [
@@ -87,10 +78,7 @@ export default function ServicesPage() {
               reverse: false
             },
             {
-              id: "4",
-              title: "ADUs & Home Additions",
-              description: "Maximize your property value with seamless expansions. ADU conversions, detached units, and second-story additions that enhance functionality and value.",
-              media: {
+              id: "4",              title: "ADUs & Home Additions",              description: "Maximize your property value with seamless expansions. ADU conversions, detached units, and second-story additions that enhance functionality and value.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/long-shot-men-working-together-roof_23-2149343674.jpg"
               },
               items: [
@@ -125,10 +113,7 @@ export default function ServicesPage() {
           description="Expert structural work, foundation reinforcement, and emergency restoration services backed by engineering precision and rapid response capabilities."
           features={[
             {
-              id: "5",
-              title: "Structural & Foundation Work",
-              description: "Load-bearing wall removal, retaining walls, foundation reinforcement, and earthquake retrofitting. Engineering-backed precision for your home's integrity.",
-              media: {
+              id: "5",              title: "Structural & Foundation Work",              description: "Load-bearing wall removal, retaining walls, foundation reinforcement, and earthquake retrofitting. Engineering-backed precision for your home's integrity.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/young-people-visiting-relatives_23-2149039171.jpg"
               },
               items: [
@@ -139,10 +124,7 @@ export default function ServicesPage() {
               reverse: false
             },
             {
-              id: "6",
-              title: "Fire & Water Damage Restoration",
-              description: "Rapid response, full rebuild, total peace of mind. We handle emergency mitigation through complete restoration with insurance coordination.",
-              media: {
+              id: "6",              title: "Fire & Water Damage Restoration",              description: "Rapid response, full rebuild, total peace of mind. We handle emergency mitigation through complete restoration with insurance coordination.",              media: {
                 imageSrc: "https://img.b2bpic.net/free-photo/shocked-woman-calling-plumber-while-collecting-water-leaking-from-ceiling-using-utensil_657921-1199.jpg"
               },
               items: [
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index 023eee5..34a42a8 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -91,7 +91,6 @@ export default function ProductPage({ params }: ProductPageProps) {
                             ]}
                             bottomLeftText="Los Angeles, CA"
                             bottomRightText="hello@constructionpropertyLA.com"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
                     </div>
                     <main className="min-h-screen flex items-center justify-center pt-20">
@@ -126,7 +125,6 @@ export default function ProductPage({ params }: ProductPageProps) {
                             ]}
                             bottomLeftText="Los Angeles, CA"
                             bottomRightText="hello@constructionpropertyLA.com"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
                     </div>
                     <main className="min-h-screen flex items-center justify-center pt-20">
@@ -168,7 +166,6 @@ export default function ProductPage({ params }: ProductPageProps) {
                         ]}
                         bottomLeftText="Los Angeles, CA"
                         bottomRightText="hello@constructionpropertyLA.com"
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
                 </div>
                 <div id="productDetailCard" data-section="productDetailCard">
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 0aa688e..2d467b8 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -14,9 +14,12 @@ export default function ShopPage() {
         isLoading,
         search,
         setSearch,
+        category,
+        setCategory,
+        sort,
+        setSort,
         filters,
-        cartOpen,
-        setCartOpen,
+        categories
     } = useProductCatalog({ basePath: "/shop" });
 
     if (isLoading) {
@@ -43,7 +46,6 @@ export default function ShopPage() {
                             ]}
                             bottomLeftText="Los Angeles, CA"
                             bottomRightText="hello@constructionpropertyLA.com"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
                     </div>
                     <main className="min-h-screen flex items-center justify-center pt-20">
@@ -77,7 +79,6 @@ export default function ShopPage() {
                         ]}
                         bottomLeftText="Los Angeles, CA"
                         bottomRightText="hello@constructionpropertyLA.com"
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
                 </div>
                 <div id="productCatalog" data-section="productCatalog">