diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 544b548..3f20100 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -3,38 +3,40 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
 import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
-import MetricSplitMediaAbout from "@/components/sections/about/MetricSplitMediaAbout";
-import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
+import TextAbout from "@/components/sections/about/TextAbout";
 import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
-import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
+import TestimonialCardTen from "@/components/sections/testimonial/TestimonialCardTen";
 import ContactText from "@/components/sections/contact/ContactText";
 import FooterBase from "@/components/sections/footer/FooterBase";
-import { Zap, Award, Users, Target } from "lucide-react";
+import { Zap, Award, Users, Lightbulb } from "lucide-react";
 
 export default function AboutPage() {
   const navItems = [
-    { name: "Home", id: "/" },
-    { name: "About", id: "/about" },
-    { name: "Services", id: "/services" },
+    { name: "Home", id: "home" },
+    { name: "About", id: "about" },
+    { name: "Solutions", id: "solutions" },
+    { name: "Services", id: "services" },
     { name: "Projects", id: "projects" },
-    { name: "Contact", id: "/contact" },
+    { name: "Blog", id: "blog" },
+    { name: "Contact", id: "contact" },
   ];
 
   const footerColumns = [
     {
       title: "Solutions",      items: [
-        { label: "Industrial Automation", href: "/services" },
-        { label: "Robot & Cobot Systems", href: "/services" },
-        { label: "Packaging Machinery", href: "/services" },
-        { label: "Smart Gate Systems", href: "/services" },
-        { label: "Custom Engineering", href: "/services" },
+        { label: "Industrial Automation", href: "/solutions" },
+        { label: "Robot & Cobot Systems", href: "/solutions" },
+        { label: "Packaging Machinery", href: "/solutions" },
+        { label: "Smart Gate Systems", href: "/solutions" },
+        { label: "Custom Engineering", href: "/solutions" },
       ],
     },
     {
       title: "Company",      items: [
         { label: "About Us", href: "/about" },
+        { label: "Our Services", href: "/services" },
         { label: "Projects & Portfolio", href: "/" },
-        { label: "Services", href: "/services" },
+        { label: "Blog & Articles", href: "/" },
         { label: "Careers", href: "/" },
         { label: "Contact", href: "/contact" },
       ],
@@ -84,13 +86,13 @@ export default function AboutPage() {
       <div id="hero" data-section="hero">
         <HeroBillboardGallery
           title="About Milestones Technologies"
-          description="We are Thailand's leading automation partner, dedicated to transforming industrial operations and smart living through innovative technology, expert engineering, and unwavering commitment to customer success."
+          description="Leading provider of industrial automation and engineering solutions in Southeast Asia. For over 15 years, we've been transforming factories and businesses through innovative automation technology, expert engineering, and unwavering commitment to customer success."
           tag="OUR STORY"
           tagIcon={Zap}
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Explore Our Services",              href: "/services"},
+              text: "Learn More",              href: "#vision"},
             {
               text: "Contact Us",              href: "/contact"},
           ]}
@@ -98,50 +100,53 @@ export default function AboutPage() {
           background={{ variant: "animated-grid" }}
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Milestones Technologies engineering team working on automation projects"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Professional engineering team working on automation projects"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png",              imageAlt: "Completed industrial automation installations"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Industrial automation in action"},
           ]}
           mediaAnimation="blur-reveal"
         />
       </div>
 
-      <div id="about-metrics" data-section="about-metrics">
-        <MetricSplitMediaAbout
-          tag="WHO WE ARE"
+      <div id="vision" data-section="vision">
+        <TextAbout
+          tag="OUR VISION & MISSION"
+          tagIcon={Lightbulb}
+          tagAnimation="slide-up"
+          title="Transforming Industries Through Innovation & Expertise. Our mission is to empower businesses with cutting-edge automation technology that drives efficiency, profitability, and sustainable growth. We believe in building long-term partnerships based on trust, technical excellence, and genuine commitment to our clients' success."
+          buttons={[
+            {
+              text: "Explore Solutions",              href: "/solutions"},
+            {
+              text: "View Projects",              href: "#"},
+          ]}
+          buttonAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="achievements" data-section="achievements">
+        <MetricCardEleven
+          tag="OUR ACHIEVEMENTS"
           tagIcon={Award}
           tagAnimation="slide-up"
