diff --git a/src/app/solutions/page.tsx b/src/app/solutions/page.tsx
index 1057167..6f6bc8d 100644
--- a/src/app/solutions/page.tsx
+++ b/src/app/solutions/page.tsx
@@ -1,64 +1,63 @@
 "use client";
 
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import Link from "next/link";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
+import TestimonialAboutCard from "@/components/sections/about/TestimonialAboutCard";
 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, Shield } from "lucide-react";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import { Cog, Building2, Lightbulb, Award } 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: "Projects", id: "projects" },
+    { name: "Blog", id: "blog" },
     { name: "Contact", id: "contact" },
   ];
 
   const footerColumns = [
     {
-      title: "Solutions",      items: [
+      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: "Projects & Portfolio", href: "/" },
+      title: "Company",
+      items: [
+        { label: "About Us", href: "/" },
+        { label: "Projects & Portfolio", href: "/projects" },
         { label: "Blog & Articles", href: "/" },
-        { label: "Careers", href: "/" },
-        { label: "Contact", href: "/contact" },
+        { label: "Careers", href: "#" },
+        { label: "Contact", href: "/" },
       ],
     },
     {
-      title: "Resources",      items: [
-        { label: "Case Studies", href: "/" },
-        { label: "Technical Documentation", href: "/" },
-        { label: "Support Portal", href: "/" },
-        { label: "FAQ", href: "/" },
-        { label: "Contact Support", href: "/contact" },
+      title: "Resources",
+      items: [
+        { label: "Case Studies", href: "#" },
+        { label: "Technical Documentation", href: "#" },
+        { label: "Support Portal", href: "#" },
+        { label: "FAQ", href: "#" },
+        { label: "Contact Support", href: "/" },
       ],
     },
     {
-      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" },
-        { label: "Bangkok, Thailand", href: "/" },
-        { label: "Mon-Fri 8:00-18:00 (GMT+7)", href: "/" },
+        { label: "Bangkok, Thailand", href: "#" },
+        { label: "Mon-Fri 8:00-18:00 (GMT+7)", href: "#" },
       ],
     },
   ];
@@ -81,58 +80,81 @@ export default function SolutionsPage() {
           brandName="Milestones Technologies"
           navItems={navItems}
           button={{
-            text: "Request Quote",            href: "/contact"}}
+            text: "Request Quote",
+            href: "/",
+          }}
         />
       </div>
 
-      <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"
-          tagIcon={Zap}
+      <div id="about" data-section="about">
+        <TestimonialAboutCard
+          tag="ABOUT MILESTONES TECHNOLOGIES"
+          tagIcon={Building2}
           tagAnimation="slide-up"
-          buttons={[
-            {
-              text: "Request Consultation",              href: "/contact"},
-            {
-              text: "View Case Studies",              href: "/"},
-          ]}
-          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/complete-automotive-assembly-line-with-m-1773981131944-e95865db.png?_wi=1",              imageAlt: "Complete automotive assembly line automation"},
-          ]}
-          mediaAnimation="blur-reveal"
+          title="Thailand's Leading Industrial Automation Partner"
+          description="Founded with a vision to revolutionize manufacturing and automation across Southeast Asia, Milestones Technologies has become a trusted name in industrial innovation. We specialize in delivering comprehensive automation solutions that drive efficiency, reduce costs, and enhance operational safety."
+          subdescription="Our team of experienced engineers and solution architects work directly with factory owners, production managers, and business leaders to understand their unique challenges and implement tailored automation systems that deliver measurable ROI and long-term competitive advantages."
+          icon={Cog}
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/milestones-technologies-modern-facility--1773981137018-c41797de.png?_wi=2"
+          imageAlt="Milestones Technologies modern facility exterior and interior. State-of-the-art engineering lab with"
+          mediaAnimation="slide-up"
+          useInvertedBackground={false}
         />
       </div>
 
-      <div id="features" data-section="features">
+      <div id="solutions" data-section="solutions">
         <FeatureCardTwentyFour
-          tag="AUTOMATION CAPABILITIES"
+          tag="OUR CORE SOLUTIONS"
           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="Comprehensive Automation & Engineering Solutions"
