diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index cb11552..e418b87 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -3,11 +3,11 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterBase from '@/components/sections/footer/FooterBase';
-import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
+import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
-import SplitAbout from '@/components/sections/about/SplitAbout';
-import TeamCardFive from '@/components/sections/team/TeamCardFive';
-import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
+import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
+import TestimonialCardTen from '@/components/sections/testimonial/TestimonialCardTen';
+import { Building, Award, CheckCircle } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -34,9 +34,9 @@ export default function LandingPage() {
         {
           name: "Services",          id: "/services"},
         {
-          name: "Testimonials",          id: "#testimonials"},
+          name: "Testimonials",          id: "/#testimonials"},
         {
-          name: "FAQ",          id: "#faq"},
+          name: "FAQ",          id: "/#faq"},
         {
           name: "Contact",          id: "/contact"},
       ]}
@@ -46,97 +46,55 @@ export default function LandingPage() {
     />
   </div>
 
-  <div id="about" data-section="about">
-      <SplitAbout
-      textboxLayout="default"
+  <div id="about-us" data-section="about-us">
+      <TextSplitAbout
       useInvertedBackground={false}
       title="About Miami Roof Pros: Your Trusted Roofing Partner"
-      description="With over two decades of dedicated service in South Florida, Miami Roof Pros has established itself as a beacon of reliability and quality in the roofing industry. Our commitment goes beyond just installing and repairing roofs; we build lasting relationships with our clients based on trust, transparency, and superior craftsmanship. We understand the unique challenges of Florida's climate and provide durable, aesthetically pleasing, and cost-effective roofing solutions tailored to your needs."
-      bulletPoints={[
-        {
-          title: "Experienced Professionals",          description: "Highly trained and certified roofing specialists."},
-        {
-          title: "Quality Materials",          description: "Sourcing only the best materials for maximum durability."},
-        {
-          title: "Customer Satisfaction",          description: "Our top priority is ensuring you're delighted with our work."},
-        {
-          title: "Local Expertise",          description: "Deep understanding of Miami's building codes and weather challenges."},
+      description={[
+        "With over two decades of dedicated service in South Florida, Miami Roof Pros has established itself as a beacon of reliability and quality in the roofing industry. Our commitment goes beyond just installing and repairing roofs; we build lasting relationships with our clients based on trust, transparency, and superior craftsmanship. We understand the unique challenges of Florida's climate and provide durable, aesthetically pleasing, and cost-effective roofing solutions tailored to your needs."
       ]}
-      imageSrc="http://img.b2bpic.net/free-photo/thai-style-gold-decoration-concept_53876-23418.jpg"
-      imageAlt="Modern residential house with new roof"
-      mediaAnimation="blur-reveal"
     />
   </div>
 
-  <div id="metric" data-section="metric">
-      <MetricSplitMediaAbout
+  <div id="metrics" data-section="metrics">
+      <MetricCardOne
       useInvertedBackground={true}
       title="Our Legacy of Excellence in Roofing"
       description="Miami Roof Pros is built on a foundation of proven results and unwavering dedication. Our statistics reflect our commitment to superior service, customer satisfaction, and reliable craftsmanship throughout the South Florida region."
       metrics={[
         {
-          value: "20+",          title: "Years in Business"},
+          id: "1",          value: "20+",          title: "Years in Business",          description: "Decades of expertise serving South Florida's roofing needs.",          icon: Award
+        },
         {
-          value: "5000+",          title: "Roofs Installed/Repaired"},
+          id: "2",          value: "5000+",          title: "Roofs Installed/Repaired",          description: "Thousands of successful projects, from residential to commercial.",          icon: Building
+        },
         {
-          value: "98%",          title: "Customer Satisfaction"},
+          id: "3",          value: "98%",          title: "Customer Satisfaction",          description: "Our commitment to quality ensures client happiness on every job.",          icon: CheckCircle
+        },
       ]}