-          title="Building Excellence for Over 15 Years"
-          description="Founded in 2009, Milestones Technologies has grown to become Southeast Asia's most trusted automation partner. We combine deep technical expertise, proven engineering capabilities, and an unwavering commitment to customer success. Our team of experienced professionals has successfully delivered over 500 projects across industrial automation, robotics, packaging machinery, smart gates, and custom engineering solutions."
+          title="Building Success Across Thailand and Southeast Asia"
+          description="Over 15 years of proven excellence in industrial automation, with a track record of delivering transformative solutions to leading companies."
           metrics={[
-            { value: "15+", title: "Years of Experience" },
-            { value: "500+", title: "Projects Delivered" },
-            { value: "98%", title: "Customer Satisfaction" },
-            { value: "24/7", title: "Support Available" },
-          ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-industrial-automation-installa-1773981131997-d20ced9d.png"
-          imageAlt="Milestones Technologies completed automation installation"
-          mediaAnimation="blur-reveal"
-          metricsAnimation="slide-up"
-          useInvertedBackground={false}
-        />
-      </div>
-
-      <div id="values" data-section="values">
-        <FeatureCardTwentyFour
-          tag="OUR VALUES"
-          tagIcon={Target}
-          tagAnimation="slide-up"
-          title="Principles That Drive Our Success"
-          description="Our core values guide every decision we make and every solution we deliver. We are committed to innovation, reliability, integrity, and customer-centric excellence."
-          features={[
             {
-              id: "innovation",              title: "Innovation & Technology",              author: "Forward Thinking",              description: "We continuously invest in cutting-edge technology and innovative solutions to keep our clients ahead of the curve. Our engineering team stays at the forefront of automation advancement.",              tags: ["Technology", "R&D", "Innovation"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Cutting-edge collaborative robots and automation technology"},
+              id: "experience",              value: "15+",              title: "Years in Business",              description: "Established in 2009, serving the automation industry since inception"},
             {
-              id: "reliability",              title: "Reliability & Quality",              author: "Proven Performance",              description: "Every system we deliver is engineered for reliability and durability. We maintain rigorous quality standards and provide comprehensive testing to ensure peak performance.",              tags: ["Quality", "Standards", "Durability"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Industrial automation control systems showcasing quality engineering"},
+              id: "projects",              value: "500+",              title: "Projects Delivered",              description: "Successful installations across manufacturing, logistics, and smart properties"},
             {
-              id: "partnership",              title: "Customer Partnership",              author: "Mutual Success",              description: "We view our clients as partners in success. Our team provides personalized support, customized solutions, and proactive guidance to maximize your operational excellence.",              tags: ["Support", "Partnership", "Success"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/custom-engineered-automation-solution-be-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "Custom engineering solutions developed in partnership with clients"},
+              id: "team",              value: "80+",              title: "Expert Team Members",              description: "Engineers, technicians, and support specialists dedicated to excellence"},
+            {
+              id: "clients",              value: "200+",              title: "Satisfied Clients",              description: "Long-term partnerships with industry leaders across multiple sectors"},
+            {
+              id: "uptime",              value: "99.8%",              title: "System Uptime",              description: "Industry-leading reliability in deployed automation systems"},
+            {
+              id: "countries",              value: "5",              title: "Countries Served",              description: "Expanding presence throughout Southeast Asia and beyond"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -149,55 +154,34 @@ export default function AboutPage() {
         />
       </div>
 
-      <div id="team" data-section="team">
-        <MetricCardEleven
-          tag="OUR TEAM"
-          tagIcon={Users}
-          tagAnimation="slide-up"
-          title="Expert Professionals Dedicated to Excellence"
-          description="Our team comprises experienced engineers, automation specialists, project managers, and technical support professionals united by a passion for delivering exceptional results."
-          metrics={[
-            {
-              id: "engineers",              value: "50+",              title: "Automation Engineers",              description: "Highly skilled professionals with expertise in industrial automation, robotics, and control systems"},
-            {
-              id: "technicians",              value: "30+",              title: "Technical Specialists",              description: "Certified technicians providing installation, commissioning, and maintenance services"},
-            {
-              id: "support",              value: "24/7",              title: "Round-the-Clock Support",              description: "Dedicated support team ensuring zero downtime and rapid response to any technical needs"},
-            {
-              id: "innovation",              value: "15",              title: "Years Average Experience",              description: "Our team brings decades of combined expertise in automation and engineering solutions"},
-          ]}
-          animationType="slide-up"
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardTen
+          title="What Our Clients Say"
+          description="Real stories from industry leaders who've transformed their operations with Milestones Technologies solutions."
           textboxLayout="default"
           useInvertedBackground={false}
-        />
-      </div>
-
-      <div id="testimonial" data-section="testimonial">
-        <TestimonialCardFifteen
-          testimonial="Milestones Technologies is more than a vendor—they're a strategic partner in our operational success. Their expertise, professionalism, and commitment to our long-term growth make them invaluable. We trust them completely and recommend them without hesitation to any organization seeking automation excellence."
-          rating={5}
-          author="Niran Suksomtree, Managing Director - Bangkok Food Processing"
-          avatars={[
+          tag="CLIENT TESTIMONIALS"
+          tagAnimation="slide-up"
+          testimonials={[
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png",              alt: "Niran Suksomtree"},
+              id: "testimonial-1",              title: "Game-Changing Partner",              quote: "Milestones Technologies completely transformed our manufacturing operations. Their expertise, professionalism, and genuine commitment to our success made all the difference. Within months, we saw dramatic improvements in efficiency and product quality.",              name: "Somchai Thaichai",              role: "Operations Director, Thai Automotive Group",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-execu-1773981130512-3b9ae1e1.png"},
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-female-pro-1773981130978-eb2d4e1c.png",              alt: "Wanida Kachuay"},
+              id: "testimonial-2",              title: "Trusted Innovation",              quote: "We've partnered with Milestones for multiple projects. Their innovative solutions combined with reliable support has consistently exceeded our expectations. They truly understand our business and deliver results.",              name: "Niran Suksomtree",              role: "Plant Manager, Bangkok Food Processing",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png"},
+            {
+              id: "testimonial-3",              title: "Exceptional Service",              quote: "From initial consultation through implementation and beyond, Milestones Technologies demonstrated exceptional technical knowledge and customer care. Their team is responsive, knowledgeable, and truly invested in our success.",              name: "Wanida Kachuay",              role: "Supply Chain Director, Southeast Electronics",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-female-pro-1773981130978-eb2d4e1c.png"},
           ]}
-          ratingAnimation="slide-up"
-          avatarsAnimation="slide-up"
-          useInvertedBackground={false}
         />
       </div>
 
       <div id="cta" data-section="cta">
         <ContactText
-          text="Ready to partner with Thailand's leading automation expert? Let's discuss how Milestones Technologies can transform your operations."
+          text="Ready to partner with Thailand's leading automation experts? Contact us today to discuss how we can transform your operations."
           background={{ variant: "animated-grid" }}
           buttons={[
             {
-              text: "Schedule a Consultation",              href: "/contact"},
+              text: "Get in Touch",              href: "/contact"},
             {
-              text: "Get in Touch",              href: "tel:+6621234567"},
+              text: "Call +66 2 123 4567",              href: "tel:+6621234567"},
           ]}
           useInvertedBackground={false}
         />
diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 6fbc78b..2836091 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -3,11 +3,11 @@
 import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
-import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
+import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
+import BlogCardThree from "@/components/sections/blog/BlogCardThree";
 import ContactText from "@/components/sections/contact/ContactText";
 import FooterBase from "@/components/sections/footer/FooterBase";
-import { Lightbulb, TrendingUp } from "lucide-react";
+import { BookOpen, Zap } from "lucide-react";
 
 export default function BlogPage() {
   const navItems = [
@@ -21,28 +21,25 @@ export default function BlogPage() {
 
   const footerColumns = [
     {
-      title: "Solutions",
-      items: [
-        { label: "Industrial Automation", href: "/" },
-        { label: "Robot & Cobot Systems", href: "/" },
-        { label: "Packaging Machinery", href: "/" },
-        { label: "Smart Gate Systems", href: "/" },
-        { label: "Custom Engineering", href: "/" },
+      title: "Solutions",      items: [
+        { label: "Industrial Automation", href: "/solutions" },
+        { label: "Robot & Cobot Systems", href: "/solutions" },
+        { label: "Packaging Machinery", href: "/solutions" },
+        { label: "Smart Gate Systems", href: "/solutions" },
+        { label: "Custom Engineering", href: "/solutions" },
       ],
     },
     {
-      title: "Company",
-      items: [
-        { label: "About Us", href: "/" },
-        { label: "Projects & Portfolio", href: "/" },
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Projects & Portfolio", href: "/projects" },
         { label: "Blog & Articles", href: "/blog" },
         { label: "Careers", href: "/" },
         { label: "Contact", href: "/contact" },
       ],
     },
     {
-      title: "Resources",
-      items: [
+      title: "Resources",      items: [
         { label: "Case Studies", href: "/" },
         { label: "Technical Documentation", href: "/" },
         { label: "Support Portal", href: "/" },
@@ -51,8 +48,7 @@ export default function BlogPage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Phone: +66 2 123 4567", href: "tel:+6621234567" },
         { label: "Email: info@milestones.co.th", href: "mailto:info@milestones.co.th" },
         { label: "LINE: @milestones-tech", href: "https://line.me" },
@@ -80,145 +76,74 @@ export default function BlogPage() {
           brandName="Milestones Technologies"
           navItems={navItems}
           button={{
-            text: "Request Quote",
-            href: "/contact",
-          }}
+            text: "Request Quote",            href: "/contact"}}
+        />
+      </div>
+
+      <div id="hero" data-section="hero">
+        <HeroBillboardGallery
+          title="Blog & Articles"
+          description="Stay updated with industry insights, automation trends, engineering best practices, and case studies from Milestones Technologies. Learn how automation can transform your business."
+          tag="INSIGHTS & RESOURCES"
+          tagIcon={BookOpen}
+          tagAnimation="slide-up"
+          buttons={[
+            {
+              text: "Subscribe to Updates",              href: "/contact"},
+          ]}
+          buttonAnimation="slide-up"
+          background={{ variant: "animated-grid" }}
+          mediaItems={[
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Professional engineering team working on automation project"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Industrial automation control system with PLC controllers"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Advanced collaborative robot with articulated arms"},
+          ]}
+          mediaAnimation="blur-reveal"
         />
       </div>
 
       <div id="blog-articles" data-section="blog-articles">
-        <div className="mx-auto px-4 md:px-6">
-          <FeatureCardTwentyFour
-            tag="INDUSTRY INSIGHTS"
-            tagIcon={Lightbulb}
-            tagAnimation="slide-up"
-            title="Latest Automation & Engineering Articles"
-            description="Stay informed with in-depth articles, case studies, and insights on industrial automation trends, best practices, and technological advancements in manufacturing and smart systems."
-            features={[
-              {
-                id: "article-1",
-                title: "The ROI of Industrial Automation: What You Need to Know",
-                author: "Engineering Team",
-                description: "Explore how modern automation delivers measurable returns, productivity gains, and cost savings. Learn what timeline to expect for ROI achievement in your facility.",
-                tags: ["ROI", "Financial Planning", "Automation Benefits"],
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=2",
-                imageAlt: "Industrial automation ROI analysis",
-              },
-              {
-                id: "article-2",
-                title: "Collaborative Robots: The Future of Manufacturing Workforce",
-                author: "Innovation Lab",
-                description: "Discover how cobots are revolutionizing factories by working safely alongside human workers. Understand safety standards, training requirements, and real-world applications.",
-                tags: ["Robotics", "Cobot Technology", "Workforce Evolution"],
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/collaborative-robot-cobot-working-alongs-1773981130740-14a987e9.png?_wi=2",
-                imageAlt: "Collaborative robot manufacturing",
-              },
-              {
-                id: "article-3",
-                title: "Smart Gate Systems: Security Meets Convenience in Modern Properties",
-                author: "Smart Solutions",
-                description: "Learn about the latest smart gate technologies including RFID, mobile app control, and advanced security features. Perfect for residential and commercial properties.",
-                tags: ["Smart Gates", "Security", "Smart Living"],
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/smart-gate-control-system-display-with-d-1773981131975-1ea8ba37.png?_wi=2",
-                imageAlt: "Smart gate system interface",
-              },
-              {
-                id: "article-4",
-                title: "Packaging Automation: Meeting Consumer Demands with Speed & Quality",
-                author: "Production Expert",
-                description: "Examine how advanced packaging systems integrate with quality control, sustainability requirements, and high-speed production. Industry standards and best practices included.",
-                tags: ["Packaging", "Quality Control", "Production Speed"],
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/high-speed-packaging-machinery-in-operat-1773981132057-91de9d07.png?_wi=2",
-                imageAlt: "Automated packaging machinery",
-              },
-              {
-                id: "article-5",
-                title: "Custom Automation Solutions: Building Systems for Your Unique Needs",
-                author: "Engineering Services",
-                description: "From concept to implementation, learn how custom engineering solves specific manufacturing challenges. Real case studies from diverse industries included.",
-                tags: ["Custom Solutions", "Engineering", "Industry-Specific"],
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=2",
-                imageAlt: "Custom engineering project",
-              },
-            ]}
-            animationType="slide-up"
-            textboxLayout="default"
-            useInvertedBackground={false}
-          />
-        </div>
+        <BlogCardThree
+          tag="LATEST ARTICLES"
+          tagIcon={Zap}
+          tagAnimation="slide-up"
+          title="Featured Articles & Insights"
+          description="Explore our latest articles covering industrial automation, robotics, manufacturing trends, and engineering solutions to help optimize your operations."
+          blogs={[
+            {
+              id: "article-1",              category: "Automation Trends",              title: "The Future of Industrial Automation in Southeast Asia",              excerpt: "Discover how AI, IoT, and machine learning are revolutionizing manufacturing across Thailand and the region. Learn about emerging trends and technologies shaping the industry.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Industrial automation technology",              authorName: "Dr. Suda Nakprasert",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-execu-1773981130512-3b9ae1e1.png",              date: "January 15, 2025"},
+            {
+              id: "article-2",              category: "Case Study",              title: "How Automotive Manufacturer Increased Efficiency by 35% with Our Systems",              excerpt: "Learn how a leading automotive manufacturer achieved significant productivity gains and reduced defects through our comprehensive automation solutions.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Automotive assembly line",              authorName: "Niran Suksomtree",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png",              date: "January 10, 2025"},
+            {
+              id: "article-3",              category: "Technology Guide",              title: "Collaborative Robots (Cobots) vs Traditional Industrial Robots",              excerpt: "Compare the benefits and applications of collaborative robots with traditional industrial robots. Understand which solution works best for your facility.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Collaborative robot technology",              authorName: "Wanida Kachuay",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-female-pro-1773981130978-eb2d4e1c.png",              date: "January 5, 2025"},
+            {
+              id: "article-4",              category: "Industry Insights",              title: "Smart Gates & Access Control Systems for Modern Facilities",              excerpt: "Explore the latest developments in smart gate technology, including RFID integration, remote control capabilities, and advanced security features.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-premium-automatic-sliding-gate-wi-1773981131408-069d06de.png?_wi=1",              imageAlt: "Smart gate system",              authorName: "Pattarapol Moonkhan",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-busin-1773981131172-a7325777.png",              date: "December 28, 2024"},
+            {
+              id: "article-5",              category: "Best Practices",              title: "ROI Calculation: Measuring the Value of Automation Investments",              excerpt: "Learn how to calculate and measure return on investment (ROI) for your automation projects. Understand key metrics and success indicators.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/high-speed-packaging-machinery-in-operat-1773981132057-91de9d07.png?_wi=1",              imageAlt: "Packaging machinery efficiency",              authorName: "Dr. Suda Nakprasert",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-execu-1773981130512-3b9ae1e1.png",              date: "December 20, 2024"},
+            {
+              id: "article-6",              category: "Industry News",              title: "Latest Innovations in Food Processing & Packaging Automation",              excerpt: "Stay informed about the newest technologies and innovations in food processing automation, quality control, and high-speed packaging systems.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-facility-with-integrated-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Food processing facility",              authorName: "Niran Suksomtree",              authorAvatar: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png",              date: "December 15, 2024"},
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
       </div>
 
-      <div id="blog-trends" data-section="blog-trends">
-        <div className="mx-auto px-4 md:px-6">
-          <MetricCardEleven
-            tag="INDUSTRY TRENDS"
-            tagIcon={TrendingUp}
-            tagAnimation="slide-up"
-            title="Automation Industry Growth & Adoption Metrics"
-            description="Understand the market landscape and adoption rates driving industrial transformation across Southeast Asia and globally."
-            metrics={[
-              {
-                id: "metric-adoption",
-                value: "73%",
-                title: "Factory Adoption Rate",
-                description: "Manufacturing facilities in Thailand now utilizing some form of automation",
-              },
-              {
-                id: "metric-growth",
-                value: "28%",
-                title: "Annual Industry Growth",
-                description: "Industrial automation sector experiencing sustained double-digit growth",
-              },
-              {
-                id: "metric-investment",
-                value: "15B+",
-                title: "Annual Investment",
-                description: "Regional investment in automation technology and solutions",
-              },
-              {
-                id: "metric-jobs",
-                value: "42K+",
-                title: "New Technical Jobs",
-                description: "Skilled positions created in automation, robotics, and engineering",
-              },
-              {
-                id: "metric-efficiency",
-                value: "35%",
-                title: "Average Efficiency Gain",
-                description: "Reported productivity improvement from automation adoption",
-              },
-              {
-                id: "metric-timeline",
-                value: "2-3",
-                title: "Year Implementation",
-                description: "Typical timeline from planning to full system deployment",
-              },
-            ]}
-            animationType="slide-up"
-            textboxLayout="default"
-            useInvertedBackground={false}
-          />
-        </div>
-      </div>
-
-      <div id="blog-cta" data-section="blog-cta">
-        <div className="mx-auto px-4 md:px-6">
-          <ContactText
-            text="Ready to explore automation solutions for your business? Connect with our experts to discuss your industry-specific needs and opportunities."
-            background={{ variant: "grid" }}
-            buttons={[
-              {
-                text: "Schedule Consultation",
-                href: "/contact",
-              },
-              {
-                text: "Download Resources",
-                href: "/contact",
-              },
-            ]}
-            useInvertedBackground={false}
-          />
-        </div>
+      <div id="cta" data-section="cta">
+        <ContactText
+          text="Have questions about our automation solutions? Subscribe to our newsletter for industry insights or contact our team for personalized recommendations."
+          background={{ variant: "animated-grid" }}
+          buttons={[
+            {
+              text: "Subscribe Now",              href: "/contact"},
+            {
+              text: "Contact Us",              href: "/contact"},
+          ]}
+          useInvertedBackground={false}
+        />
       </div>
 
       <div id="footer" data-section="footer">
@@ -230,4 +155,4 @@ export default function BlogPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index df67404..dfe31c0 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -3,11 +3,9 @@
 import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import TestimonialAboutCard from "@/components/sections/about/TestimonialAboutCard";
-import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
-import ContactText from "@/components/sections/contact/ContactText";
+import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterBase from "@/components/sections/footer/FooterBase";
-import { Mail } from "lucide-react";
+import { Mail, Phone, MapPin, Clock } from "lucide-react";
 
 export default function ContactPage() {
   const navItems = [
@@ -21,28 +19,25 @@ export default function ContactPage() {
 
   const footerColumns = [
     {
-      title: "Solutions",
-      items: [
-        { label: "Industrial Automation", href: "/" },
-        { label: "Robot & Cobot Systems", href: "/" },
-        { label: "Packaging Machinery", href: "/" },
-        { label: "Smart Gate Systems", href: "/" },
-        { label: "Custom Engineering", href: "/" },
+      title: "Solutions",      items: [
+        { label: "Industrial Automation", href: "/solutions" },
+        { label: "Robot & Cobot Systems", href: "/solutions" },
+        { label: "Packaging Machinery", href: "/solutions" },
+        { label: "Smart Gate Systems", href: "/solutions" },
+        { label: "Custom Engineering", href: "/solutions" },
       ],
     },
     {
-      title: "Company",
-      items: [
-        { label: "About Us", href: "/" },
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
         { label: "Projects & Portfolio", href: "/" },
-        { label: "Blog & Articles", href: "/blog" },
+        { label: "Blog & Articles", href: "/" },
         { label: "Careers", href: "/" },
         { label: "Contact", href: "/contact" },
       ],
     },
     {
-      title: "Resources",
-      items: [
+      title: "Resources",      items: [
         { label: "Case Studies", href: "/" },
         { label: "Technical Documentation", href: "/" },
         { label: "Support Portal", href: "/" },
@@ -51,8 +46,7 @@ export default function ContactPage() {
       ],
     },
     {
-      title: "Contact",
-      items: [
+      title: "Contact",      items: [
         { label: "Phone: +66 2 123 4567", href: "tel:+6621234567" },
         { label: "Email: info@milestones.co.th", href: "mailto:info@milestones.co.th" },
         { label: "LINE: @milestones-tech", href: "https://line.me" },
@@ -80,104 +74,30 @@ export default function ContactPage() {
           brandName="Milestones Technologies"
           navItems={navItems}
           button={{
-            text: "Request Quote",
-            href: "/contact",
+            text: "Request Quote",            href: "/contact"
           }}
         />
       </div>
 
-      <div id="contact-info" data-section="contact-info">
-        <div className="mx-auto px-4 md:px-6">
-          <TestimonialAboutCard
-            tag="GET IN TOUCH"
-            tagIcon={Mail}
-            tagAnimation="slide-up"
-            title="Contact Milestones Technologies"
-            description="Reach out to our team to discuss your automation and engineering needs. We're here to help you find the perfect solution for your business.",
-            subdescription="Whether you need a quick consultation, detailed proposal, or technical support, our dedicated team is ready to assist you. Contact us via phone, email, or visit our office in Bangkok."
-            icon={Mail}
-            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/milestones-technologies-modern-facility--1773981137018-c41797de.png"
-            imageAlt="Milestones Technologies office"
-            mediaAnimation="slide-up"
-            useInvertedBackground={false}
-          />
-        </div>
-      </div>
-
-      <div id="contact-methods" data-section="contact-methods">
-        <div className="mx-auto px-4 md:px-6">
-          <ProductCardTwo
-            gridVariant="two-columns-alternating-heights"
-            animationType="slide-up"
-            textboxLayout="default"
-            useInvertedBackground={false}
-            title="Multiple Ways to Reach Us"
-            description="Choose the contact method that works best for you. Our team responds promptly to all inquiries."
-            products={[
-              {
-                id: "contact-phone",
-                brand: "Direct Line",
-                name: "Phone Support",
-                price: "24/7 Available",
-                rating: 5,
-                reviewCount: "Response in minutes",
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png",
-                imageAlt: "Phone support",
-              },
-              {
-                id: "contact-email",
-                brand: "Professional",
-                name: "Email Support",
-                price: "24-48 hrs",
-                rating: 5,
-                reviewCount: "Detailed responses",
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png",
-                imageAlt: "Email support",
-              },
-              {
-                id: "contact-office",
-                brand: "In-Person",
-                name: "Office Visit",
-                price: "By appointment",
-                rating: 5,
-                reviewCount: "Bangkok location",
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/milestones-technologies-modern-facility--1773981137018-c41797de.png",
-                imageAlt: "Office location",
-              },
-              {
-                id: "contact-line",
-                brand: "Instant",
-                name: "LINE Chat",
-                price: "Quick response",
-                rating: 5,
-                reviewCount: "Popular in Thailand",
-                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/smart-gate-control-system-display-with-d-1773981131975-1ea8ba37.png",
-                imageAlt: "LINE chat support",
-              },
-            ]}
-          />
-        </div>
-      </div>
-
-      <div id="contact-cta" data-section="contact-cta">
-        <div className="mx-auto px-4 md:px-6">
-          <ContactText
-            text="Don't wait to transform your operations. Contact our solutions team today for a free consultation and discover how Milestones Technologies can revolutionize your automation strategy."
-            animationType="entrance-slide"
-            background={{ variant: "grid" }}
-            buttons={[
-              {
-                text: "Start Free Consultation",
-                href: "mailto:info@milestones.co.th",
-              },
-              {
-                text: "Call Now",
-                href: "tel:+6621234567",
-              },
-            ]}
-            useInvertedBackground={false}
-          />
-        </div>
+      <div id="contact" data-section="contact">
+        <ContactCTA
+          tag="GET IN TOUCH"
+          tagIcon={Mail}
+          tagAnimation="slide-up"
+          title="Contact Milestones Technologies"
+          description="Have questions about our automation solutions? Our team is ready to help. Contact us today for a free consultation and custom proposal for your industrial automation, robotics, packaging, or smart gate needs."
+          buttons={[
+            {
+              text: "Send Message",              href: "mailto:info@milestones.co.th"
+            },
+            {
+              text: "Call Now",              href: "tel:+6621234567"
+            },
+          ]}
+          buttonAnimation="slide-up"
+          background={{ variant: "animated-grid" }}
+          useInvertedBackground={false}
+        />
       </div>
 
       <div id="footer" data-section="footer">
diff --git a/src/app/page.tsx b/src/app/page.tsx
index cc5d389..060301f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -19,8 +19,8 @@ export default function HomePage() {
     { name: "Home", id: "home" },
     { name: "About", id: "about" },
     { name: "Solutions", id: "solutions" },
-    { name: "Projects", id: "/projects" },
-    { name: "Blog", id: "/blog" },
+    { name: "Projects", id: "projects" },
+    { name: "Blog", id: "blog" },
     { name: "Contact", id: "contact" },
   ];
 
@@ -37,8 +37,8 @@ export default function HomePage() {
     {
       title: "Company",      items: [
         { label: "About Us", href: "/about" },
-        { label: "Projects & Portfolio", href: "/projects" },
-        { label: "Blog & Articles", href: "/blog" },
+        { label: "Projects & Portfolio", href: "/" },
+        { label: "Blog & Articles", href: "/" },
         { label: "Careers", href: "/" },
         { label: "Contact", href: "/contact" },
       ],
@@ -81,7 +81,8 @@ export default function HomePage() {
           brandName="Milestones Technologies"
           navItems={navItems}
           button={{
-            text: "Request Quote",            href: "/contact"}}
+            text: "Request Quote",            href: "/contact"
+          }}
         />
       </div>
 
@@ -94,25 +95,33 @@ export default function HomePage() {
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Request a Quote",              href: "/contact"},
+              text: "Request a Quote",              href: "/contact"
+            },
             {
-              text: "Explore Solutions",              href: "/"},
+              text: "Explore Solutions",              href: "/"
+            },
           ]}
           buttonAnimation="slide-up"
           background={{ variant: "animated-grid" }}
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Industrial robot arm performing precise assembly on factory floor. Modern manufacturing facility wit"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Industrial robot arm performing precise assembly on factory floor. Modern manufacturing facility wit"
+            },
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/high-speed-packaging-machinery-in-operat-1773981132057-91de9d07.png?_wi=1",              imageAlt: "High-speed packaging machinery in operation. Colorful packaged products moving through conveyor syst"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/high-speed-packaging-machinery-in-operat-1773981132057-91de9d07.png?_wi=1",              imageAlt: "High-speed packaging machinery in operation. Colorful packaged products moving through conveyor syst"
+            },
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/smart-gate-control-system-display-with-d-1773981131975-1ea8ba37.png?_wi=1",              imageAlt: "Smart gate control system display with digital interface showing access control and security feature"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/smart-gate-control-system-display-with-d-1773981131975-1ea8ba37.png?_wi=1",              imageAlt: "Smart gate control system display with digital interface showing access control and security feature"
+            },
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/collaborative-robot-cobot-working-alongs-1773981130740-14a987e9.png?_wi=1",              imageAlt: "Collaborative robot (cobot) working alongside human operator in assembly environment. Safe, modern w"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/collaborative-robot-cobot-working-alongs-1773981130740-14a987e9.png?_wi=1",              imageAlt: "Collaborative robot (cobot) working alongside human operator in assembly environment. Safe, modern w"
+            },
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Professional engineering team working on factory automation project. Engineers examining blueprints "},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Professional engineering team working on factory automation project. Engineers examining blueprints "
+            },
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png",              imageAlt: "Completed industrial automation installation showcasing integrated systems. Multiple conveyor lines,"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png",              imageAlt: "Completed industrial automation installation showcasing integrated systems. Multiple conveyor lines,"
+            },
           ]}
           mediaAnimation="blur-reveal"
         />
@@ -128,19 +137,24 @@ export default function HomePage() {
           features={[
             {
               id: "industrial-automation",              title: "Industrial Automation Systems",              author: "Manufacturing Excellence",              description: "End-to-end automation solutions for production lines, assembly processes, and manufacturing workflows. Increase productivity by up to 40% with our integrated control systems and real-time monitoring.",              tags: ["Production Lines", "Assembly", "Monitoring"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Industrial automation control system with PLC controllers, variable frequency drives, and wiring. Cl"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Industrial automation control system with PLC controllers, variable frequency drives, and wiring. Cl"
+            },
             {
               id: "robot-cobot",              title: "Robot & Cobot Automation",              author: "Precision Robotics",              description: "Cutting-edge robotic and collaborative robot solutions for precise, repetitive tasks. Perfect for warehousing, assembly, material handling, and specialized manufacturing applications.",              tags: ["Robotics", "Cobots", "Material Handling"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Advanced collaborative robot with articulated arms performing complex assembly task. Compact cobot d"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Advanced collaborative robot with articulated arms performing complex assembly task. Compact cobot d"
+            },
             {
               id: "packaging-machinery",              title: "Packaging Machinery Solutions",              author: "Production Optimization",              description: "Advanced packaging systems for food, pharmaceutical, and consumer goods industries. High-speed, reliable packaging with quality control integration.",              tags: ["Packaging", "Quality Control", "High-Speed"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "State-of-the-art automatic packaging system with multiple stations. Products being filled, sealed, a"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "State-of-the-art automatic packaging system with multiple stations. Products being filled, sealed, a"
+            },
             {
               id: "smart-gate",              title: "Smart Gate & Access Systems",              author: "Security & Convenience",              description: "Premium automatic gate solutions for residential, commercial, and industrial properties. Includes remote control, RFID integration, and advanced security features for modern smart living.",              tags: ["Smart Gates", "Access Control", "Security"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-premium-automatic-sliding-gate-wi-1773981131408-069d06de.png?_wi=1",              imageAlt: "Modern premium automatic sliding gate with remote control and RFID reader. Beautiful residential or "},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-premium-automatic-sliding-gate-wi-1773981131408-069d06de.png?_wi=1",              imageAlt: "Modern premium automatic sliding gate with remote control and RFID reader. Beautiful residential or "
+            },
             {
               id: "custom-engineering",              title: "Custom Engineering Solutions",              author: "Tailored Innovation",              description: "Bespoke automation and engineering solutions designed specifically for your unique operational requirements. From concept to implementation and ongoing support.",              tags: ["Engineering", "Customization", "Support"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/custom-engineered-automation-solution-be-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "Custom engineered automation solution being installed at client site. Unique integrated system combi"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/custom-engineered-automation-solution-be-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "Custom engineered automation solution being installed at client site. Unique integrated system combi"
+            },
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -157,17 +171,23 @@ export default function HomePage() {
           description="We combine technical expertise, proven track record, and customer-centric approach to deliver automation solutions that transform operations and drive business growth."
           metrics={[
             {
-              id: "experience",              value: "15+",              title: "Years of Experience",              description: "Trusted by factories and businesses across Southeast Asia since 2009"},
+              id: "experience",              value: "15+",              title: "Years of Experience",              description: "Trusted by factories and businesses across Southeast Asia since 2009"
+            },
             {
-              id: "projects",              value: "500+",              title: "Projects Completed",              description: "Successful installations and implementations across all solution categories"},
+              id: "projects",              value: "500+",              title: "Projects Completed",              description: "Successful installations and implementations across all solution categories"
+            },
             {
-              id: "efficiency",              value: "40%",              title: "Average Productivity Increase",              description: "Clients report significant efficiency gains within first 6 months"},
+              id: "efficiency",              value: "40%",              title: "Average Productivity Increase",              description: "Clients report significant efficiency gains within first 6 months"
+            },
             {
-              id: "satisfaction",              value: "98%",              title: "Client Satisfaction Rate",              description: "Industry-leading customer satisfaction and long-term partnerships"},
+              id: "satisfaction",              value: "98%",              title: "Client Satisfaction Rate",              description: "Industry-leading customer satisfaction and long-term partnerships"
+            },
             {
-              id: "support",              value: "24/7",              title: "Technical Support",              description: "Round-the-clock support team to ensure zero downtime operations"},
+              id: "support",              value: "24/7",              title: "Technical Support",              description: "Round-the-clock support team to ensure zero downtime operations"
+            },
             {
-              id: "roi",              value: "8-12",              title: "Month ROI Timeline",              description: "Most clients achieve return on investment within 8-12 months"},
+              id: "roi",              value: "8-12",              title: "Month ROI Timeline",              description: "Most clients achieve return on investment within 8-12 months"
+            },
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -185,22 +205,28 @@ export default function HomePage() {
           products={[
             {
               id: "project-1",              brand: "Automotive Manufacturer",              name: "Complete Assembly Line Automation",              price: "2.5M THB",              rating: 5,
-              reviewCount: "12",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Complete automotive assembly line with multiple robotic arms working in sequence. Complex multi-stat"},
+              reviewCount: "12",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Complete automotive assembly line with multiple robotic arms working in sequence. Complex multi-stat"
+            },
             {
               id: "project-2",              brand: "Food Processing Plant",              name: "High-Speed Packaging System",              price: "1.8M THB",              rating: 5,
-              reviewCount: "8",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-facility-with-integrated-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Food processing facility with integrated packaging machinery. Automated filling, sealing, and labeli"},
+              reviewCount: "8",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-facility-with-integrated-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Food processing facility with integrated packaging machinery. Automated filling, sealing, and labeli"
+            },
             {
               id: "project-3",              brand: "Electronics Warehouse",              name: "Cobot Material Handling System",              price: "1.2M THB",              rating: 5,
-              reviewCount: "9",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Warehouse with collaborative robots managing material handling and logistics. Cobots picking and pla"},
+              reviewCount: "9",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Warehouse with collaborative robots managing material handling and logistics. Cobots picking and pla"
+            },
             {
               id: "project-4",              brand: "Luxury Residential Complex",              name: "Smart Gate Access System",              price: "800K THB",              rating: 5,
-              reviewCount: "15",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/luxury-residential-complex-entrance-with-1773981131885-7d86d7ce.png?_wi=1",              imageAlt: "Luxury residential complex entrance with installed smart gate system. Beautiful modern gate integrat"},
+              reviewCount: "15",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/luxury-residential-complex-entrance-with-1773981131885-7d86d7ce.png?_wi=1",              imageAlt: "Luxury residential complex entrance with installed smart gate system. Beautiful modern gate integrat"
+            },
             {
               id: "project-5",              brand: "Chemical Manufacturing",              name: "Custom Robotic Production Line",              price: "3.2M THB",              rating: 5,
-              reviewCount: "7",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-facility-with-rob-1773981131785-741649af.png?_wi=1",              imageAlt: "Chemical manufacturing facility with robotic production line. Safe automated chemical processing wit"},
+              reviewCount: "7",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-facility-with-rob-1773981131785-741649af.png?_wi=1",              imageAlt: "Chemical manufacturing facility with robotic production line. Safe automated chemical processing wit"
+            },
             {
               id: "project-6",              brand: "Pharmaceutical Facility",              name: "Integrated Packaging & QC System",              price: "2.1M THB",              rating: 5,
-              reviewCount: "11",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",              imageAlt: "Pharmaceutical facility with integrated packaging and quality control system. Automated pill/tablet "},
+              reviewCount: "11",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",              imageAlt: "Pharmaceutical facility with integrated packaging and quality control system. Automated pill/tablet "
+            },
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
@@ -217,9 +243,11 @@ export default function HomePage() {
           title="Trusted by Thailand's Leading Companies"
           description="Milestones Technologies is the preferred automation partner for major manufacturers, food processors, chemical plants, and property developers across Southeast Asia."
           names={[
-            "Thai Automotive Group",            "Bangkok Food Processing",            "Southeast Electronics Corp",            "Thai Chemical Industries",            "Bangkok Pharmaceutical",            "Thai Packaging Solutions",            "Regional Warehousing Co",            "Bangkok Property Developers"]}
+            "Thai Automotive Group",            "Bangkok Food Processing",            "Southeast Electronics Corp",            "Thai Chemical Industries",            "Bangkok Pharmaceutical",            "Thai Packaging Solutions",            "Regional Warehousing Co",            "Bangkok Property Developers"
+          ]}
           logos={[
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-corporate-logo-for-automoti-1773981130490-d851f847.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-company-professional-log-1773981131364-3e0f1b67.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/electronics-corporation-professional-log-1773981133845-5e6dbc25.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-company-professio-1773981130788-63944153.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-company-professional-logo-1773981130764-ae871848.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/packaging-solutions-company-professional-1773981131039-83d43e45.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-and-logistics-company-professi-1773981132381-3ecc38c8.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/real-estate-and-property-development-com-1773981130307-dd93d586.png"]}
+            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-corporate-logo-for-automoti-1773981130490-d851f847.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-company-professional-log-1773981131364-3e0f1b67.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/electronics-corporation-professional-log-1773981133845-5e6dbc25.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-company-professio-1773981130788-63944153.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-company-professional-logo-1773981130764-ae871848.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/packaging-solutions-company-professional-1773981131039-83d43e45.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-and-logistics-company-professi-1773981132381-3ecc38c8.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/real-estate-and-property-development-com-1773981130307-dd93d586.png"
+          ]}
           textboxLayout="default"
           useInvertedBackground={false}
           showCard={true}
@@ -234,13 +262,17 @@ export default function HomePage() {
           author="Somchai Thaichai, Operations Director - Thai Automotive Group"
           avatars={[
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-execu-1773981130512-3b9ae1e1.png",              alt: "Somchai Thaichai"},
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-execu-1773981130512-3b9ae1e1.png",              alt: "Somchai Thaichai"
+            },
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png",              alt: "Niran Suksomtree"},
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png",              alt: "Niran Suksomtree"
+            },
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-female-pro-1773981130978-eb2d4e1c.png",              alt: "Wanida Kachuay"},
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-female-pro-1773981130978-eb2d4e1c.png",              alt: "Wanida Kachuay"
+            },
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-busin-1773981131172-a7325777.png",              alt: "Pattarapol Moonkhan"},
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-busin-1773981131172-a7325777.png",              alt: "Pattarapol Moonkhan"
+            },
           ]}
           ratingAnimation="slide-up"
           avatarsAnimation="slide-up"
@@ -254,9 +286,11 @@ export default function HomePage() {
           background={{ variant: "animated-grid" }}
           buttons={[
             {
-              text: "Request a Free Consultation",              href: "/contact"},
+              text: "Request a Free Consultation",              href: "/contact"
+            },
             {
-              text: "Call Us Now",              href: "tel:+6621234567"},
+              text: "Call Us Now",              href: "tel:+6621234567"
+            },
           ]}
           useInvertedBackground={false}
         />
diff --git a/src/app/projects/page.tsx b/src/app/projects/page.tsx
index 99560df..12a1716 100644
--- a/src/app/projects/page.tsx
+++ b/src/app/projects/page.tsx
@@ -1,21 +1,21 @@
 "use client";
 
+import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
 import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
 import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
-import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
 import ContactText from "@/components/sections/contact/ContactText";
 import FooterBase from "@/components/sections/footer/FooterBase";
-import { CheckCircle, Award, Zap } from "lucide-react";
+import { CheckCircle, Zap } from "lucide-react";
 
 export default function ProjectsPage() {
   const navItems = [
     { name: "Home", id: "home" },
     { name: "About", id: "about" },
     { name: "Solutions", id: "solutions" },
-    { name: "Projects", id: "/projects" },
-    { name: "Blog", id: "/blog" },
+    { name: "Projects", id: "projects" },
+    { name: "Blog", id: "blog" },
     { name: "Contact", id: "contact" },
   ];
 
@@ -58,33 +58,6 @@ export default function ProjectsPage() {
     },
   ];
 
-  const allProjects = [
-    {
-      id: "project-1",      brand: "Automotive Manufacturer",      name: "Complete Assembly Line Automation",      price: "2.5M THB",      rating: 5,
-      reviewCount: "12",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",      imageAlt: "Complete automotive assembly line with multiple robotic arms working in sequence. Complex multi-stat"},
-    {
-      id: "project-2",      brand: "Food Processing Plant",      name: "High-Speed Packaging System",      price: "1.8M THB",      rating: 5,
-      reviewCount: "8",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-facility-with-integrated-1773981131923-cf0c3dab.png?_wi=1",      imageAlt: "Food processing facility with integrated packaging machinery. Automated filling, sealing, and labeli"},
-    {
-      id: "project-3",      brand: "Electronics Warehouse",      name: "Cobot Material Handling System",      price: "1.2M THB",      rating: 5,
-      reviewCount: "9",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",      imageAlt: "Warehouse with collaborative robots managing material handling and logistics. Cobots picking and pla"},
-    {
-      id: "project-4",      brand: "Luxury Residential Complex",      name: "Smart Gate Access System",      price: "800K THB",      rating: 5,
-      reviewCount: "15",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/luxury-residential-complex-entrance-with-1773981131885-7d86d7ce.png?_wi=1",      imageAlt: "Luxury residential complex entrance with installed smart gate system. Beautiful modern gate integrat"},
-    {
-      id: "project-5",      brand: "Chemical Manufacturing",      name: "Custom Robotic Production Line",      price: "3.2M THB",      rating: 5,
-      reviewCount: "7",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-facility-with-rob-1773981131785-741649af.png?_wi=1",      imageAlt: "Chemical manufacturing facility with robotic production line. Safe automated chemical processing wit"},
-    {
-      id: "project-6",      brand: "Pharmaceutical Facility",      name: "Integrated Packaging & QC System",      price: "2.1M THB",      rating: 5,
-      reviewCount: "11",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",      imageAlt: "Pharmaceutical facility with integrated packaging and quality control system. Automated pill/tablet "},
-    {
-      id: "project-7",      brand: "Beverage Manufacturer",      name: "Production Line Optimization",      price: "1.5M THB",      rating: 5,
-      reviewCount: "10",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/beverage-production-line-optimization-1773981131900-a1b2c3d4.png?_wi=1",      imageAlt: "Beverage manufacturing production line with automated filling and capping systems"},
-    {
-      id: "project-8",      brand: "Hospital Facility",      name: "Smart Access Control System",      price: "900K THB",      rating: 5,
-      reviewCount: "14",      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/hospital-access-control-system-1773981131850-e5f6g7h8.png?_wi=1",      imageAlt: "Hospital facility with smart access control and security systems"},
-  ];
-
   return (
     <ThemeProvider
       defaultButtonVariant="shift-hover"
@@ -110,71 +83,58 @@ export default function ProjectsPage() {
       <div id="hero" data-section="hero">
         <HeroBillboardGallery
           title="Our Project Portfolio"
-          description="Explore our comprehensive portfolio of successful automation projects across manufacturing, warehousing, packaging, and smart living sectors. Each project demonstrates our commitment to delivering tailored solutions that drive measurable results."
-          tag="PORTFOLIO & CASE STUDIES"
+          description="Explore our featured installation works showcasing our capabilities across industrial automation, robotics, packaging systems, and smart gate installations. Each project demonstrates our commitment to excellence and customer success."
+          tag="PORTFOLIO & INSTALLATIONS"
           tagIcon={CheckCircle}
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Request Similar Solution",              href: "/contact"},
+              text: "Request a Quote",              href: "/contact"},
             {
-              text: "View Full Portfolio",              href: "#projects"},
+              text: "Contact Us",              href: "/contact"},
           ]}
           buttonAnimation="slide-up"
           background={{ variant: "animated-grid" }}
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Industrial robot arm performing precise assembly"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Complete automotive assembly line with multiple robotic arms working in sequence"},
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Automotive assembly line"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-facility-with-integrated-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Food processing facility with integrated packaging machinery"},
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/high-speed-packaging-machinery-in-operat-1773981132057-91de9d07.png?_wi=1",              imageAlt: "Packaging machinery in operation"},
-            {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Warehouse with collaborative robots"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Warehouse with collaborative robots managing material handling and logistics"},
           ]}
           mediaAnimation="blur-reveal"
         />
       </div>
 
-      <div id="projects" data-section="projects">
+      <div id="featured-projects" data-section="featured-projects">
         <ProductCardTwo
-          tag="FEATURED & RECENT PROJECTS"
-          tagIcon={Award}
-          tagAnimation="slide-up"
-          title="Complete Project Showcase"
-          description="Browse through our diverse portfolio of successful installations, each delivering significant improvements in efficiency, safety, and operational performance."
-          products={allProjects}
-          gridVariant="bento-grid"
-          animationType="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={false}
-        />
-      </div>
-
-      <div id="project-details" data-section="project-details">
-        <FeatureCardTwentyFour
-          tag="PROJECT MANAGEMENT & SUPPORT"
+          tag="ALL PROJECTS"
           tagIcon={Zap}
           tagAnimation="slide-up"
-          title="Our Project Delivery Approach"
-          description="We follow a structured methodology to ensure every project is delivered on time, within budget, and exceeds expectations."
-          features={[
+          title="Featured Installation Works"
+          description="Explore recent projects showcasing our capabilities across industrial automation, robotics, packaging systems, and smart gate installations."
+          products={[
             {
-              id: "consultation",              title: "Initial Consultation",              author: "Planning Phase",              description: "In-depth analysis of your requirements, facility assessment, and custom solution design. We understand your specific challenges before proposing automation solutions.",              tags: ["Assessment", "Design", "Planning"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Engineering consultation"},
+              id: "project-1",              brand: "Automotive Manufacturer",              name: "Complete Assembly Line Automation",              price: "2.5M THB",              rating: 5,
+              reviewCount: "12",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Complete automotive assembly line with multiple robotic arms working in sequence"},
             {
-              id: "engineering",              title: "Engineering & Design",              author: "Technical Development",              description: "Our expert engineers develop detailed technical specifications, system designs, and implementation plans tailored to your requirements.",              tags: ["CAD Design", "3D Modeling", "Specifications"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/custom-engineered-automation-solution-be-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "Engineering design"},
+              id: "project-2",              brand: "Food Processing Plant",              name: "High-Speed Packaging System",              price: "1.8M THB",              rating: 5,
+              reviewCount: "8",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-facility-with-integrated-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Food processing facility with integrated packaging machinery"},
             {
-              id: "installation",              title: "Professional Installation",              author: "Execution Phase",              description: "Our certified technicians manage all installation activities, ensuring minimal disruption to your operations and adherence to safety standards.",              tags: ["Installation", "Testing", "Commissioning"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png?_wi=1",              imageAlt: "Installation process"},
+              id: "project-3",              brand: "Electronics Warehouse",              name: "Cobot Material Handling System",              price: "1.2M THB",              rating: 5,
+              reviewCount: "9",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Warehouse with collaborative robots managing material handling and logistics"},
             {
-              id: "training",              title: "Training & Documentation",              author: "Knowledge Transfer",              description: "Comprehensive training programs for your team, complete with technical documentation and operational manuals for long-term success.",              tags: ["Staff Training", "Documentation", "Manuals"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Team training"},
+              id: "project-4",              brand: "Luxury Residential Complex",              name: "Smart Gate Access System",              price: "800K THB",              rating: 5,
+              reviewCount: "15",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/luxury-residential-complex-entrance-with-1773981131885-7d86d7ce.png?_wi=1",              imageAlt: "Luxury residential complex entrance with installed smart gate system"},
             {
-              id: "support",              title: "Ongoing Support",              author: "Maintenance & Support",              description: "24/7 technical support, preventive maintenance, spare parts availability, and system upgrades to ensure continuous optimal performance.",              tags: ["24/7 Support", "Maintenance", "Updates"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/smart-gate-control-system-display-with-d-1773981131975-1ea8ba37.png?_wi=1",              imageAlt: "Control system monitoring"},
+              id: "project-5",              brand: "Chemical Manufacturing",              name: "Custom Robotic Production Line",              price: "3.2M THB",              rating: 5,
+              reviewCount: "7",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-facility-with-rob-1773981131785-741649af.png?_wi=1",              imageAlt: "Chemical manufacturing facility with robotic production line"},
+            {
+              id: "project-6",              brand: "Pharmaceutical Facility",              name: "Integrated Packaging & QC System",              price: "2.1M THB",              rating: 5,
+              reviewCount: "11",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",              imageAlt: "Pharmaceutical facility with integrated packaging and quality control system"},
           ]}
+          gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
@@ -183,13 +143,13 @@ export default function ProjectsPage() {
 
       <div id="cta" data-section="cta">
         <ContactText
-          text="Ready to join our portfolio of successful clients? Contact us today to discuss your automation project and receive a free consultation."
+          text="Interested in seeing how we can transform your operations? Contact our solutions team today for a free consultation and custom proposal."
           background={{ variant: "animated-grid" }}
           buttons={[
             {
-              text: "Start Your Project",              href: "/contact"},
+              text: "Request a Free Consultation",              href: "/contact"},
             {
-              text: "Schedule Consultation",              href: "tel:+6621234567"},
+              text: "Call Us Now",              href: "tel:+6621234567"},
           ]}
           useInvertedBackground={false}
         />
@@ -204,4 +164,4 @@ export default function ProjectsPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/robot-cobot-automation/page.tsx b/src/app/robot-cobot-automation/page.tsx
new file mode 100644
index 0000000..bf5ebe3
--- /dev/null
+++ b/src/app/robot-cobot-automation/page.tsx
@@ -0,0 +1,276 @@
+"use client";
+
+import Link from "next/link";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
+import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
+import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
+import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
+import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
+import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
+import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
+import ContactText from "@/components/sections/contact/ContactText";
+import FooterBase from "@/components/sections/footer/FooterBase";
+import { Zap, Cpu, BarChart3, Award, CheckCircle, Shield } from "lucide-react";
+
+export default function RobotCobotAutomationPage() {
+  const navItems = [
+    { name: "Home", id: "home" },
+    { name: "About", id: "about" },
+    { name: "Solutions", id: "solutions" },
+    { name: "Projects", id: "projects" },
+    { name: "Blog", id: "blog" },
+    { name: "Contact", id: "contact" },
+  ];
+
+  const footerColumns = [
+    {
+      title: "Solutions",      items: [
+        { label: "Industrial Automation", href: "/solutions" },
+        { label: "Robot & Cobot Systems", href: "/robot-cobot-automation" },
+        { label: "Packaging Machinery", href: "/solutions" },
+        { label: "Smart Gate Systems", href: "/solutions" },
+        { label: "Custom Engineering", href: "/solutions" },
+      ],
+    },
+    {
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Projects & Portfolio", href: "/" },
+        { label: "Blog & Articles", href: "/" },
+        { label: "Careers", href: "/" },
+        { label: "Contact", href: "/contact" },
+      ],
+    },
+    {
+      title: "Resources",      items: [
+        { label: "Case Studies", href: "/" },
+        { label: "Technical Documentation", href: "/" },
+        { label: "Support Portal", href: "/" },
+        { label: "FAQ", href: "/" },
+        { label: "Contact Support", href: "/contact" },
+      ],
+    },
+    {
+      title: "Contact",      items: [
+        { label: "Phone: +66 2 123 4567", href: "tel:+6621234567" },
+        { label: "Email: info@milestones.co.th", href: "mailto:info@milestones.co.th" },
+        { label: "LINE: @milestones-tech", href: "https://line.me" },
+        { label: "Bangkok, Thailand", href: "/" },
+        { label: "Mon-Fri 8:00-18:00 (GMT+7)", href: "/" },
+      ],
+    },
+  ];
+
+  return (
+    <ThemeProvider
+      defaultButtonVariant="shift-hover"
+      defaultTextAnimation="reveal-blur"
+      borderRadius="pill"
+      contentWidth="medium"
+      sizing="large"
+      background="grid"
+      cardStyle="solid"
+      primaryButtonStyle="shadow"
+      secondaryButtonStyle="layered"
+      headingFontWeight="semibold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingInline
+          brandName="Milestones Technologies"
+          navItems={navItems}
+          button={{
+            text: "Request Quote",            href: "/contact"}}
+        />
+      </div>
+
+      <div id="hero" data-section="hero">
+        <HeroBillboardGallery
+          title="Robot & Cobot Automation Solutions"
+          description="Transform your operations with advanced robotic and collaborative robot solutions. From precision manufacturing to material handling and assembly, our robot and cobot systems deliver exceptional accuracy, reliability, and efficiency. Purpose-built for industries requiring flexibility, safety, and high-performance automation."
+          tag="ROBOTIC & COBOT SYSTEMS"
+          tagIcon={Cpu}
+          tagAnimation="slide-up"
+          buttons={[
+            {
+              text: "Request a Consultation",              href: "/contact"},
+            {
+              text: "View Technical Specs",              href: "#technical-specifications"},
+          ]}
+          buttonAnimation="slide-up"
+          background={{ variant: "animated-grid" }}
+          mediaItems={[
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Advanced collaborative robot with articulated arms performing complex assembly task. Compact cobot design."},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/collaborative-robot-cobot-working-alongs-1773981130740-14a987e9.png?_wi=1",              imageAlt: "Collaborative robot (cobot) working alongside human operator in assembly environment. Safe, modern workflow."},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Warehouse with collaborative robots managing material handling and logistics. Cobots picking and placing packages."},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Industrial robot arm performing precise assembly on factory floor. Modern manufacturing facility."},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Complete automotive assembly line with multiple robotic arms working in sequence. Complex multi-station system."},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-facility-with-rob-1773981131785-741649af.png?_wi=1",              imageAlt: "Chemical manufacturing facility with robotic production line. Safe automated chemical processing with precision control."},
+          ]}
+          mediaAnimation="blur-reveal"
+        />
+      </div>
+
+      <div id="applications" data-section="applications">
+        <FeatureCardTwentyFour
+          tag="PRIMARY APPLICATIONS"
+          tagIcon={BarChart3}
+          tagAnimation="slide-up"
+          title="Robot & Cobot Applications Across Industries"
+          description="Our robotic and collaborative robot solutions are engineered for diverse applications across manufacturing, logistics, assembly, and specialized industries. Each application is optimized for precision, speed, safety, and integration with your existing systems."
+          features={[
+            {
+              id: "precision-assembly",              title: "Precision Assembly & Manufacturing",              author: "Manufacturing Excellence",              description: "High-precision robotic arms for component assembly, sub-assembly operations, and precision manufacturing. Perfect for electronics, automotive, and mechanical assembly with repeatability down to 0.03mm.",              tags: ["Electronics", "Automotive", "Precision"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Precision robotic assembly system with multiple coordinated robot arms performing complex assembly operations."},
+            {
+              id: "material-handling",              title: "Material Handling & Logistics",              author: "Warehouse Automation",              description: "Collaborative robots for picking, placing, sorting, and material movement in warehouses and distribution centers. Cobots work safely alongside human operators, increasing throughput by up to 60%.",              tags: ["Warehousing", "Logistics", "Material Handling"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Collaborative robots in warehouse environment managing picking, sorting, and material transport operations."},
+            {
+              id: "welding-joining",              title: "Welding, Brazing & Joining Operations",              author: "Production Automation",              description: "Robotic welding and joining systems for automotive, structural fabrication, and heavy equipment manufacturing. Consistent weld quality with reduced defects and improved safety in hazardous environments.",              tags: ["Welding", "Automotive", "Fabrication"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Robotic welding system performing automated welding operations with sparks and precision control."},
+            {
+              id: "packaging-palletizing",              title: "Packaging, Palletizing & Case Packing",              author: "Production Optimization",              description: "High-speed robotic systems for packaging, case packing, and palletizing operations. Handles various product sizes and weights with intelligent vision systems for verification and quality control.",              tags: ["Packaging", "Palletizing", "Quality Control"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Robotic palletizing system organizing packaged products onto pallets with precision and speed."},
+            {
+              id: "machine-tending",              title: "CNC Machine Tending & Production Support",              author: "Manufacturing Integration",              description: "Robotic arms for machine tending, loading/unloading CNC machines, and production line support. Enables lights-out manufacturing and 24/7 production without human intervention.",              tags: ["CNC", "Machine Tending", "24/7 Production"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Robotic machine tending system loading and unloading CNC machines in automated production environment."},
+            {
+              id: "inspection-testing",              title: "Quality Inspection & Testing Automation",              author: "Quality Assurance",              description: "Vision-equipped robotic systems for automated quality inspection, defect detection, and testing operations. Reduces defects by up to 95% with consistent, repeatable inspection standards.",              tags: ["Quality Control", "Vision Systems", "Inspection"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",              imageAlt: "Robotic vision inspection system performing quality control checks on pharmaceutical packaging and products."},
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="technical-specifications" data-section="technical-specifications">
+        <MetricCardEleven
+          tag="TECHNICAL CAPABILITIES"
+          tagIcon={Cpu}
+          tagAnimation="slide-up"
+          title="Advanced Robot & Cobot Technical Specifications"
+          description="Our robotic systems feature state-of-the-art technology and performance metrics designed to meet the most demanding industrial applications and provide exceptional long-term reliability."
+          metrics={[
+            {
+              id: "payload",              value: "3-300",              title: "Payload Capacity (kg)",              description: "From lightweight collaborative robots to heavy-duty industrial arms handling demanding loads"},
+            {
+              id: "reach",              value: "500-2500",              title: "Arm Reach (mm)",              description: "Extended reach options for complex workspaces and large assembly requirements"},
+            {
+              id: "repeatability",              value: "±0.03",              title: "Repeatability Accuracy (mm)",              description: "Precision positioning for high-tolerance assembly and precision manufacturing tasks"},
+            {
+              id: "speed",              value: "Up to 3",              title: "Max Operating Speed (m/sec)",              description: "High-speed operations for rapid cycle times and maximum production throughput"},
+            {
+              id: "mtbf",              value: "25000+",              title: "Mean Time Between Failures (hours)",              description: "Ultra-reliable systems engineered for continuous 24/7 industrial operations"},
+            {
+              id: "integration",              value: "10+",              title: "Standard Integrations",              description: "Seamless integration with PLCs, vision systems, safety controllers, and existing production lines"},
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="featured-projects" data-section="featured-projects">
+        <ProductCardTwo
+          tag="FEATURED ROBOT & COBOT INSTALLATIONS"
+          tagIcon={CheckCircle}
+          tagAnimation="slide-up"
+          title="Completed Robot & Cobot Projects"
+          description="Explore successful robot and cobot automation installations across automotive, food processing, warehousing, chemicals, and pharmaceutical industries."
+          products={[
+            {
+              id: "project-1",              brand: "Automotive Manufacturer",              name: "6-Axis Robotic Assembly Line",              price: "2.8M THB",              rating: 5,
+              reviewCount: "14",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "6-axis robotic assembly line with coordinated multiple robots performing automotive assembly operations."},
+            {
+              id: "project-2",              brand: "Electronics Warehouse",              name: "Cobot Picking & Packing System",              price: "1.5M THB",              rating: 5,
+              reviewCount: "11",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Collaborative robots performing picking and packing operations in warehouse with human-cobot collaboration."},
+            {
+              id: "project-3",              brand: "Chemical Manufacturing",              name: "Hazardous Material Handling Robot",              price: "2.2M THB",              rating: 5,
+              reviewCount: "9",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-facility-with-rob-1773981131785-741649af.png?_wi=1",              imageAlt: "Industrial robot performing hazardous chemical handling and processing with safety controls and precision."},
+            {
+              id: "project-4",              brand: "Automotive Supplier",              name: "Robotic Welding System",              price: "3.1M THB",              rating: 5,
+              reviewCount: "12",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Robotic welding system with arc welding capabilities performing precision welds on structural components."},
+            {
+              id: "project-5",              brand: "Pharmaceutical Facility",              name: "Vision-Guided Robotic Inspection",              price: "1.9M THB",              rating: 5,
+              reviewCount: "10",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",              imageAlt: "Vision-guided robotic inspection system for pharmaceutical product quality control and packaging verification."},
+            {
+              id: "project-6",              brand: "Industrial Assembly Plant",              name: "Multi-Robot Production Cell",              price: "2.6M THB",              rating: 5,
+              reviewCount: "13",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png",              imageAlt: "Multi-robot production cell with synchronized robotic systems performing complex assembly and testing operations."},
+          ]}
+          gridVariant="three-columns-all-equal-width"
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="trust-indicators" data-section="trust-indicators">
+        <SocialProofOne
+          tag="TRUSTED ROBOT & COBOT PARTNERS"
+          tagIcon={Shield}
+          tagAnimation="slide-up"
+          title="Leading Companies Trust Our Robot & Cobot Solutions"
+          description="Major manufacturers, logistics providers, and industrial facilities across Southeast Asia rely on Milestones Technologies for their robotic automation needs."
+          names={[
+            "Thai Automotive Group",            "Southeast Electronics Corp",            "Bangkok Chemical Industries",            "Bangkok Pharmaceutical",            "Regional Warehousing Co",            "Thai Precision Manufacturing",            "Bangkok Logistics Solutions",            "Asian Heavy Equipment"]}
+          logos={[
+            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-corporate-logo-for-automoti-1773981130490-d851f847.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/electronics-corporation-professional-log-1773981133845-5e6dbc25.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-company-professio-1773981130788-63944153.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-company-professional-logo-1773981130764-ae871848.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-and-logistics-company-professi-1773981132381-3ecc38c8.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-corporate-logo-for-automoti-1773981130490-d851f847.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-and-logistics-company-professi-1773981132381-3ecc38c8.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png"]}
+          textboxLayout="default"
+          useInvertedBackground={false}
+          showCard={true}
+          speed={40}
+        />
+      </div>
+
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardFifteen
+          testimonial="Our warehouse productivity increased 50% after implementing Milestones' cobot solution. The system is incredibly intuitive, safe for our team, and the ROI was achieved in just 9 months. The technical support from Milestones is exceptional and responsive to every question we had."
+          rating={5}
+          author="Niran Suksomtree, Logistics Manager - Southeast Electronics Corp"
+          avatars={[
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png",              alt: "Niran Suksomtree"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-female-pro-1773981130978-eb2d4e1c.png",              alt: "Wanida Kachuay"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-busin-1773981131172-a7325777.png",              alt: "Pattarapol Moonkhan"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-execu-1773981130512-3b9ae1e1.png",              alt: "Somchai Thaichai"},
+          ]}
+          ratingAnimation="slide-up"
+          avatarsAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="cta" data-section="cta">
+        <ContactText
+          text="Discover how robot and cobot automation can transform your operations. Schedule a free technical consultation with our automation specialists today."
+          background={{ variant: "animated-grid" }}
+          buttons={[
+            {
+              text: "Schedule Free Consultation",              href: "/contact"},
+            {
+              text: "Get Technical Proposal",              href: "/contact"},
+          ]}
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterBase
+          logoText="Milestones Technologies"
+          copyrightText="© 2025 Milestones Technologies. All rights reserved."
+          columns={footerColumns}
+        />
+      </div>
+    </ThemeProvider>
+  );
+}
diff --git a/src/app/solutions/page.tsx b/src/app/solutions/page.tsx
index 1057167..a3f95e2 100644
--- a/src/app/solutions/page.tsx
+++ b/src/app/solutions/page.tsx
@@ -4,23 +4,20 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
 import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
 import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
-import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
+import FeatureCardEight from "@/components/sections/feature/FeatureCardEight";
 import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
-import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
-import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
 import ContactText from "@/components/sections/contact/ContactText";
 import FooterBase from "@/components/sections/footer/FooterBase";
-import { Zap, Lightbulb, Award, CheckCircle, Shield } from "lucide-react";
+import { Zap, Lightbulb, CheckCircle, Layers } from "lucide-react";
 
 export default function SolutionsPage() {
   const navItems = [
-    { name: "Home", id: "/" },
-    { name: "Solutions", id: "/solutions" },
-    { name: "Waste Management", id: "/waste-management" },
-    { name: "Plastic Solutions", id: "/plastic-solution" },
-    { name: "Plastic Recycle", id: "/plastic-recycle" },
-    { name: "Windows & Doors", id: "/window-door" },
-    { name: "Robot Cobot", id: "/robot-cobot-automation" },
+    { name: "Home", id: "home" },
+    { name: "About", id: "about" },
+    { name: "Solutions", id: "solutions" },
+    { name: "Services", id: "services" },
+    { name: "Projects", id: "projects" },
+    { name: "Blog", id: "blog" },
     { name: "Contact", id: "contact" },
   ];
 
@@ -28,15 +25,16 @@ export default function SolutionsPage() {
     {
       title: "Solutions",      items: [
         { label: "Industrial Automation", href: "/solutions" },
-        { label: "Robot & Cobot Systems", href: "/robot-cobot-automation" },
-        { label: "Plastic Solutions", href: "/plastic-solution" },
-        { label: "Waste Management", href: "/waste-management" },
+        { label: "Robot & Cobot Systems", href: "/solutions" },
+        { label: "Packaging Machinery", href: "/solutions" },
+        { label: "Smart Gate Systems", href: "/solutions" },
         { label: "Custom Engineering", href: "/solutions" },
       ],
     },
     {
       title: "Company",      items: [
         { label: "About Us", href: "/about" },
+        { label: "Our Services", href: "/services" },
         { label: "Projects & Portfolio", href: "/" },
         { label: "Blog & Articles", href: "/" },
         { label: "Careers", href: "/" },
@@ -87,52 +85,54 @@ export default function SolutionsPage() {
 
       <div id="hero" data-section="hero">
         <HeroBillboardGallery
-          title="Industrial Automation Solutions"
-          description="Comprehensive industrial automation systems designed to streamline your manufacturing operations. Our end-to-end solutions cover production lines, assembly processes, and integrated manufacturing workflows."
-          tag="INDUSTRIAL AUTOMATION SOLUTIONS"
+          title="Our Complete Automation Solutions"
+          description="Comprehensive automation and engineering solutions designed to address every aspect of modern manufacturing, logistics, and smart property management. From industrial automation to custom engineering, we have the expertise and technology to transform your operations."
+          tag="SOLUTIONS OVERVIEW"
           tagIcon={Zap}
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Request Consultation",              href: "/contact"},
+              text: "Explore Solutions",              href: "#solutions"},
             {
-              text: "View Case Studies",              href: "/"},
+              text: "Request Consultation",              href: "/contact"},
           ]}
           buttonAnimation="slide-up"
           background={{ variant: "animated-grid" }}
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Industrial automation control system with PLC controllers"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Industrial automation control system"},
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Complete automotive assembly line automation"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Collaborative robot system"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Packaging machinery"},
           ]}
           mediaAnimation="blur-reveal"
         />
       </div>
 
-      <div id="features" data-section="features">
+      <div id="solutions" data-section="solutions">
         <FeatureCardTwentyFour
-          tag="AUTOMATION CAPABILITIES"
+          tag="CORE SOLUTION CATEGORIES"
           tagIcon={Lightbulb}
           tagAnimation="slide-up"
-          title="Advanced Production Line Automation"
-          description="We provide comprehensive industrial automation systems with integrated control, real-time monitoring, and seamless scalability for modern manufacturing facilities."
+          title="Five Comprehensive Solution Categories"
+          description="Each category is engineered for reliability, scalability, and long-term performance. We customize solutions to match your specific operational needs and business objectives."
           features={[
             {
-              id: "production-control",              title: "Production Line Control Systems",              author: "Manufacturing Systems",              description: "Advanced PLC and SCADA systems for complete production line management. Real-time monitoring, automatic error detection, and predictive maintenance capabilities.",              tags: ["PLC/SCADA", "Real-time Monitoring", "Maintenance"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "PLC and SCADA control systems"},
+              id: "industrial-automation",              title: "Industrial Automation Systems",              author: "Manufacturing Excellence",              description: "End-to-end automation solutions for production lines, assembly processes, and manufacturing workflows. Features include PLC-based control, real-time monitoring, and integration with existing systems. Increase productivity by up to 40% with our integrated control systems.",              tags: ["Production Lines", "Assembly", "PLC Control", "Monitoring"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Industrial automation control system with PLC controllers"},
             {
-              id: "assembly-integration",              title: "Assembly Process Integration",              author: "Process Optimization",              description: "Integrated assembly automation for complex manufacturing workflows. Robotic arms, conveyor systems, and quality control integration in one unified system.",              tags: ["Robotics", "Conveyors", "QC Integration"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Automotive assembly line"},
+              id: "robot-cobot",              title: "Robot & Cobot Automation",              author: "Precision Robotics",              description: "Cutting-edge robotic and collaborative robot solutions for precise, repetitive tasks. Perfect for warehousing, assembly, material handling, and specialized manufacturing. Our cobot systems work safely alongside human operators, maximizing productivity and worker safety.",              tags: ["Robotics", "Cobots", "Material Handling", "Safety"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Advanced collaborative robot with articulated arms"},
             {
-              id: "quality-control",              title: "Quality Control Systems",              author: "Quality Assurance",              description: "Real-time quality monitoring and defect detection. Vision systems, sensors, and automated inspection to ensure product consistency and compliance.",              tags: ["Vision Systems", "Inspection", "Compliance"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Quality control system"},
+              id: "packaging-machinery",              title: "Packaging Machinery Solutions",              author: "Production Optimization",              description: "Advanced packaging systems for food, pharmaceutical, and consumer goods industries. Features high-speed operation, quality control integration, and flexible product handling. Reliable packaging with minimal downtime and maximum throughput.",              tags: ["Packaging", "Quality Control", "High-Speed", "Flexible"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "State-of-the-art automatic packaging system"},
             {
-              id: "data-analytics",              title: "Data Analytics & Reporting",              author: "Business Intelligence",              description: "Comprehensive production data collection and analysis. Customizable dashboards, KPI tracking, and actionable insights for continuous improvement.",              tags: ["Analytics", "Dashboards", "KPI Tracking"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Analytics dashboard"},
+              id: "smart-gate",              title: "Smart Gate & Access Systems",              author: "Security & Convenience",              description: "Premium automatic gate solutions for residential, commercial, and industrial properties. Includes remote control, RFID integration, advanced security features, and mobile app control. Perfect for modern smart living and comprehensive property management.",              tags: ["Smart Gates", "Access Control", "Security", "Mobile Control"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-premium-automatic-sliding-gate-wi-1773981131408-069d06de.png?_wi=1",              imageAlt: "Modern premium automatic sliding gate with remote control"},
             {
-              id: "maintenance-support",              title: "Predictive Maintenance",              author: "Operational Excellence",              description: "24/7 technical support with predictive maintenance capabilities. IoT sensors monitor equipment health and alert teams to potential issues before failures occur.",              tags: ["IoT Monitoring", "24/7 Support", "Prevention"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png",              imageAlt: "Maintenance support"},
+              id: "custom-engineering",              title: "Custom Engineering Solutions",              author: "Tailored Innovation",              description: "Bespoke automation and engineering solutions designed specifically for your unique operational requirements. From concept design through implementation and ongoing support. Our expert team works closely with you to deliver solutions that perfectly match your needs.",              tags: ["Engineering", "Customization", "Support", "Integration"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/custom-engineered-automation-solution-be-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "Custom engineered automation solution being installed"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -140,26 +140,23 @@ export default function SolutionsPage() {
         />
       </div>
 
-      <div id="benefits" data-section="benefits">
-        <MetricCardEleven
-          tag="PROVEN RESULTS"
-          tagIcon={Award}
-          tagAnimation="slide-up"
-          title="Industry-Leading Performance Gains"
-          description="Our industrial automation solutions consistently deliver significant improvements across key performance metrics."
-          metrics={[
+      <div id="implementation" data-section="implementation">
+        <FeatureCardEight
+          title="Our Implementation Process"
+          description="We follow a proven, client-focused approach to ensure smooth implementation and maximum ROI for every automation project."
+          features={[
             {
-              id: "productivity",              value: "40%",              title: "Productivity Increase",              description: "Average productivity improvement within first 6 months"},
+              id: "assessment",              title: "Assessment & Planning",              description: "Comprehensive analysis of your operations, workflow, and requirements. We identify automation opportunities and develop a tailored implementation strategy that minimizes disruption.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Engineering team assessment"},
             {
-              id: "defects",              value: "68%",              title: "Defect Reduction",              description: "Significant reduction in manufacturing defects through automation"},
+              id: "design",              title: "Design & Engineering",              description: "Our expert engineers design custom solutions tailored to your specifications. We create detailed technical plans and 3D models for your review and approval before implementation begins.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Engineering design and planning"},
             {
-              id: "downtime",              value: "85%",              title: "Downtime Reduction",              description: "Minimized production downtime with predictive maintenance"},
+              id: "installation",              title: "Installation & Integration",              description: "Professional installation team handles all hardware setup, integration with existing systems, and testing. We ensure seamless integration and minimal operational disruption throughout the process.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png?_wi=1",              imageAlt: "Installation and integration"},
             {
-              id: "labor-cost",              value: "35%",              title: "Labor Cost Savings",              description: "Reduced labor costs through intelligent automation"},
+              id: "training",              title: "Training & Support",              description: "Comprehensive training for your team on system operation, maintenance, and troubleshooting. We provide extensive documentation and ongoing technical support to ensure success.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png?_wi=1",              imageAlt: "Team training session"},
             {
-              id: "roi",              value: "8-12",              title: "Month ROI Timeline",              description: "Most clients achieve full return on investment within 8-12 months"},
+              id: "optimization",              title: "Optimization & Continuous Improvement",              description: "After launch, we monitor system performance and make continuous improvements. Regular maintenance and updates ensure peak performance and ROI throughout the system lifecycle.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/advanced-collaborative-robot-with-articu-1773981131004-a16eab70.png?_wi=1",              imageAlt: "System optimization and monitoring"},
             {
-              id: "uptime",              value: "99.2%",              title: "System Uptime",              description: "Industry-leading system reliability and performance"},
+              id: "support",              title: "24/7 Technical Support",              description: "Round-the-clock support team available for any questions or technical issues. Our team responds quickly to minimize downtime and keep your operations running smoothly.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-premium-automatic-sliding-gate-wi-1773981131408-069d06de.png?_wi=1",              imageAlt: "24/7 support team"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -167,62 +164,49 @@ export default function SolutionsPage() {
         />
       </div>
 
-      <div id="projects" data-section="projects">
+      <div id="featured-solutions" data-section="featured-solutions">
         <ProductCardTwo
-          tag="SUCCESS STORIES"
+          tag="FEATURED IMPLEMENTATIONS"
           tagIcon={CheckCircle}
           tagAnimation="slide-up"
-          title="Industrial Automation Projects"
-          description="Explore our successful industrial automation implementations across diverse manufacturing sectors."
+          title="Successful Solution Deployments"
+          description="Real-world examples of our automation solutions transforming industries and delivering measurable results."
           products={[
             {
-              id: "project-1",              brand: "Automotive",              name: "Complete Assembly Line Automation",              price: "2.5M THB",              rating: 5,
-              reviewCount: "12",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Automotive assembly line automation"},
+              id: "solution-1",              brand: "Automotive Manufacturing",              name: "Complete Assembly Line Automation",              price: "2.5M THB",              rating: 5,
+              reviewCount: "12",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Automotive assembly line"},
             {
-              id: "project-2",              brand: "Chemical",              name: "Robotic Production Line System",              price: "3.2M THB",              rating: 5,
+              id: "solution-2",              brand: "Food Processing Industry",              name: "High-Speed Packaging System",              price: "1.8M THB",              rating: 5,
+              reviewCount: "8",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/food-processing-facility-with-integrated-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Food processing packaging"},
+            {
+              id: "solution-3",              brand: "Electronics Logistics",              name: "Cobot Material Handling System",              price: "1.2M THB",              rating: 5,
+              reviewCount: "9",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/warehouse-with-collaborative-robots-mana-1773981131081-518034f7.png?_wi=1",              imageAlt: "Warehouse cobot system"},
+            {
+              id: "solution-4",              brand: "Premium Properties",              name: "Smart Gate Access System",              price: "800K THB",              rating: 5,
+              reviewCount: "15",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/luxury-residential-complex-entrance-with-1773981131885-7d86d7ce.png?_wi=1",              imageAlt: "Smart gate system"},
+            {
+              id: "solution-5",              brand: "Chemical Manufacturing",              name: "Custom Robotic Production Line",              price: "3.2M THB",              rating: 5,
               reviewCount: "7",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/chemical-manufacturing-facility-with-rob-1773981131785-741649af.png?_wi=1",              imageAlt: "Chemical manufacturing automation"},
             {
-              id: "project-3",              brand: "Pharmaceutical",              name: "Integrated Packaging & QC",              price: "2.1M THB",              rating: 5,
-              reviewCount: "11",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",              imageAlt: "Pharmaceutical automation"},
-            {
-              id: "project-4",              brand: "Electronics",              name: "High-Precision Assembly System",              price: "1.8M THB",              rating: 5,
-              reviewCount: "9",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Electronics assembly automation"},
+              id: "solution-6",              brand: "Pharmaceutical Production",              name: "Integrated Packaging & QC System",              price: "2.1M THB",              rating: 5,
+              reviewCount: "11",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/pharmaceutical-facility-with-integrated--1773981135234-da2258a8.png?_wi=1",              imageAlt: "Pharmaceutical packaging system"},
           ]}
-          gridVariant="two-columns-alternating-heights"
+          gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
         />
       </div>
 
-      <div id="testimonials" data-section="testimonials">
-        <TestimonialCardFifteen
-          testimonial="Milestones Technologies transformed our entire production process. Their industrial automation solutions increased our output by 40% while simultaneously reducing defects and improving worker safety. The team was professional, thorough, and provided excellent ongoing support."
-          rating={5}
-          author="Dr. Pattana Sirivong, Production Manager - Thai Manufacturing Co."
-          avatars={[
-            {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-execu-1773981130512-3b9ae1e1.png",              alt: "Dr. Pattana Sirivong"},
-            {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-male-facto-1773981130089-2c759151.png",              alt: "Manager 2"},
-            {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-of-thai-female-pro-1773981130978-eb2d4e1c.png",              alt: "Manager 3"},
-          ]}
-          ratingAnimation="slide-up"
-          avatarsAnimation="slide-up"
-          useInvertedBackground={false}
-        />
-      </div>
-
       <div id="cta" data-section="cta">
         <ContactText
-          text="Ready to modernize your manufacturing operations? Contact our industrial automation specialists for a comprehensive assessment and custom solution proposal."
+          text="Ready to discover the right automation solution for your business? Contact our solutions team today for a free consultation and customized proposal."
           background={{ variant: "animated-grid" }}
           buttons={[
             {
-              text: "Schedule Consultation",              href: "/contact"},
+              text: "Request Consultation",              href: "/contact"},
             {
-              text: "Download Technical Guide",              href: "/"},
+              text: "Schedule Demo",              href: "/contact"},
           ]}
           useInvertedBackground={false}
         />
diff --git a/src/app/waste-management/page.tsx b/src/app/waste-management/page.tsx
index ffbf0c0..2afc78a 100644
--- a/src/app/waste-management/page.tsx
+++ b/src/app/waste-management/page.tsx
@@ -1,34 +1,36 @@
 "use client";
 
+import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
 import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
 import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
 import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
 import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
+import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
+import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
 import ContactText from "@/components/sections/contact/ContactText";
 import FooterBase from "@/components/sections/footer/FooterBase";
-import { Zap, Lightbulb, Award, CheckCircle } from "lucide-react";
+import { Zap, Lightbulb, Award, CheckCircle, Shield } from "lucide-react";
 
 export default function WasteManagementPage() {
   const navItems = [
     { name: "Home", id: "/" },
-    { name: "Solutions", id: "/solutions" },
-    { name: "Waste Management", id: "/waste-management" },
-    { name: "Plastic Solutions", id: "/plastic-solution" },
-    { name: "Plastic Recycle", id: "/plastic-recycle" },
-    { name: "Windows & Doors", id: "/window-door" },
-    { name: "Robot Cobot", id: "/robot-cobot-automation" },
+    { name: "About", id: "about" },
+    { name: "Solutions", id: "solutions" },
+    { name: "Waste Management", id: "waste-management" },
+    { name: "Projects", id: "projects" },
+    { name: "Blog", id: "blog" },
     { name: "Contact", id: "contact" },
   ];
 
   const footerColumns = [
     {
       title: "Solutions",      items: [
-        { label: "Industrial Automation", href: "/solutions" },
-        { label: "Robot & Cobot Systems", href: "/robot-cobot-automation" },
+        { label: "Waste Management Systems", href: "/waste-management" },
         { label: "Plastic Solutions", href: "/plastic-solution" },
-        { label: "Waste Management", href: "/waste-management" },
+        { label: "Plastic Recycling", href: "/plastic-recycle" },
+        { label: "Smart Gate Systems", href: "/solutions" },
         { label: "Custom Engineering", href: "/solutions" },
       ],
     },
@@ -85,52 +87,60 @@ export default function WasteManagementPage() {
 
       <div id="hero" data-section="hero">
         <HeroBillboardGallery
-          title="Advanced Waste Management Solutions"
-          description="Comprehensive waste management and recycling automation systems designed for factories, processing plants, and waste management facilities. Our solutions maximize efficiency, minimize environmental impact, and ensure regulatory compliance."
-          tag="WASTE MANAGEMENT & RECYCLING AUTOMATION"
+          title="Comprehensive Waste Management Solutions"
+          description="Transform your waste management operations with our advanced automated systems. From collection to sorting and processing, we provide end-to-end solutions that maximize efficiency, reduce costs, and promote environmental sustainability."
+          tag="WASTE MANAGEMENT & SUSTAINABILITY"
           tagIcon={Zap}
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Request Assessment",              href: "/contact"},
+              text: "Request a Consultation",              href: "/contact"},
             {
-              text: "Learn More",              href: "#features"},
+              text: "Learn More",              href: "#solutions"},
           ]}
           buttonAnimation="slide-up"
           background={{ variant: "animated-grid" }}
           mediaItems={[
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Waste management sorting system"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-waste-sorting-facility-with-autom-1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Modern waste sorting facility with automated conveyor systems"},
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Waste processing automation"},
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-collection-automation-system-with-1773981132057-91de9d07.png?_wi=1",              imageAlt: "Waste collection automation system with robotic sorting arms"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-processing-facility-with-integrated-1773981131975-1ea8ba37.png?_wi=1",              imageAlt: "Waste processing facility with integrated monitoring systems"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/landfill-management-system-with-real-ti-1773981130740-14a987e9.png?_wi=1",              imageAlt: "Landfill management system with real-time monitoring"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-disposal-innovation-team-working-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Innovation team working on waste disposal solutions"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-waste-management-installation-1773981131997-d20ced9d.png",              imageAlt: "Completed waste management installation showcasing integrated systems"},
           ]}
           mediaAnimation="blur-reveal"
         />
       </div>
 
-      <div id="features" data-section="features">
+      <div id="solutions" data-section="solutions">
         <FeatureCardTwentyFour
-          tag="WASTE MANAGEMENT SERVICES"
+          tag="WASTE MANAGEMENT SOLUTIONS"
           tagIcon={Lightbulb}
           tagAnimation="slide-up"
-          title="Smart Waste Sorting & Recycling Systems"
-          description="Automated waste management solutions combining AI, robotics, and IoT technology for efficient waste sorting, processing, and recycling operations."
+          title="Integrated Waste Management & Processing Systems"
+          description="Our waste management solutions provide comprehensive coverage from collection to final processing. We combine advanced automation, IoT monitoring, and sustainable practices to optimize waste operations."
           features={[
             {
-              id: "sorting-system",              title: "Automated Waste Sorting",              author: "Sorting Technology",              description: "AI-powered waste sorting using advanced vision systems and robotic arms. Automatically separates plastics, metals, paper, and organic waste for optimal recycling efficiency.",              tags: ["AI Vision", "Robotics", "Sorting"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Waste sorting system"},
+              id: "collection-systems",              title: "Smart Waste Collection Systems",              author: "Collection Excellence",              description: "Automated waste collection with IoT-enabled bins and real-time route optimization. Track collection efficiency, reduce collection costs, and improve service response times.",              tags: ["IoT Tracking", "Route Optimization", "Cost Reduction"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/smart-waste-bin-system-with-monitoring-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Smart waste bin system with monitoring and automation"},
             {
-              id: "compacting",              title: "Waste Compacting Systems",              author: "Processing Equipment",              description: "High-capacity automated waste compaction and baling systems. Reduces waste volume by up to 90%, lowering transportation and storage costs significantly.",              tags: ["Compaction", "Baling", "Volume Reduction"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Waste compacting equipment"},
+              id: "sorting-systems",              title: "Automated Waste Sorting Systems",              author: "Sorting Innovation",              description: "AI-powered sorting systems that automatically segregate waste by type, material, and contamination level. Achieve 95%+ sorting accuracy and maximize material recovery rates.",              tags: ["AI Sorting", "Material Recovery", "Accuracy"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/ai-powered-waste-sorting-facility-with-1773981131004-a16eab70.png?_wi=1",              imageAlt: "AI-powered waste sorting facility with robotic arms"},
             {
-              id: "tracking",              title: "Waste Tracking & Management",              author: "Digital Solutions",              description: "Real-time waste tracking system with IoT sensors and cloud-based management. Complete visibility of waste streams, compliance documentation, and disposal records.",              tags: ["IoT Tracking", "Cloud Management", "Compliance"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Waste tracking system"},
+              id: "processing-systems",              title: "Waste Processing & Conversion",              author: "Processing Optimization",              description: "Advanced processing systems for composting, biogas generation, and waste-to-energy conversion. Convert waste into valuable resources while reducing environmental impact.",              tags: ["Composting", "Biogas", "Energy"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-to-energy-facility-with-advanced-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Waste-to-energy facility with advanced processing equipment"},
             {
-              id: "energy-recovery",              title: "Energy Recovery Systems",              author: "Sustainability",              description: "Extract maximum value from waste streams through energy recovery and conversion systems. Convert waste to energy or valuable raw materials for secondary use.",              tags: ["Energy Recovery", "Sustainability", "Cost Savings"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Energy recovery system"},
+              id: "monitoring-systems",              title: "Real-Time Monitoring & Analytics",              author: "Data Intelligence",              description: "Cloud-based monitoring systems providing real-time visibility into waste flows, facility performance, and environmental compliance. Make data-driven decisions for optimization.",              tags: ["Cloud Monitoring", "Analytics", "Compliance"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-facility-monitoring-dashboard-with-1773981131408-069d06de.png?_wi=1",              imageAlt: "Waste facility monitoring dashboard with real-time analytics"},
             {
-              id: "hazmat-handling",              title: "Hazardous Waste Handling",              author: "Safety Systems",              description: "Specialized systems for safe and compliant handling of hazardous waste. Automated segregation, containment, and processing with complete safety protocols.",              tags: ["Safety", "Compliance", "Hazmat"],
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png",              imageAlt: "Hazmat handling"},
+              id: "custom-waste-solutions",              title: "Custom Waste Solutions",              author: "Tailored Services",              description: "Bespoke waste management systems designed for your specific operational needs. From small municipal operations to large industrial facilities, we customize solutions for maximum efficiency.",              tags: ["Customization", "Scalability", "Integration"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/custom-waste-facility-engineered-solution-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "Custom waste management solution being installed"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -138,26 +148,26 @@ export default function WasteManagementPage() {
         />
       </div>
 
-      <div id="benefits" data-section="benefits">
+      <div id="why-choose-us" data-section="why-choose-us">
         <MetricCardEleven
-          tag="ENVIRONMENTAL & ECONOMIC IMPACT"
+          tag="WHY CHOOSE OUR WASTE SOLUTIONS"
           tagIcon={Award}
           tagAnimation="slide-up"
-          title="Measurable Waste Management Benefits"
-          description="Our waste management solutions deliver significant improvements in environmental sustainability and operational cost reduction."
+          title="Industry-Leading Waste Management Technology"
+          description="Our waste management solutions deliver measurable results through innovative technology, expert implementation, and continuous optimization."
           metrics={[
             {
-              id: "waste-reduction",              value: "75%",              title: "Waste Volume Reduction",              description: "Reduce waste volume through efficient sorting and compaction"},
+              id: "efficiency-gain",              value: "50%",              title: "Operational Efficiency Increase",              description: "Clients achieve 50% improvement in waste processing efficiency"},
             {
-              id: "recycling-rate",              value: "92%",              title: "Recycling Rate Increase",              description: "Maximize material recovery and recycling efficiency"},
+              id: "cost-reduction",              value: "35%",              title: "Cost Reduction",              description: "Average cost reduction in waste management operations"},
             {
-              id: "cost-savings",              value: "60%",              title: "Operational Cost Reduction",              description: "Lower waste handling, transportation, and disposal costs"},
+              id: "recovery-rate",              value: "90%",              title: "Material Recovery Rate",              description: "Maximize material recovery and minimize landfill waste"},
             {
-              id: "labor",              value: "80%",              title: "Labor Reduction",              description: "Minimize manual waste handling with full automation"},
+              id: "environmental",              value: "60%",              title: "Environmental Impact Reduction",              description: "Significant reduction in environmental footprint and emissions"},
             {
-              id: "revenue",              value: "45%",              title: "Revenue from Recycled Materials",              description: "Generate revenue from recovered materials and recyclables"},
+              id: "uptime",              value: "99.5%",              title: "System Uptime",              description: "Reliable systems with industry-leading availability"},
             {
-              id: "roi",              value: "6-9",              title: "Month ROI Timeline",              description: "Fast return on investment through cost and revenue improvements"},
+              id: "support",              value: "24/7",              title: "Technical Support",              description: "Round-the-clock support to ensure optimal facility operations"},
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -165,23 +175,32 @@ export default function WasteManagementPage() {
         />
       </div>
 
-      <div id="projects" data-section="projects">
+      <div id="featured-projects" data-section="featured-projects">
         <ProductCardTwo
           tag="WASTE MANAGEMENT PROJECTS"
           tagIcon={CheckCircle}
           tagAnimation="slide-up"
-          title="Waste Management Installations"
-          description="View our successful waste management and recycling system implementations."
+          title="Featured Waste Management Installations"
+          description="Explore our recent waste management projects demonstrating cutting-edge automation and sustainable practices."
           products={[
             {
-              id: "project-1",              brand: "Factory Waste",              name: "Automated Waste Sorting Facility",              price: "2.2M THB",              rating: 5,
-              reviewCount: "8",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/state-of-the-art-automatic-packaging-sys-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Waste sorting facility"},
+              id: "project-1",              brand: "Bangkok Municipality",              name: "City-Wide Waste Collection Automation",              price: "5.2M THB",              rating: 5,
+              reviewCount: "8",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/city-waste-collection-system-complete-1773981131944-e95865db.png?_wi=1",              imageAlt: "City-wide waste collection automation system"},
             {
-              id: "project-2",              brand: "Recycling Center",              name: "Complete Recycling Automation",              price: "3.5M THB",              rating: 5,
-              reviewCount: "6",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-automation-control-system-wit-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Recycling automation"},
+              id: "project-2",              brand: "Industrial Park Operator",              name: "Integrated Waste Sorting Facility",              price: "3.8M THB",              rating: 5,
+              reviewCount: "6",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-sorting-facility-installation-compl-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Integrated waste sorting facility with automated systems"},
             {
-              id: "project-3",              brand: "Industrial Complex",              name: "Waste Management System",              price: "1.9M THB",              rating: 5,
-              reviewCount: "7",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-industrial-automation-installa-1773981131997-d20ced9d.png",              imageAlt: "Waste management system"},
+              id: "project-3",              brand: "Waste Management Company",              name: "Waste-to-Energy Processing Plant",              price: "8.5M THB",              rating: 5,
+              reviewCount: "10",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-to-energy-plant-operational-syste-1773981131081-518034f7.png?_wi=1",              imageAlt: "Waste-to-energy processing plant with advanced systems"},
+            {
+              id: "project-4",              brand: "Resort & Hotel Group",              name: "Hospitality Waste Management System",              price: "1.5M THB",              rating: 5,
+              reviewCount: "7",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/hospitality-waste-solution-installed-res-1773981131885-7d86d7ce.png?_wi=1",              imageAlt: "Hospitality waste management system at resort"},
+            {
+              id: "project-5",              brand: "Shopping Mall Operator",              name: "Commercial Waste Segregation System",              price: "2.2M THB",              rating: 5,
+              reviewCount: "9",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/commercial-waste-segregation-at-mall-sy-1773981131785-741649af.png?_wi=1",              imageAlt: "Commercial waste segregation system at shopping mall"},
+            {
+              id: "project-6",              brand: "Food Court Operator",              name: "Organic Waste Composting System",              price: "920K THB",              rating: 5,
+              reviewCount: "5",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/organic-waste-composting-system-food-co-1773981135234-da2258a8.png?_wi=1",              imageAlt: "Organic waste composting system for food operations"},
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
@@ -190,15 +209,54 @@ export default function WasteManagementPage() {
         />
       </div>
 
+      <div id="trust-indicators" data-section="trust-indicators">
+        <SocialProofOne
+          tag="TRUSTED WASTE MANAGEMENT PARTNERS"
+          tagIcon={Shield}
+          tagAnimation="slide-up"
+          title="Trusted by Leading Waste Management Organizations"
+          description="Our waste management solutions are deployed across municipalities, private waste operators, industrial parks, and hospitality businesses throughout Southeast Asia."
+          names={[
+            "Bangkok Metropolitan Administration",            "Thai Waste Management Group",            "Southeast Recycling Corp",            "Industrial Park Authority",            "Hospitality Waste Solutions",            "Municipal Waste Operators",            "Commercial Waste Services",            "Sustainability Partners"]}
+          logos={[
+            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/municipal-authority-logo-waste-1773981130490-d851f847.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-company-logo-1773981131364-3e0f1b67.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/recycling-corp-logo-1773981133845-5e6dbc25.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-park-logo-1773981130788-63944153.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/hospitality-group-logo-1773981130764-ae871848.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/waste-operators-logo-1773981131039-83d43e45.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/commercial-services-logo-1773981132381-3ecc38c8.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/sustainability-partners-logo-1773981130307-dd93d586.png"]}
+          textboxLayout="default"
+          useInvertedBackground={false}
+          showCard={true}
+          speed={40}
+        />
+      </div>
+
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardFifteen
+          testimonial="Milestones Technologies revolutionized our waste management operations. Their automated sorting system increased our recovery rate to 92%, and the real-time monitoring dashboard provides unprecedented visibility into our facility. ROI was achieved in less than 10 months. Exceptional service and support."
+          rating={5}
+          author="Prasad Suwalthip, Operations Manager - Regional Waste Management"
+          avatars={[
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-waste-manager-1-1773981130512-3b9ae1e1.png",              alt: "Prasad Suwalthip"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-waste-operator-1-1773981130089-2c759151.png",              alt: "Niran Sakaytanya"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-sustainability-1-1773981130978-eb2d4e1c.png",              alt: "Wanida Ekasak"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-headshot-municipal-leader-1773981131172-a7325777.png",              alt: "Pattarapol Surin"},
+          ]}
+          ratingAnimation="slide-up"
+          avatarsAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
       <div id="cta" data-section="cta">
         <ContactText
-          text="Transform your waste management operations with intelligent automation. Contact our specialists for a comprehensive waste audit and customized solution."
+          text="Ready to revolutionize your waste management operations? Contact our specialists today for a comprehensive facility assessment and customized solution proposal."
           background={{ variant: "animated-grid" }}
           buttons={[
             {
-              text: "Schedule Waste Audit",              href: "/contact"},
+              text: "Schedule Assessment",              href: "/contact"},
             {
-              text: "Download Solution Guide",              href: "/"},
+              text: "Discuss Your Needs",              href: "tel:+6621234567"},
           ]}
           useInvertedBackground={false}
         />
diff --git a/src/app/window-door-solutions/page.tsx b/src/app/window-door-solutions/page.tsx
new file mode 100644
index 0000000..4d88de3
--- /dev/null
+++ b/src/app/window-door-solutions/page.tsx
@@ -0,0 +1,274 @@
+"use client";
+
+import Link from "next/link";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
+import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
+import FeatureCardTwentyFour from "@/components/sections/feature/FeatureCardTwentyFour";
+import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
+import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
+import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
+import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
+import ContactText from "@/components/sections/contact/ContactText";
+import FooterBase from "@/components/sections/footer/FooterBase";
+import { Zap, Building2, Lightbulb, Award, CheckCircle, Shield } from "lucide-react";
+
+export default function WindowDoorSolutionsPage() {
+  const navItems = [
+    { name: "Home", id: "home" },
+    { name: "About", id: "about" },
+    { name: "Solutions", id: "solutions" },
+    { name: "Projects", id: "projects" },
+    { name: "Windows & Doors", id: "windows-doors" },
+    { name: "Robot & Cobot", id: "robot-cobot" },
+    { name: "Contact", id: "contact" },
+  ];
+
+  const footerColumns = [
+    {
+      title: "Solutions",      items: [
+        { label: "Industrial Automation", href: "/solutions" },
+        { label: "Robot & Cobot Systems", href: "/robot-cobot-automation" },
+        { label: "Packaging Machinery", href: "/solutions" },
+        { label: "Smart Gate Systems", href: "/solutions" },
+        { label: "Windows & Doors Solutions", href: "/window-door-solutions" },
+      ],
+    },
+    {
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Projects & Portfolio", href: "/" },
+        { label: "Blog & Articles", href: "/" },
+        { label: "Careers", href: "/" },
+        { label: "Contact", href: "/contact" },
+      ],
+    },
+    {
+      title: "Resources",      items: [
+        { label: "Case Studies", href: "/" },
+        { label: "Technical Documentation", href: "/" },
+        { label: "Support Portal", href: "/" },
+        { label: "FAQ", href: "/" },
+        { label: "Contact Support", href: "/contact" },
+      ],
+    },
+    {
+      title: "Contact",      items: [
+        { label: "Phone: +66 2 123 4567", href: "tel:+6621234567" },
+        { label: "Email: info@milestones.co.th", href: "mailto:info@milestones.co.th" },
+        { label: "LINE: @milestones-tech", href: "https://line.me" },
+        { label: "Bangkok, Thailand", href: "/" },
+        { label: "Mon-Fri 8:00-18:00 (GMT+7)", href: "/" },
+      ],
+    },
+  ];
+
+  return (
+    <ThemeProvider
+      defaultButtonVariant="shift-hover"
+      defaultTextAnimation="reveal-blur"
+      borderRadius="pill"
+      contentWidth="medium"
+      sizing="large"
+      background="grid"
+      cardStyle="solid"
+      primaryButtonStyle="shadow"
+      secondaryButtonStyle="layered"
+      headingFontWeight="semibold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingInline
+          brandName="Milestones Technologies"
+          navItems={navItems}
+          button={{
+            text: "Request Quote",            href: "/contact"}}
+        />
+      </div>
+
+      <div id="hero" data-section="hero">
+        <HeroBillboardGallery
+          title="Premium Window & Door Solutions for Modern Living"
+          description="Elevate your property with our comprehensive window and door solutions. From luxury residential installations to commercial projects, we deliver superior quality, elegant design, and expert craftsmanship. Our products combine aesthetic appeal with functional excellence, featuring advanced security, thermal efficiency, and durability. Transform your spaces with windows and doors that define modern comfort and style."
+          tag="PREMIUM WINDOW & DOOR SYSTEMS"
+          tagIcon={Zap}
+          tagAnimation="slide-up"
+          buttons={[
+            {
+              text: "Request Consultation",              href: "/contact"},
+            {
+              text: "View Catalog",              href: "/"},
+          ]}
+          buttonAnimation="slide-up"
+          background={{ variant: "animated-grid" }}
+          mediaItems={[
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/luxury-residential-window-installation-w-1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Luxury residential window installation with panoramic views and modern design. Premium glass and fr"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-sliding-glass-doors-in-contemporary-1773981132057-91de9d07.png?_wi=1",              imageAlt: "Modern sliding glass doors in contemporary home. Frameless design with smooth operation and safety f"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/commercial-glass-door-system-with-secure-1773981131975-1ea8ba37.png?_wi=1",              imageAlt: "Commercial glass door system with secure access control. Electronic locking mechanism and tempered s"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/energy-efficient-window-installation-1773981130740-14a987e9.png?_wi=1",              imageAlt: "Energy-efficient window installation with thermal insulation. Double glazing and weather sealing for c"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/window-door-installation-team-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Professional window and door installation team. Expert craftsmen ensuring perfect fit and finish on s"},
+            {
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/completed-window-door-project-1773981131997-d20ced9d.png",              imageAlt: "Completed window and door project showcasing integrated design. Multiple room installations with con"},
+          ]}
+          mediaAnimation="blur-reveal"
+        />
+      </div>
+
+      <div id="solutions" data-section="solutions">
+        <FeatureCardTwentyFour
+          tag="WINDOW & DOOR PRODUCT RANGE"
+          tagIcon={Lightbulb}
+          tagAnimation="slide-up"
+          title="Comprehensive Window & Door Systems"
+          description="We offer a complete range of window and door solutions designed for residential, commercial, and industrial applications. Each product combines premium materials, advanced engineering, and aesthetic excellence to create perfect openings that enhance your property."
+          features={[
+            {
+              id: "sliding-windows",              title: "Premium Sliding Windows",              author: "Design Excellence",              description: "Modern sliding window systems with smooth operation, superior insulation, and contemporary aesthetics. Available in various sizes and frame materials with optional motorized controls. Perfect for maximizing natural light and ventilation while maintaining security and energy efficiency.",              tags: ["Sliding Systems", "Insulation", "Modern Design"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/premium-sliding-window-system-1773981131808-cf06236c.png?_wi=1",              imageAlt: "Premium sliding window system with contemporary frame design. Smooth gliding mechanism and excellent"},
+            {
+              id: "hinged-doors",              title: "Hinged Door Systems",              author: "Functional Design",              description: "Elegant hinged doors suitable for entrances, patios, and interior spaces. Custom-designed handles, locks, and hinges ensure durability and security. Available in various styles from minimalist modern to classic designs that complement any architectural style.",              tags: ["Hinged Mechanisms", "Security", "Customizable"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/elegant-hinged-door-system-1773981131004-a16eab70.png?_wi=1",              imageAlt: "Elegant hinged door system with contemporary handle and frame design. Premium hardware and smooth op"},
+            {
+              id: "glass-partition",              title: "Glass Partition & Dividers",              author: "Space Optimization",              description: "Modern glass partition systems for offices, retail spaces, and residential interiors. Frameless or framed options with frosted, tinted, or clear glass. Ideal for creating flexible spaces while maintaining open-concept aesthetics and sound control.",              tags: ["Partitions", "Flexible Design", "Sound Control"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/modern-glass-partition-system-1773981131749-3c44c882.png?_wi=1",              imageAlt: "Modern glass partition system creating flexible office spaces. Frameless design with frosted glass"},
+            {
+              id: "folding-doors",              title: "Folding Door Systems",              author: "Space Efficiency",              description: "Innovative bi-fold and multi-fold door systems that maximize usable space. Perfect for connecting indoor and outdoor areas or creating flexible room configurations. Smooth operation with advanced track systems and precision engineering for years of reliable use.",              tags: ["Folding Mechanism", "Space Saving", "Smooth Operation"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/innovative-folding-door-system-1773981131408-069d06de.png?_wi=1",              imageAlt: "Innovative folding door system connecting indoor and outdoor spaces. Multi-panel design with smooth m"},
+            {
+              id: "security-windows",              title: "High-Security Window Systems",              author: "Safety & Protection",              description: "Heavy-duty security windows with reinforced frames, laminated glass, and advanced locking systems. Ideal for high-value properties, commercial buildings, and institutions. Provides maximum protection while maintaining visibility and natural lighting.",              tags: ["Security", "Laminated Glass", "Advanced Locks"],
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/high-security-window-system-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "High-security window system with reinforced frame and laminated glass. Advanced locking mechanism"},
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="why-choose-us" data-section="why-choose-us">
+        <MetricCardEleven
+          tag="WHY MILESTONES FOR WINDOWS & DOORS"
+          tagIcon={Award}
+          tagAnimation="slide-up"
+          title="Excellence in Window & Door Solutions"
+          description="With years of expertise in premium installations, we deliver uncompromising quality, expert craftsmanship, and exceptional customer service. Every project reflects our commitment to excellence."
+          metrics={[
+            {
+              id: "experience",              value: "12+",              title: "Years of Expertise",              description: "Specialized in premium window and door installations across residential and commercial projects"},
+            {
+              id: "projects",              value: "800+",              title: "Successful Installations",              description: "Trusted by homeowners, businesses, and developers throughout Thailand and region"},
+            {
+              id: "quality",              value: "99%",              title: "Quality Satisfaction",              description: "Premium materials and expert installation ensure long-lasting performance and beauty"},
+            {
+              id: "warranty",              value: "10",              title: "Year Warranty",              description: "Comprehensive warranty coverage on all products and installation workmanship"},
+            {
+              id: "support",              value: "24/7",              title: "Customer Support",              description: "Dedicated support team for maintenance, repairs, and customer service needs"},
+            {
+              id: "designs",              value: "500+",              title: "Design Options",              description: "Extensive range of styles, materials, and configurations to match any aesthetic"},
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="featured-projects" data-section="featured-projects">
+        <ProductCardTwo
+          tag="COMPLETED PROJECTS"
+          tagIcon={CheckCircle}
+          tagAnimation="slide-up"
+          title="Featured Window & Door Installations"
+          description="Explore our portfolio of premium window and door projects showcasing quality craftsmanship and design excellence."
+          products={[
+            {
+              id: "project-1",              brand: "Luxury Residence",              name: "Panoramic Window Installation",              price: "2.8M THB",              rating: 5,
+              reviewCount: "18",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/panoramic-window-luxury-residence-1773981131944-e95865db.png?_wi=1",              imageAlt: "Panoramic window installation in luxury residence. Floor-to-ceiling glass with mountain views and pr"},
+            {
+              id: "project-2",              brand: "Corporate Office",              name: "Glass Partition System",              price: "3.5M THB",              rating: 5,
+              reviewCount: "14",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/corporate-office-glass-partition-1773981131923-cf0c3dab.png?_wi=1",              imageAlt: "Modern glass partition system in corporate office. Frameless design creating flexible workspace with"},
+            {
+              id: "project-3",              brand: "Retail Store",              name: "Commercial Glass Doors",              price: "1.5M THB",              rating: 5,
+              reviewCount: "12",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/retail-store-glass-doors-1773981131081-518034f7.png?_wi=1",              imageAlt: "Commercial glass doors in modern retail store. Elegant entrance with electronic operation and secur"},
+            {
+              id: "project-4",              brand: "Residential Complex",              name: "Folding Door System",              price: "4.2M THB",              rating: 5,
+              reviewCount: "16",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/residential-folding-door-system-1773981131885-7d86d7ce.png?_wi=1",              imageAlt: "Multi-panel folding door system connecting indoor and outdoor living areas. Seamless integration and"},
+            {
+              id: "project-5",              brand: "High-Rise Apartment",              name: "Sliding Window Installation",              price: "2.1M THB",              rating: 5,
+              reviewCount: "13",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/high-rise-sliding-window-1773981131785-741649af.png?_wi=1",              imageAlt: "Sliding window installation in high-rise apartment. Modern frames with energy efficiency and sound i"},
+            {
+              id: "project-6",              brand: "Heritage Property",              name: "Custom Traditional Doors",              price: "1.8M THB",              rating: 5,
+              reviewCount: "10",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/heritage-custom-doors-1773981135234-da2258a8.png?_wi=1",              imageAlt: "Custom traditional doors in heritage property. Handcrafted design preserving architectural character"},
+          ]}
+          gridVariant="three-columns-all-equal-width"
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="trust-indicators" data-section="trust-indicators">
+        <SocialProofOne
+          tag="TRUSTED BY LEADING PROPERTIES"
+          tagIcon={Shield}
+          tagAnimation="slide-up"
+          title="Preferred Windows & Doors Partner"
+          description="Our expertise is trusted by luxury residential developments, corporate offices, retail chains, and property developers throughout Thailand and Southeast Asia."
+          names={[
+            "Thai Luxury Residences",            "Bangkok Corporate Group",            "Southeast Property Developers",            "Premium Retail Association",            "Thai Architectural Foundation",            "Regional Construction Leaders",            "International Design Studios",            "Bangkok Real Estate Partners"]}
+          logos={[
+            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/luxury-property-logo-1773981130490-d851f847.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/corporate-office-logo-1773981131364-3e0f1b67.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/development-company-logo-1773981133845-5e6dbc25.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/retail-association-logo-1773981130788-63944153.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/architecture-foundation-logo-1773981130764-ae871848.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/construction-leaders-logo-1773981131039-83d43e45.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/design-studios-logo-1773981132381-3ecc38c8.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/real-estate-partners-logo-1773981130307-dd93d586.png"]}
+          textboxLayout="default"
+          useInvertedBackground={false}
+          showCard={true}
+          speed={40}
+        />
+      </div>
+
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardFifteen
+          testimonial="Milestones Technologies delivered exceptional window and door solutions for our residential complex. The quality of materials, precision installation, and attention to detail exceeded our expectations. Their professional team made the entire process smooth and stress-free. We highly recommend them for any window and door project."
+          rating={5}
+          author="Priya Anand, Property Manager - Bangkok Luxury Residences"
+          avatars={[
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/property-manager-avatar-1773981130512-3b9ae1e1.png",              alt: "Priya Anand"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/architect-avatar-1773981130089-2c759151.png",              alt: "Architect Team Lead"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/designer-avatar-1773981130978-eb2d4e1c.png",              alt: "Design Consultant"},
+            {
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/owner-avatar-1773981131172-a7325777.png",              alt: "Property Owner"},
+          ]}
+          ratingAnimation="slide-up"
+          avatarsAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="cta" data-section="cta">
+        <ContactText
+          text="Transform your property with premium window and door solutions. Schedule a consultation with our design specialists today and discover the perfect solutions for your space."
+          background={{ variant: "animated-grid" }}
+          buttons={[
+            {
+              text: "Book Free Design Consultation",              href: "/contact"},
+            {
+              text: "Call Our Team",              href: "tel:+6621234567"},
+          ]}
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterBase
+          logoText="Milestones Technologies"
+          copyrightText="© 2025 Milestones Technologies. All rights reserved."
+          columns={footerColumns}
+        />
+      </div>
+    </ThemeProvider>
+  );
+}
\ No newline at end of file