diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4b2f0e3..9bebbdd 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -13,6 +13,8 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
 import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
+import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
+import { Droplets, Dumbbell } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -32,26 +34,13 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleCentered
       navItems={[
-        {
-          name: "Home",
-          id: "hero",
-        },
-        {
-          name: "About",
-          id: "about",
-        },
-        {
-          name: "Features",
-          id: "features",
-        },
-        {
-          name: "Pricing",
-          id: "pricing",
-        },
-        {
-          name: "Contact",
-          id: "contact",
-        },
+        { name: "Home", id: "hero" },
+        { name: "About", id: "about" },
+        { name: "Features", id: "features" },
+        { name: "Hydration", id: "water" },
+        { name: "Training", id: "training" },
+        { name: "Pricing", id: "pricing" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="FitPlan Pro"
     />
@@ -59,64 +48,12 @@ export default function LandingPage() {
 
   <div id="hero" data-section="hero">
       <HeroBillboard
-      background={{
-        variant: "gradient-bars",
-      }}
+      background={{ variant: "gradient-bars" }}
       title="Build Your Perfect Physique."
       description="Get custom macro targets and exercise programs tailored specifically to your body and goals. Stop guessing, start seeing results."
-      buttons={[
-        {
-          text: "Start Planning",
-          href: "#pricing",
-        },
-      ]}
+      buttons={[{ text: "Start Planning", href: "#pricing" }]}
       imageSrc="http://img.b2bpic.net/free-photo/woman-with-headphones-using-phone_23-2148856778.jpg?_wi=1"
       mediaAnimation="slide-up"
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/close-up-fit-woman-holding-device_23-2149168693.jpg",
-          alt: "Close up fit woman holding device",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/young-adult-tracking-their-gym-activity_23-2149205537.jpg",
-          alt: "Young adult tracking their gym activity",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/physical-activity-stats-around-person_23-2150163336.jpg",
-          alt: "Physical activity stats around person",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/person-being-scanned-by-digital-health-app_23-2151891772.jpg",
-          alt: "Person being scanned by digital health app",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/woman-with-headphones-using-phone_23-2148856778.jpg",
-          alt: "fitness app dashboard interface",
-        },
-      ]}
-      avatarText="Join 10,000+ satisfied users"
-      marqueeItems={[
-        {
-          type: "text",
-          text: "Science-Based",
-        },
-        {
-          type: "text",
-          text: "Macro Precision",
-        },
-        {
-          type: "text",
-          text: "Pro Workouts",
-        },
-        {
-          type: "text",
-          text: "Custom Metrics",
-        },
-        {
-          type: "text",
-          text: "Healthy Results",
-        },
-      ]}
     />
   </div>
 
@@ -126,18 +63,9 @@ export default function LandingPage() {
       title="Scientifically Proven Results"
       description="Our fitness planner uses the Mifflin-St Jeor equation, the gold standard in nutritional science, to ensure your calorie and macro targets are accurate and effective for your metabolism."
       metrics={[
-        {
-          value: "10k+",
-          title: "Plans Created",
-        },
-        {
-          value: "95%",
-          title: "Goal Success Rate",
-        },
-        {
-          value: "24/7",
-          title: "Support Access",
-        },
+        { value: "10k+", title: "Plans Created" },
+        { value: "95%", title: "Goal Success Rate" },
+        { value: "24/7", title: "Support Access" },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/assortiment-traditional-mexican-vegetables_23-2148224119.jpg"
       mediaAnimation="blur-reveal"
@@ -145,246 +73,74 @@ export default function LandingPage() {
     />
   </div>
 
+  <div id="water" data-section="water">
+      <MetricCardOne
+      title="Water Consumption Tracking"
+      description="Optimize your performance and recovery with data-driven hydration goals."
+      gridVariant="uniform-all-items-equal"
+      animationType="slide-up"
+      metrics={[
+          { id: "w1", value: "8 Cups", title: "Daily Target", description: "Baseline goal based on your profile.", icon: Droplets },
+          { id: "w2", value: "+2 Cups", title: "Activity Bonus", description: "Automatically added for workout days.", icon: Droplets },
+          { id: "w3", value: "Smart", title: "Adaptive Tracking", description: "Adjusts intake based on local weather.", icon: Droplets }
+      ]}
+      textboxLayout="split"
+      useInvertedBackground={true}
+    />
+  </div>
+
+  <div id="training" data-section="training">
+      <MetricCardOne
+      title="Exercise Guidelines"
+      description="Structured professional routines designed to push your limits safely."
+      gridVariant="uniform-all-items-equal"
+      animationType="slide-up"
+      metrics={[
+          { id: "t1", value: "3-5x", title: "Frequency", description: "Optimal weekly strength sessions.", icon: Dumbbell },
+          { id: "t2", value: "45 Min", title: "Duration", description: "Efficient, science-backed workout windows.", icon: Dumbbell },
+          { id: "t3", value: "Custom", title: "Progression", description: "Scalable intensity to match your gains.", icon: Dumbbell }
+      ]}
+      textboxLayout="split"
+      useInvertedBackground={false}
+    />
+  </div>
+
   <div id="features" data-section="features">
       <FeatureCardNineteen
       textboxLayout="default"
       useInvertedBackground={false}
       features={[
-        {
-          tag: "Calorie Tracking",
-          title: "Precision Macros",
-          subtitle: "Automated Adjustments",
-          description: "Customized protein, carbs, and fat ratios calculated specifically for your body and goal.",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-clipboard-yellow-background_23-2148259148.jpg",
-        },
-        {
-          tag: "Training",
-          title: "Pro Workouts",
-          subtitle: "Structured Routines",
-          description: "Strength and cardio plans ranging from cutting to bulking, balanced for your recovery needs.",
-          imageSrc: "http://img.b2bpic.net/free-photo/physical-activity-stats-around-person_23-2150163324.jpg",
-        },
-        {
-          tag: "Hydration",
-          title: "Smart Hydration",
-          subtitle: "Optimal Intake",
-          description: "Stay hydrated with personalized water goals updated daily based on your weight and activity.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-doing-sport-home_23-2148547287.jpg",
-        },
+        { tag: "Calorie Tracking", title: "Precision Macros", subtitle: "Automated Adjustments", description: "Customized protein, carbs, and fat ratios calculated specifically for your body and goal.", imageSrc: "http://img.b2bpic.net/free-photo/top-view-clipboard-yellow-background_23-2148259148.jpg" },
+        { tag: "Training", title: "Pro Workouts", subtitle: "Structured Routines", description: "Strength and cardio plans ranging from cutting to bulking, balanced for your recovery needs.", imageSrc: "http://img.b2bpic.net/free-photo/physical-activity-stats-around-person_23-2150163324.jpg" },
+        { tag: "Hydration", title: "Smart Hydration", subtitle: "Optimal Intake", description: "Stay hydrated with personalized water goals updated daily based on your weight and activity.", imageSrc: "http://img.b2bpic.net/free-photo/woman-doing-sport-home_23-2148547287.jpg" }
       ]}
       title="Smart Features for Success"
       description="Everything you need to track, adjust, and optimize your fitness journey in one powerful platform."
     />
   </div>
 
-  <div id="products" data-section="products">
-      <ProductCardFour
-      animationType="slide-up"
-      textboxLayout="default"
-      gridVariant="four-items-2x2-equal-grid"
-      useInvertedBackground={false}
-      products={[
-        {
-          id: "p1",
-          name: "Protein Supplement",
-          price: "$49.00",
-          variant: "Whey",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-nuts-yogurt-arrangement_23-2149139377.jpg",
-        },
-        {
-          id: "p2",
-          name: "Resistance Bands",
-          price: "$29.00",
-          variant: "Pro-Set",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-view-sport-concept-with-dumbbells_23-2148499229.jpg",
-        },
-        {
-          id: "p3",
-          name: "Yoga Essentials",
-          price: "$35.00",
-          variant: "Eco-Friendly",
-          imageSrc: "http://img.b2bpic.net/free-photo/bamboo-with-three-piles-volcanic-stones_23-2147621578.jpg",
-        },
-        {
-          id: "p4",
-          name: "Smart Scale",
-          price: "$89.00",
-          variant: "Bluetooth",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-doing-sport-with-stats_23-2150040513.jpg",
-        },
-        {
-          id: "p5",
-          name: "Tracking Bottle",
-          price: "$25.00",
-          variant: "Smart",
-          imageSrc: "http://img.b2bpic.net/free-photo/training-supplies-near-tablet-with-picture_23-2147750794.jpg",
-        },
-        {
-          id: "p6",
-          name: "Fitness Planner",
-          price: "$15.00",
-          variant: "Hardbound",
-          imageSrc: "http://img.b2bpic.net/free-photo/clipboard-near-pile-sports-equipment_23-2147735038.jpg",
-        },
-      ]}
-      title="Essential Fitness Gear"
-      description="Complement your planning with the right tools for your home or gym routine."
-    />
-  </div>
-
   <div id="pricing" data-section="pricing">
       <PricingCardNine
       animationType="slide-up"
       textboxLayout="default"
       useInvertedBackground={false}
       plans={[
-        {
-          id: "basic",
-          title: "Essential",
-          price: "$9",
-          period: "/mo",
-          features: [
-            "Basic BMR Calc",
-            "Exercise Recs",
-            "Common Foods",
-          ],
-          button: {
-            text: "Get Started",
-          },
-          imageSrc: "http://img.b2bpic.net/free-photo/healthy-unhealthy-text-paper-surrounded-with-fresh-food_23-2148193102.jpg",
-          imageAlt: "Healthy and unhealthy text on paper surrounded with fresh food",
-        },
-        {
-          id: "pro",
-          title: "Professional",
-          price: "$29",
-          period: "/mo",
-          features: [
-            "Advanced Macros",
-            "Pro Workouts",
-            "Water Tracking",
-            "Export Reports",
-          ],
-          button: {
-            text: "Go Pro",
-          },
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-with-headphones-using-phone_23-2148856778.jpg?_wi=2",
-          imageAlt: "Healthy and unhealthy text on paper surrounded with fresh food",
-        },
+        { id: "basic", title: "Essential", price: "$9", period: "/mo", features: ["Basic BMR Calc", "Exercise Recs", "Common Foods"], button: { text: "Get Started" }, imageSrc: "http://img.b2bpic.net/free-photo/healthy-unhealthy-text-paper-surrounded-with-fresh-food_23-2148193102.jpg" },
+        { id: "pro", title: "Professional", price: "$29", period: "/mo", features: ["Advanced Macros", "Pro Workouts", "Water Tracking", "Export Reports"], button: { text: "Go Pro" }, imageSrc: "http://img.b2bpic.net/free-photo/woman-with-headphones-using-phone_23-2148856778.jpg?_wi=2" }
       ]}
       title="Choose Your Path"
       description="Unlock advanced tools and personalized planning to hit your goals faster."
     />
   </div>
 
-  <div id="metrics" data-section="metrics">
-      <MetricCardSeven
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      metrics={[
-        {
-          id: "m1",
-          value: "500+",
-          title: "Workouts Available",
-          items: [
-            "Strength",
-            "Cardio",
-            "HIIT",
-          ],
-        },
-        {
-          id: "m2",
-          value: "200+",
-          title: "Recipes Included",
-          items: [
-            "Lean",
-            "Bulking",
-            "Maintenance",
-          ],
-        },
-        {
-          id: "m3",
-          value: "100%",
-          title: "Science-Based",
-          items: [
-            "Verified Formulas",
-            "Expert Input",
-          ],
-        },
-      ]}
-      title="Why It Works"
-      description="Data-driven results speak for themselves."
-    />
-  </div>
-
-  <div id="testimonials" data-section="testimonials">
-      <TestimonialCardTwo
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      testimonials={[
-        {
-          id: "1",
-          name: "Sarah J.",
-          role: "Full-Time Parent",
-          testimonial: "I finally understand my macro needs. The structure keeps me consistent.",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-smiley-man-twerking_23-2149879701.jpg",
-        },
-        {
-          id: "2",
-          name: "Mark D.",
-          role: "Software Engineer",
-          testimonial: "Science-backed formulas that just work. Efficiency is key for me.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-diversity-sport-woman-training_23-2149174761.jpg",
-        },
-        {
-          id: "3",
-          name: "Elena R.",
-          role: "Marketing Pro",
-          testimonial: "The easiest way to track nutrition. I've never felt better.",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-african-american-man-smiling-happy-make-selfie-by-smartphone-gym_839833-24398.jpg",
-        },
-        {
-          id: "4",
-          name: "Tom K.",
-          role: "Teacher",
-          testimonial: "No more guesswork. My progress has finally hit the next level.",
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-joyful-guy-enjoying-leisure-time_1262-20555.jpg",
-        },
-        {
-          id: "5",
-          name: "Linda M.",
-          role: "Student",
-          testimonial: "Simple to use and effective. Changed my relationship with food.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-smiling-fitness-woman_171337-13339.jpg",
-        },
-      ]}
-      title="Transformations"
-      description="Hear from our success stories."
-    />
-  </div>
-
   <div id="faq" data-section="faq">
       <FaqBase
       textboxLayout="default"
       useInvertedBackground={false}
       faqs={[
-        {
-          id: "q1",
-          title: "Is this scientific?",
-          content: "Yes, we use the Mifflin-St Jeor equation to calculate your BMR and TDEE accurately.",
-        },
-        {
-          id: "q2",
-          title: "Can I cancel my plan?",
-          content: "Absolutely, you can cancel your subscription at any time directly from your dashboard.",
-        },
-        {
-          id: "q3",
-          title: "Do I need special food?",
-          content: "Not at all. We suggest common, healthy ingredients accessible at any grocery store.",
-        },
+        { id: "q1", title: "Is this scientific?", content: "Yes, we use the Mifflin-St Jeor equation to calculate your BMR and TDEE accurately." },
+        { id: "q2", title: "Can I cancel my plan?", content: "Absolutely, you can cancel your subscription at any time directly from your dashboard." },
+        { id: "q3", title: "Do I need special food?", content: "Not at all. We suggest common, healthy ingredients accessible at any grocery store." }
       ]}
       title="Common Questions"
       description="Everything you need to know about our fitness planning process."
@@ -395,9 +151,7 @@ export default function LandingPage() {
   <div id="contact" data-section="contact">
       <ContactCenter
       useInvertedBackground={false}
-      background={{
-        variant: "plain",
-      }}
+      background={{ variant: "plain" }}
       tag="Stay Updated"
       title="Join the Movement"
       description="Sign up for fitness tips and exclusive program offers delivered to your inbox."