diff --git a/src/app/solutions/page.tsx b/src/app/solutions/page.tsx
index dc3536f..a3f95e2 100644
--- a/src/app/solutions/page.tsx
+++ b/src/app/solutions/page.tsx
@@ -4,19 +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 ContactText from "@/components/sections/contact/ContactText";
 import FooterBase from "@/components/sections/footer/FooterBase";
-import { Lightbulb, Zap, TrendingUp, CheckCircle } from "lucide-react";
+import { Zap, Lightbulb, CheckCircle, Layers } from "lucide-react";
 
 export default function SolutionsPage() {
   const navItems = [
-    { name: "Home", id: "/" },
-    { name: "About", id: "/about" },
-    { name: "Solutions", id: "/solutions" },
-    { 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: "Blog", id: "blog" },
     { name: "Contact", id: "contact" },
   ];
 
@@ -33,6 +34,7 @@ export default function SolutionsPage() {
     {
       title: "Company",      items: [
         { label: "About Us", href: "/about" },
+        { label: "Our Services", href: "/services" },
         { label: "Projects & Portfolio", href: "/" },
         { label: "Blog & Articles", href: "/" },
         { label: "Careers", href: "/" },
@@ -83,87 +85,54 @@ export default function SolutionsPage() {
 
       <div id="hero" data-section="hero">
         <HeroBillboardGallery
-          title="Solutions Overview"
-          description="Comprehensive automation solutions engineered for your industry. From industrial production lines to smart gate systems, we deliver customized solutions that enhance efficiency, reduce costs, and drive sustainable growth."
-          tag="SOLUTIONS & SERVICES"
-          tagIcon={Lightbulb}
+          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: "Get Custom Solution",              href: "/contact"},
+              text: "Explore Solutions",              href: "#solutions"},
             {
-              text: "Explore Services",              href: "/services"},
+              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 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: "Industrial automation control system"},
             {
-              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 robotics"},
+              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 systems"},
-            {
-              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 and access control"},
-            {
-              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"},
-            {
-              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 consultation"},
+              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="core-solutions" data-section="core-solutions">
+      <div id="solutions" data-section="solutions">
         <FeatureCardTwentyFour
-          tag="FIVE CORE SOLUTIONS"
-          tagIcon={Zap}
+          tag="CORE SOLUTION CATEGORIES"
+          tagIcon={Lightbulb}
           tagAnimation="slide-up"
-          title="Our Solution Categories"
-          description="We offer five integrated solution categories, each designed to address specific industry challenges. Every solution combines proven technology, expert engineering, and comprehensive support."
+          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: "industrial-automation",              title: "Industrial Automation Systems",              author: "Production Excellence",              description: "Complete automation of production lines, assembly processes, and manufacturing workflows. Integrate PLCs, variable frequency drives, sensors, and real-time monitoring systems. Increase productivity by up to 40% while reducing downtime and improving quality consistency.",              tags: ["PLC Control", "Real-time Monitoring", "Quality Assurance"],
-              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"},
+              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: "robotics",              title: "Robot & Cobot Automation",              author: "Precision Robotics",              description: "Deploy industrial robots and collaborative cobots for precise, repetitive, and hazardous tasks. Handle material movement, assembly, welding, and specialized manufacturing. Our solutions integrate with existing systems and scale with your production demands.",              tags: ["Industrial Robots", "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 robotics"},
+              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: "packaging",              title: "Packaging Machinery Solutions",              author: "Production Optimization",              description: "High-speed packaging systems for food, pharmaceutical, cosmetics, and consumer goods. Automated filling, sealing, labeling, and quality inspection integrated into seamless production workflows. Compliance with industry regulations and food safety standards.",              tags: ["High-Speed Packaging", "Quality Control", "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: "State-of-the-art packaging systems"},
+              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: "smart-gates",              title: "Smart Gate & Access Systems",              author: "Security Solutions",              description: "Premium automatic gate systems for residential, commercial, and industrial properties. Remote control operation, RFID/card reader integration, mobile app control, and advanced security features. Reliable, elegant solutions for modern smart living and secure facilities.",              tags: ["Access Control", "Remote Operation", "Smart Integration"],
-              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 smart gates"},
+              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: "custom-engineering",              title: "Custom Engineering Solutions",              author: "Tailored Innovation",              description: "Bespoke automation solutions designed specifically for your unique operational requirements. From concept development through detailed engineering, fabrication, installation, and ongoing optimization. We create solutions that solve your specific challenges.",              tags: ["Custom Design", "Full Support", "Innovation"],
-              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 solutions"},
-          ]}
-          animationType="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={false}
-        />
-      </div>
-
-      <div id="solution-benefits" data-section="solution-benefits">
-        <MetricCardEleven
-          tag="WHY CHOOSE OUR SOLUTIONS"
-          tagIcon={TrendingUp}
-          tagAnimation="slide-up"
-          title="Proven Results & Benefits"
-          description="Our solutions are engineered to deliver measurable improvements in productivity, efficiency, and profitability across diverse industries."
-          metrics={[
-            {
-              id: "productivity",              value: "40%",              title: "Productivity Increase",              description: "Average productivity improvement within first 6 months of implementation"},
-            {
-              id: "cost",              value: "30%",              title: "Cost Reduction",              description: "Typical operational cost savings through automation and optimization"},
-            {
-              id: "quality",              value: "50%",              title: "Defect Reduction",              description: "Significant improvement in product quality and consistency"},
-            {
-              id: "downtime",              value: "80%",              title: "Downtime Reduction",              description: "Minimized unplanned downtime with 24/7 monitoring and support"},
-            {
-              id: "roi",              value: "8-12",              title: "Month ROI Timeline",              description: "Most clients achieve return on investment within 8-12 months"},
-            {
-              id: "scalability",              value: "100%",              title: "Fully Scalable",              description: "Solutions grow with your business needs and production demands"},
+              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"
@@ -172,27 +141,57 @@ export default function SolutionsPage() {
       </div>
 
       <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: "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: "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: "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: "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: "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: "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"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="featured-solutions" data-section="featured-solutions">
         <ProductCardTwo
-          tag="IMPLEMENTATION PROCESS"
+          tag="FEATURED IMPLEMENTATIONS"
           tagIcon={CheckCircle}
           tagAnimation="slide-up"
-          title="Our Project Approach"
-          description="We follow a structured, transparent process to ensure successful solution implementation and long-term value creation."
+          title="Successful Solution Deployments"
+          description="Real-world examples of our automation solutions transforming industries and delivering measurable results."
           products={[
             {
-              id: "assessment",              brand: "Phase 1",              name: "Initial Assessment & Planning",              price: "Consultation",              rating: 5,
-              reviewCount: "100%",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/professional-engineering-team-working-on-1773981131698-7cf7cd5d.png?_wi=1",              imageAlt: "Consultation and assessment"},
+              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: "design",              brand: "Phase 2",              name: "Solution Design & Engineering",              price: "Custom Design",              rating: 5,
-              reviewCount: "100%",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/custom-engineered-automation-solution-be-1773981131850-3c480c9d.png?_wi=1",              imageAlt: "Design and engineering"},
+              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: "implementation",              brand: "Phase 3",              name: "Installation & Integration",              price: "Full Implementation",              rating: 5,
-              reviewCount: "100%",              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: "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: "support",              brand: "Phase 4",              name: "Training & Ongoing Support",              price: "24/7 Support",              rating: 5,
-              reviewCount: "100%",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BC5DoKtnbMRErIYJgmPK5zjs5w/industrial-robot-arm-performing-precise--1773981130354-3aca37a1.png?_wi=1",              imageAlt: "Training and support"},
+              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: "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}
@@ -201,13 +200,13 @@ export default function SolutionsPage() {
 
       <div id="cta" data-section="cta">
         <ContactText
-          text="Ready to transform your operations? Schedule a consultation with our solutions team and discover how we can optimize your automation challenges."
+          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: "Learn More",              href: "/about"},
+              text: "Schedule Demo",              href: "/contact"},
           ]}
           useInvertedBackground={false}
         />