-      imageSrc="http://img.b2bpic.net/free-photo/worker-putting-protective-gloves_23-2148773452.jpg"
-      imageAlt="Worker inspecting a roof for maintenance"
-      mediaAnimation="blur-reveal"
-      metricsAnimation="blur-reveal"
-    />
-  </div>
-
-  <div id="team" data-section="team">
-      <TeamCardFive
-      animationType="slide-up"
+      gridVariant="uniform-all-items-equal"
+      animationType="blur-reveal"
       textboxLayout="default"
-      useInvertedBackground={false}
-      team={[
-        {
-          id: "1",          name: "Carlos Rodriguez",          role: "Founder & CEO",          imageSrc: "http://img.b2bpic.net/free-photo/alone-specialist-handsome-daydreaming-collar_1262-870.jpg",          imageAlt: "Carlos Rodriguez, Founder & CEO"},
-        {
-          id: "2",          name: "Maria Sanchez",          role: "Lead Project Manager",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-pretty-female-dark-jacket-pink-background_179666-26578.jpg",          imageAlt: "Maria Sanchez, Lead Project Manager"},
-        {
-          id: "3",          name: "David Lee",          role: "Senior Roofing Specialist",          imageSrc: "http://img.b2bpic.net/free-photo/happy-excited-man-blue-striped-shirt-raising-hands-having-pleased-expression-blue-space_141793-22674.jpg",          imageAlt: "David Lee, Senior Roofing Specialist"},
-        {
-          id: "4",          name: "Sophia Chen",          role: "Customer Relations Director",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-cheerful-young-businesswoman_329181-13396.jpg",          imageAlt: "Sophia Chen, Customer Relations Director"},
-      ]}
-      title="Meet the Experts Behind Your Durable Roof"
-      description="Our team at Miami Roof Pros comprises dedicated, certified, and experienced roofing professionals passionate about delivering exceptional results. We combine local expertise with cutting-edge techniques to ensure your roofing project is handled with the utmost care and precision."
     />
   </div>
 
-  <div id="testimonial" data-section="testimonial">
-      <TestimonialCardSixteen
+
+  <div id="testimonials" data-section="testimonials">
+      <TestimonialCardTen
       animationType="slide-up"
       textboxLayout="default"
       useInvertedBackground={false}
       testimonials={[
         {
-          id: "1",          name: "Elena P.",          role: "Homeowner",          company: "Miami Shores",          rating: 5,
-          quote: "Miami Roof Pros replaced our old tile roof quickly and efficiently. The team was professional, clean, and the quality of work is outstanding. Highly recommend!",          imageSrc: "http://img.b2bpic.net/free-photo/happy-father-smiling-taking-selfie-while-giving-thumbs-up_23-2148414933.jpg",          imageAlt: "Elena P. smiling"},
+          id: "1",          name: "Elena P.",          role: "Homeowner",          title: "Excellent Service",          quote: "Miami Roof Pros replaced our old tile roof quickly and efficiently. The team was professional, clean, and the quality of work is outstanding. Highly recommend!",          imageSrc: "http://img.b2bpic.net/free-photo/happy-father-smiling-taking-selfie-while-giving-thumbs-up_23-2148414933.jpg",          imageAlt: "Elena P. smiling"},
         {
-          id: "2",          name: "Robert G.",          role: "Property Manager",          company: "Coral Gables Commercial",          rating: 5,
-          quote: "Their commercial roofing expertise is unmatched. They handled our complex project with ease and kept us informed every step of the way. Fantastic service!",          imageSrc: "http://img.b2bpic.net/free-photo/alone-specialist-handsome-daydreaming-collar_1262-870.jpg",          imageAlt: "Robert G. smiling"},
+          id: "2",          name: "Robert G.",          role: "Property Manager",          title: "Commercial Expertise",          quote: "Their commercial roofing expertise is unmatched. They handled our complex project with ease and kept us informed every step of the way. Fantastic service!",          imageSrc: "http://img.b2bpic.net/free-photo/alone-specialist-handsome-daydreaming-collar_1262-870.jpg",          imageAlt: "Robert G. smiling"},
         {
-          id: "3",          name: "Sofia M.",          role: "Residential Client",          company: "South Miami",          rating: 5,
-          quote: "Emergency repair needed after a storm, and Miami Roof Pros was there within hours. Their quick response and expert repair saved us from further damage. Lifesavers!",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-pretty-female-dark-jacket-pink-background_179666-26578.jpg",          imageAlt: "Sofia M. smiling"},
+          id: "3",          name: "Sofia M.",          role: "Residential Client",          title: "Quick Emergency Response",          quote: "Emergency repair needed after a storm, and Miami Roof Pros was there within hours. Their quick response and expert repair saved us from further damage. Lifesavers!",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-pretty-female-dark-jacket-pink-background_179666-26578.jpg",          imageAlt: "Sofia M. smiling"},
         {
-          id: "4",          name: "Mark T.",          role: "Building Owner",          company: "Downtown Miami",          rating: 4,
-          quote: "Great experience from start to finish. The new flat roof looks great and was completed on schedule. Very professional crew.",          imageSrc: "http://img.b2bpic.net/free-photo/happy-excited-man-blue-striped-shirt-raising-hands-having-pleased-expression-blue-space_141793-22674.jpg",          imageAlt: "Mark T. smiling"},
+          id: "4",          name: "Mark T.",          role: "Building Owner",          title: "Professional and Timely",          quote: "Great experience from start to finish. The new flat roof looks great and was completed on schedule. Very professional crew.",          imageSrc: "http://img.b2bpic.net/free-photo/happy-excited-man-blue-striped-shirt-raising-hands-having-pleased-expression-blue-space_141793-22674.jpg",          imageAlt: "Mark T. smiling"},
         {
-          id: "5",          name: "Jessica L.",          role: "Homeowner",          company: "Pinecrest",          rating: 5,
-          quote: "The best roofing company in Miami, hands down. Fair pricing, excellent communication, and a beautiful new roof that will last for years.",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-cheerful-young-businesswoman_329181-13396.jpg",          imageAlt: "Jessica L. smiling"},
-      ]}
-      kpiItems={[
-        {
-          value: "20+",          label: "Years in Business"},
-        {
-          value: "A+",          label: "BBB Rating"},
-        {
-          value: "5-Star",          label: "Average Reviews"},
+          id: "5",          name: "Jessica L.",          role: "Homeowner",          title: "Best in Miami",          quote: "The best roofing company in Miami, hands down. Fair pricing, excellent communication, and a beautiful new roof that will last for years.",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-cheerful-young-businesswoman_329181-13396.jpg",          imageAlt: "Jessica L. smiling"},
       ]}
       title="What Our Clients Say About Our Roofing Services"
       description="Our reputation is built on the satisfaction of our clients. Hear directly from homeowners and businesses across Miami who have experienced the Miami Roof Pros difference – quality, reliability, and outstanding service."
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 4736ade..2b9a07c 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -2,9 +2,8 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCTA from '@/components/sections/contact/ContactCTA';
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
-import FaqDouble from '@/components/sections/faq/FaqDouble';
+import ContactText from '@/components/sections/contact/ContactText';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FooterBase from '@/components/sections/footer/FooterBase';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import { MessageSquare } from "lucide-react";
@@ -28,123 +27,55 @@ export default function LandingPage() {
       <NavbarStyleCentered
       navItems={[
         {
-          name: "Home",
-          id: "home",
-          href: "/",
-        },
+          name: "Home",          id: "/"},
         {
-          name: "About Us",
-          id: "about-us",
-          href: "/about",
-        },
+          name: "About Us",          id: "/about"},
         {
-          name: "Services",
-          id: "services",
-          href: "/services",
-        },
+          name: "Services",          id: "/services"},
         {
-          name: "Testimonials",
-          id: "testimonials",
-          href: "/#testimonials",
-        },
+          name: "Testimonials",          id: "/#testimonials"},
         {
-          name: "FAQ",
-          id: "faq",
-          href: "/#faq",
-        },
+          name: "FAQ",          id: "/#faq"},
         {
-          name: "Contact",
-          id: "contact",
-          href: "/contact",
-        },
+          name: "Contact",          id: "/contact"},
       ]}
       button={{
-        text: "Get a Free Quote",
-        href: "/contact",
-      }}
+        text: "Get a Free Quote",        href: "/contact"}}
       brandName="Miami Roof Pros"
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactSplitForm
+      <ContactText
       useInvertedBackground={false}