+          description="We deliver five core solution categories designed to address the specific needs of factories, warehouses, and smart properties. Each solution is engineered for reliability, scalability, and long-term performance."
           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. 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=2",
+              imageAlt: "Industrial automation control system with PLC controllers, variable frequency drives, and wiring. Cl",
+            },
             {
-              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 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=2",
+              imageAlt: "Advanced collaborative robot with articulated arms performing complex assembly task. Compact cobot d",
+            },
             {
-              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. 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=2",
+              imageAlt: "State-of-the-art automatic packaging system with multiple stations. Products being filled, sealed, a",
+            },
             {
-              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, 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=2",
+              imageAlt: "Modern premium automatic sliding gate with remote control and RFID reader. Beautiful residential or ",
+            },
             {
-              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 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=2",
+              imageAlt: "Custom engineered automation solution being installed at client site. Unique integrated system combi",
+            },
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -140,26 +162,50 @@ export default function SolutionsPage() {
         />
       </div>
 
-      <div id="benefits" data-section="benefits">
+      <div id="why-choose-us" data-section="why-choose-us">
         <MetricCardEleven
-          tag="PROVEN RESULTS"
+          tag="WHY CHOOSE MILESTONES"
           tagIcon={Award}
           tagAnimation="slide-up"
-          title="Industry-Leading Performance Gains"
-          description="Our industrial automation solutions consistently deliver significant improvements across key performance metrics."
+          title="Proven Excellence in Industrial Automation"
+          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: "productivity",              value: "40%",              title: "Productivity Increase",              description: "Average productivity improvement within first 6 months"},
+              id: "experience",
+              value: "15+",
+              title: "Years of Experience",
+              description: "Trusted by factories and businesses across Southeast Asia since 2009",
+            },
             {
-              id: "defects",              value: "68%",              title: "Defect Reduction",              description: "Significant reduction in manufacturing defects through automation"},
+              id: "projects",
+              value: "500+",
+              title: "Projects Completed",
+              description: "Successful installations and implementations across all solution categories",
+            },
             {
-              id: "downtime",              value: "85%",              title: "Downtime Reduction",              description: "Minimized production downtime with predictive maintenance"},
+              id: "efficiency",
+              value: "40%",
+              title: "Average Productivity Increase",
+              description: "Clients report significant efficiency gains within first 6 months",
+            },
             {
-              id: "labor-cost",              value: "35%",              title: "Labor Cost Savings",              description: "Reduced labor costs through intelligent automation"},
+              id: "satisfaction",
+              value: "98%",
+              title: "Client Satisfaction Rate",
+              description: "Industry-leading customer satisfaction and long-term partnerships",
+            },
             {
-              id: "roi",              value: "8-12",              title: "Month ROI Timeline",              description: "Most clients achieve full return on investment within 8-12 months"},
+              id: "support",
+              value: "24/7",
+              title: "Technical Support",
+              description: "Round-the-clock support team to ensure zero downtime operations",
+            },
             {
-              id: "uptime",              value: "99.2%",              title: "System Uptime",              description: "Industry-leading system reliability and performance"},
+              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"
@@ -167,67 +213,6 @@ export default function SolutionsPage() {
         />
       </div>
 
-      <div id="projects" data-section="projects">
-        <ProductCardTwo
-          tag="SUCCESS STORIES"
-          tagIcon={CheckCircle}
-          tagAnimation="slide-up"
-          title="Industrial Automation Projects"
-          description="Explore our successful industrial automation implementations across diverse manufacturing sectors."
-          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: "project-2",              brand: "Chemical",              name: "Robotic Production Line System",              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"},
-          ]}
-          gridVariant="two-columns-alternating-heights"
-          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."
-          background={{ variant: "animated-grid" }}
-          buttons={[
-            {
-              text: "Schedule Consultation",              href: "/contact"},
-            {
-              text: "Download Technical Guide",              href: "/"},
-          ]}
-          useInvertedBackground={false}
-        />
-      </div>
-
       <div id="footer" data-section="footer">
         <FooterBase
           logoText="Milestones Technologies"