diff --git a/src/app/page.tsx b/src/app/page.tsx
index be3139e..2cd4fb8 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,14 +2,14 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
-import FaqDouble from '@/components/sections/faq/FaqDouble';
-import FeatureBento from '@/components/sections/feature/FeatureBento';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import HeroBillboardTestimonial from '@/components/sections/hero/HeroBillboardTestimonial';
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import SplitAbout from '@/components/sections/about/SplitAbout';
-import { Settings, Sun, Wrench } from "lucide-react";
+import ContactCTA from '@/components/sections/contact/ContactCTA';
+import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
+import { Settings, Wrench, Sun } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -27,154 +27,92 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarStyleFullscreen
+      <NavbarLayoutFloatingInline
       navItems={[
-        {
-          name: "Home",          id: "hero"},
-        {
-          name: "Services",          id: "about"},
-        {
-          name: "Contact",          id: "contact"},
+        { name: "Home", id: "hero" },
+        { name: "Services", id: "about" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="Atlas Energy"
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroBillboardTestimonial
-      useInvertedBackground={false}
-      background={{
-        variant: "gradient-bars"}}
+      <HeroBillboard
+      background={{ variant: "gradient-bars" }}
       title="Where Engineering meets Energy"
       description="Atlas Energy Services provides top-tier engineering, procurement, and renewable energy solutions in Oman."
-      testimonials={[
-        {
-          name: "Client One",          handle: "@oman-energy",          testimonial: "Excellent service and professional installation.",          rating: 5,
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg?_wi=1",          imageAlt: "User provided image"},
-        {
-          name: "Client Two",          handle: "@industrial-proc",          testimonial: "Highly reliable project management.",          rating: 5,
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-qblup5i8.jpg?_wi=1",          imageAlt: "User provided image"},
-        {
-          name: "Client Three",          handle: "@solar-partners",          testimonial: "Top quality renewable solutions.",          rating: 5,
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-vtm25vap.jpg",          imageAlt: "User provided image"},
-        {
-          name: "Client Four",          handle: "@construction-lead",          testimonial: "Efficient commissioning on every site.",          rating: 5,
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg?_wi=2",          imageAlt: "User provided image"},
-        {
-          name: "Client Five",          handle: "@maintenance-dept",          testimonial: "Superior operational support.",          rating: 5,
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-qblup5i8.jpg?_wi=2",          imageAlt: "User provided image"},
-      ]}
       imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg?_wi=3"
       imageAlt="Atlas Energy Services Logo"
-      avatars={[
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg",          alt: "Client 1"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg",          alt: "Client 2"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg",          alt: "Client 3"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg",          alt: "Client 4"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-noo977o0.jpg",          alt: "Client 5"},
-      ]}
-      marqueeItems={[
-        {
-          type: "text",          text: "Sustainable Energy"},
-        {
-          type: "text",          text: "Precision Engineering"},
-        {
-          type: "text",          text: "Industrial Growth"},
-        {
-          type: "text",          text: "Oman Infrastructure"},
-        {
-          type: "text",          text: "Renewable Future"},
-      ]}
+      buttons={[{ text: "Explore Services", href: "#about" }]}
     />
   </div>
 
   <div id="about" data-section="about">
-      <SplitAbout
-      textboxLayout="split"
+      <MetricSplitMediaAbout
       useInvertedBackground={false}
       title="Our Expert Services"
       description="Atlas Energy delivers comprehensive services tailored for the Omani industrial landscape."
-      bulletPoints={[
-        {
-          title: "Engineering & Design",          description: "Precision planning for all projects."},
-        {
-          title: "Procurement & Management",          description: "Streamlined project oversight."},
-        {
-          title: "Installation & Commissioning",          description: "End-to-end site implementation."},
+      metrics={[
+        { value: "15+", title: "Projects Completed" },
+        { value: "100%", title: "Safety Standards" },
+        { value: "24/7", title: "Operational Support" },
       ]}
       imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C7un6ewlzkeUTcICzFKZIgYBAX/uploaded-1775749184532-qblup5i8.jpg?_wi=3"
       mediaAnimation="slide-up"
-      imageAlt="Professional engineering services in Oman"
     />
   </div>
 
   <div id="features" data-section="features">
-      <FeatureBento
+      <FeatureBorderGlow
       animationType="slide-up"
       textboxLayout="default"
       useInvertedBackground={false}
-      features={[
-        {
-          title: "Construction",          description: "Onshore & Offshore construction capabilities.",          bentoComponent: "reveal-icon",          icon: Settings
-        },
-        {
-          title: "Maintenance",          description: "Full lifecycle operational support.",          bentoComponent: "reveal-icon",          icon: Wrench
-        },
-        {
-          title: "Green Power",          description: "Sustainable solar & wind integration.",          bentoComponent: "reveal-icon",          icon: Sun
-        },
-      ]}
       title="Renewable Energy Solutions"
       description="Driving the transition to clean energy across Oman."
+      features={[
+        { title: "Construction", description: "Onshore & Offshore construction capabilities.", icon: Settings },
+        { title: "Maintenance", description: "Full lifecycle operational support.", icon: Wrench },
+        { title: "Green Power", description: "Sustainable solar & wind integration.", icon: Sun },
+      ]}
     />
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqDouble
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Frequently Asked Questions"
-      description="Learn more about our services and commitment to energy solutions."
-      faqsAnimation="slide-up"
+      <FaqSplitMedia
       faqs={[
-        {
-          id: "1",          title: "What industries do you serve?",          content: "We primarily serve the energy, construction, and industrial sectors across Oman."},
-        {
-          id: "2",          title: "How do I request a quote?",          content: "You can reach out to our team via the contact section provided on our homepage."},
-        {
-          id: "3",          title: "Do you provide renewable energy solutions?",          content: "Yes, we specialize in integrating solar and wind solutions for commercial projects."},
-        {
-          id: "4",          title: "Where is your office located?",          content: "We operate extensively across the Omani region with central project management teams."},
-        {
-          id: "5",          title: "What is your project management approach?",          content: "We emphasize precision planning, transparent procurement, and rigorous site commissioning."},
+        { id: "1", title: "What industries do you serve?", content: "We serve the energy and industrial sectors across Oman." },
+        { id: "2", title: "How do I request a quote?", content: "Please contact us via the form below." },
       ]}
+      faqsAnimation="slide-up"
+      textboxLayout="default"
+      title="Frequently Asked Questions"
+      description="Get your answers here."
+      useInvertedBackground={false}
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
+      <ContactCTA
+      tag="Get in touch"
+      title="Ready to start your project?"
+      description="Connect with Atlas Energy today for expert engineering solutions in Oman."
+      buttons={[{ text: "Email Us", href: "mailto:atlasenergy26@gmail.com" }]}
+      background={{ variant: "sparkles-gradient" }}
       useInvertedBackground={true}
-      background={{
-        variant: "plain"}}
-      text="For more information, please reach out to us at atlasenergy26@gmail.com."
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
+      <FooterLogoEmphasis
       logoText="Atlas Energy Services"
-      leftLink={{
-        text: "Terms of Service",        href: "#"}}
-      rightLink={{
-        text: "Privacy Policy",        href: "#"}}
+      columns={[
+        { items: [{ label: "Home", href: "#hero" }, { label: "Services", href: "#about" }] },
+        { items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
+      ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file