-      title="Get in Touch with Miami Roof Pros"
-      description="Have questions about your roofing project or need an urgent repair? Fill out the form below, and our team will get back to you promptly. We're here to help protect your investment."
-      inputs={[
+      text="Have questions about your roofing project or need an urgent repair? Fill out the form below, and our team will get back to you promptly. We're here to help protect your investment."
+      buttons={[
         {
-          name: "name",
-          type: "text",
-          placeholder: "Your Name",
-          required: true,
-        },
-        {
-          name: "email",
-          type: "email",
-          placeholder: "Your Email",
-          required: true,
-        },
-        {
-          name: "phone",
-          type: "tel",
-          placeholder: "Phone Number (Optional)",
-        },
-        {
-          name: "subject",
-          type: "text",
-          placeholder: "Subject",
-          required: true,
-        },
+          text: "Get a Free Quote",          href: "/contact"},
       ]}
-      textarea={{
-        name: "message",
-        placeholder: "Your Message",
-        rows: 5,
-        required: true,
-      }}
-      imageSrc="http://img.b2bpic.net/free-photo/worker-controls-cargo-crane_140725-7619.jpg?_wi=2"
-      imageAlt="Emergency roof tarp installation"
-      mediaAnimation="blur-reveal"
-      mediaPosition="right"
-      buttonText="Send Message"
+      background={{
+        variant: "radial-gradient"}}
+      animationType="entrance-slide"
     />
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqDouble
+      <FaqBase
       textboxLayout="default"
       useInvertedBackground={true}
       faqs={[
         {
-          id: "1",
-          title: "What areas do you serve?",
-          content: "Miami Roof Pros proudly serves all of Miami-Dade County, including Miami, Coral Gables, Miami Beach, South Miami, Pinecrest, and surrounding South Florida communities.",
-        },
+          id: "1",          title: "What areas do you serve?",          content: "Miami Roof Pros proudly serves all of Miami-Dade County, including Miami, Coral Gables, Miami Beach, South Miami, Pinecrest, and surrounding South Florida communities."},
         {
-          id: "2",
-          title: "Is an estimate really free?",
-          content: "Yes, we offer completely free, no-obligation estimates for all residential and commercial roofing projects. Contact us to schedule yours today.",
-        },
+          id: "2",          title: "Is an estimate really free?",          content: "Yes, we offer completely free, no-obligation estimates for all residential and commercial roofing projects. Contact us to schedule yours today."},
         {
-          id: "3",
-          title: "How quickly can you respond to an emergency?",
-          content: "We prioritize emergency calls and aim to respond within a few hours to assess the damage and provide immediate temporary solutions to prevent further issues.",
-        },
+          id: "3",          title: "How quickly can you respond to an emergency?",          content: "We prioritize emergency calls and aim to respond within a few hours to assess the damage and provide immediate temporary solutions to prevent further issues."},
         {
-          id: "4",
-          title: "Do you offer financing options?",
-          content: "We understand roofing can be a significant investment. We offer flexible financing options to help make your roofing project affordable. Please inquire for more details.",
-        },
+          id: "4",          title: "Do you offer financing options?",          content: "We understand roofing can be a significant investment. We offer flexible financing options to help make your roofing project affordable. Please inquire for more details."},
         {
-          id: "5",
-          title: "Are your technicians licensed and insured?",
-          content: "Absolutely. All our roofing technicians are fully licensed, insured, and undergo continuous training to ensure the highest standards of safety and quality.",
-        },
+          id: "5",          title: "Are your technicians licensed and insured?",          content: "Absolutely. All our roofing technicians are fully licensed, insured, and undergo continuous training to ensure the highest standards of safety and quality."},
         {
-          id: "6",
-          title: "What warranty do you provide?",
-          content: "We stand by our work with comprehensive warranties on both labor and materials. Specific warranty details will be provided with your project estimate.",
-        },
+          id: "6",          title: "What warranty do you provide?",          content: "We stand by our work with comprehensive warranties on both labor and materials. Specific warranty details will be provided with your project estimate."},
       ]}
       title="Common Questions for Miami Roof Pros"
       description="Before you reach out, check our frequently asked questions. You might find the answers you need about our services, estimates, and processes."
@@ -153,25 +84,18 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCTA
+      <ContactText
       useInvertedBackground={false}
       background={{
-        variant: "animated-grid",
-      }}
-      tag="Ready to Connect?"
-      tagIcon={MessageSquare}
-      title="Speak with a Roofing Expert Today!"
-      description="Don't leave your roofing needs to chance. Our friendly and knowledgeable team is ready to provide you with the best solutions and support. Let's discuss your project."
+        variant: "animated-grid"}}
+      text="Don't leave your roofing needs to chance. Our friendly and knowledgeable team is ready to provide you with the best solutions and support. Let's discuss your project."
       buttons={[
         {
-          text: "Call for Immediate Assistance",
-          href: "tel:+13051234567",
-        },
+          text: "Call for Immediate Assistance",          href: "tel:+13051234567"},
         {
-          text: "Email Us",
-          href: "mailto:info@miamiroofpros.com",
-        },
+          text: "Email Us",          href: "mailto:info@miamiroofpros.com"},
       ]}
+      animationType="entrance-slide"
     />
   </div>
 
@@ -179,58 +103,35 @@ export default function LandingPage() {
       <FooterBase
       columns={[
         {
-          title: "Services",
-          items: [
+          title: "Services",          items: [
             {
-              label: "Residential Roofing",
-              href: "/services#residential",
-            },
+              label: "Residential Roofing",              href: "/services#residential"},
             {
-              label: "Commercial Roofing",
-              href: "/services#commercial",
-            },
+              label: "Commercial Roofing",              href: "/services#commercial"},
             {
-              label: "Roof Repair",
-              href: "/services#repair",
-            },
+              label: "Roof Repair",              href: "/services#repair"},
             {
-              label: "Installations",
-              href: "/services#installations",
-            },
+              label: "Installations",              href: "/services#installations"},
             {
-              label: "Maintenance",
-              href: "/services#maintenance",
-            },
+              label: "Maintenance",              href: "/services#maintenance"},
           ],
         },
         {
-          title: "Company",
-          items: [
+          title: "Company",          items: [
             {
-              label: "About Us",
-              href: "/about",
-            },
+              label: "About Us",              href: "/about"},
             {
-              label: "Contact",
-              href: "/contact",
-            },
+              label: "Contact",              href: "/contact"},
             {
-              label: "FAQ",
-              href: "/faq",
-            },
+              label: "FAQ",              href: "/faq"},
           ],
         },
         {
-          title: "Resources",
-          items: [
+          title: "Resources",          items: [
             {
-              label: "Blog",
-              href: "/blog",
-            },
+              label: "Blog",              href: "/blog"},
             {
-              label: "Gallery",
-              href: "/gallery",
-            },
+              label: "Gallery",              href: "/gallery"},
           ],
         },
       ]}