diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 314fb37..44745c3 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,53 +1,49 @@
 "use client";
 
-import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
 import MediaAbout from "@/components/sections/about/MediaAbout";
 import FeatureCardSix from "@/components/sections/feature/FeatureCardSix";
+import TestimonialCardFive from "@/components/sections/testimonial/TestimonialCardFive";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import { Zap } from "lucide-react";
+import { Heart, Zap } from "lucide-react";
 
 export default function AboutPage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "About Us", id: "about" },
-    { name: "Products", id: "products" },
-    { name: "Services", id: "services" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "About Us", id: "/about" },
+    { name: "Products", id: "/products" },
+    { name: "Services", id: "/services" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
-        { label: "Our Services", href: "/" },
-        { label: "Products", href: "/" },
-        { label: "Contact", href: "/" },
+        { label: "Our Services", href: "/services" },
+        { label: "Products", href: "/products" },
+        { label: "Contact", href: "/contact" },
       ],
     },
     {
-      title: "Services",
-      items: [
-        { label: "Vending Machine Sales", href: "#" },
-        { label: "Rental Options", href: "#" },
-        { label: "Maintenance Plans", href: "#" },
-        { label: "Technical Support", href: "#" },
+      title: "Services",      items: [
+        { label: "Vending Machine Sales", href: "/products" },
+        { label: "Rental Options", href: "/services" },
+        { label: "Maintenance Plans", href: "/services" },
+        { label: "Technical Support", href: "/contact" },
       ],
     },
     {
-      title: "Connect",
-      items: [
-        { label: "WhatsApp", href: "https://wa.me/+972-example" },
+      title: "Connect",      items: [
+        { label: "WhatsApp", href: "https://wa.me/972123456789" },
         { label: "Email Us", href: "mailto:info@meirfoodmachines.co.il" },
         { label: "Call Us", href: "tel:+972-123-456789" },
-        { label: "Request Quote", href: "/" },
+        { label: "Request Quote", href: "/contact" },
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Cookie Policy", href: "#" },
@@ -69,63 +65,75 @@ export default function AboutPage() {
       secondaryButtonStyle="radial-glow"
       headingFontWeight="medium"
     >
-      <div id="nav" data-section="nav">
+      {/* Navbar */}
+      <div id="nav" data-section="nav" className="mx-auto px-4 md:px-6">
         <NavbarLayoutFloatingOverlay
           brandName="Meir Food Machines"
           navItems={navItems}
           button={{
-            text: "Get a Quote",
-            href: "/",
-          }}
+            text: "Get a Quote",            href: "/contact"}}
         />
       </div>
 
-      <div id="about-detail" data-section="about-detail">
+      {/* Main About Section */}
+      <div id="about" data-section="about" className="mx-auto px-4 md:px-6">
         <MediaAbout
-          title="Our Company Story"
-          description="Meir Food Machines was founded on a simple principle: businesses deserve reliable vending solutions backed by exceptional service. Over 15 years, we've grown from a small local operation to a trusted partner for hundreds of businesses across Israel. Our commitment to quality, innovation, and customer satisfaction remains unchanged. We believe in building long-term relationships with our clients by delivering consistent value and support."
-          tag="Our Journey"
-          useInvertedBackground={true}
-          imageSrc="http://img.b2bpic.net/free-photo/woman-looking-goodies-local-male-producer_23-2149110835.jpg?_wi=2"
-          imageAlt="Meir Food Machines company history"
+          title="About Meir Food Machines"
+          description="With over 15 years of experience, Meir Food Machines has built a reputation for reliability, quality, and exceptional customer service. Founded as a family business, we understand the importance of keeping your operations running smoothly. We provide more than just vending machines—we provide peace of mind through expert installation, regular maintenance, and responsive support."
+          tag="Family-Owned Business"
+          tagIcon={Heart}
+          useInvertedBackground={false}
+          imageSrc="http://img.b2bpic.net/free-photo/woman-looking-goodies-local-male-producer_23-2149110835.jpg?_wi=1"
+          imageAlt="Meir Food Machines warehouse and operations"
         />
       </div>
 
-      <div id="values" data-section="values">
+      {/* Our Values Section */}
+      <div id="values" data-section="values" className="mx-auto px-4 md:px-6">
         <FeatureCardSix
           title="Our Core Values"
-          description="These principles guide everything we do and define our relationship with customers."
+          description="These principles guide everything we do and help us deliver exceptional service to our customers."
           tag="What Drives Us"
           tagIcon={Zap}
           features={[
             {
               id: 1,
-              title: "Reliability",
-              description: "We stand behind every machine we provide. With regular maintenance and rapid response support, we ensure your vending operations never miss a beat.",
-              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=3",
-              imageAlt: "Reliability in service",
-            },
+              title: "Quality & Reliability",              description: "We source premium vending machines and maintain rigorous quality standards to ensure your investment is protected and your customers are satisfied.",              imageSrc: "http://img.b2bpic.net/free-photo/engineer-factory-checking-machine-efficiency_1163-1699.jpg?_wi=1",              imageAlt: "Quality assurance process"},
             {
               id: 2,
-              title: "Customer Excellence",
-              description: "Your satisfaction is our priority. From initial consultation to ongoing support, we're dedicated to exceeding your expectations with professional, responsive service.",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-working-steel-fatory-equipment-steel-production_1303-22926.jpg?_wi=2",
-              imageAlt: "Customer service excellence",
-            },
+              title: "Customer Service Excellence",              description: "Your success is our success. We're committed to providing responsive, professional support that keeps your operations running smoothly.",              imageSrc: "http://img.b2bpic.net/free-photo/business-team-putting-hands-together_1163-1520.jpg?_wi=1",              imageAlt: "Customer service team"},
             {
               id: 3,
-              title: "Innovation",
-              description: "We continuously invest in the latest vending technology and practices. Our machines are modern, efficient, and designed to meet evolving business needs.",
-              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=4",
-              imageAlt: "Innovation in vending solutions",
-            },
+              title: "Innovation & Adaptation",              description: "We continuously update our offerings and services to meet changing business needs and market demands, staying ahead of industry trends.",              imageSrc: "http://img.b2bpic.net/free-photo/laptop-technology-marketing-concept_1163-5134.jpg?_wi=1",              imageAlt: "Innovation and technology"},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
         />
       </div>
 
-      <div id="footer" data-section="footer">
+      {/* Customer Testimonials */}
+      <div id="testimonials" data-section="testimonials" className="mx-auto px-4 md:px-6">
+        <TestimonialCardFive
+          title="What Our Customers Say"
+          description="Real feedback from businesses that trust Meir Food Machines for their vending needs."
+          tag="Customer Reviews"
+          testimonials={[
+            {
+              id: "1",              name: "David Cohen",              title: "Exceptional Service",              date: "March 2024",              quote: "Meir Food Machines provided outstanding service from installation to ongoing maintenance. Their team is responsive and professional. Highly recommended!",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-waitress_107420-12307.jpg",              avatarAlt: "David Cohen"},
+            {
+              id: "2",              name: "Sarah Mizrahi",              title: "Perfect for Our Campus",              date: "February 2024",              quote: "The vending machines have become an essential part of our school. The company's support team is always ready to help with any issues.",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/confident-entrepreneur-satisfied-with-own-success_1163-5474.jpg",              avatarAlt: "Sarah Mizrahi"},
+            {
+              id: "3",              name: "Ronen Levy",              title: "Reliable and Easy to Work With",              date: "January 2024",              quote: "Meir Food Machines has been fantastic to work with. Their machines are reliable and their customer service is top-notch.",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1674.jpg",              avatarAlt: "Ronen Levy"},
+            {
+              id: "4",              name: "Noa Segal",              title: "Transformed Our Break Room",              date: "December 2023",              quote: "The coffee machine has been a game-changer for our office. Employees love it and the company's support is always there when needed.",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/man-corrects-belt-fees-groom-man-s-hands-dressing-man-buttons-pants-jeans_8353-5893.jpg",              avatarAlt: "Noa Segal"},
+          ]}
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      {/* Footer */}
+      <div id="footer" data-section="footer" className="mx-auto px-4 md:px-6">
         <FooterSimple
           columns={footerColumns}
           bottomLeftText="© 2024 Meir Food Machines. All rights reserved."
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index c0f22a9..645c318 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -1,52 +1,53 @@
 "use client";
 
-import Link from "next/link";
+import { useState } from "react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import ContactFaq from "@/components/sections/contact/ContactFaq";
+import ContactText from "@/components/sections/contact/ContactText";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import { MessageCircle } from "lucide-react";
+import Textarea from "@/components/form/Textarea";
 
 export default function ContactPage() {
+  const [formData, setFormData] = useState({
+    name: "",    email: "",    phone: "",    company: "",    message: ""});
+
+  const [submitStatus, setSubmitStatus] = useState<"idle" | "loading" | "success" | "error">("idle");
+
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "About Us", id: "about" },
-    { name: "Products", id: "products" },
-    { name: "Services", id: "services" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "About Us", id: "/about" },
+    { name: "Products", id: "/products" },
+    { name: "Services", id: "/services" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [
     {
-      title: "Company",
-      items: [
-        { label: "About Us", href: "/" },
-        { label: "Our Services", href: "/" },
-        { label: "Products", href: "/" },
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Our Services", href: "/services" },
+        { label: "Products", href: "/products" },
         { label: "Contact", href: "/contact" },
       ],
     },
     {
-      title: "Services",
-      items: [
-        { label: "Vending Machine Sales", href: "#" },
-        { label: "Rental Options", href: "#" },
-        { label: "Maintenance Plans", href: "#" },
-        { label: "Technical Support", href: "#" },
+      title: "Services",      items: [
+        { label: "Vending Machine Sales", href: "/products" },
+        { label: "Rental Options", href: "/services" },
+        { label: "Maintenance Plans", href: "/services" },
+        { label: "Technical Support", href: "/contact" },
       ],
     },
     {
-      title: "Connect",
-      items: [
-        { label: "WhatsApp", href: "https://wa.me/+972-example" },
+      title: "Connect",      items: [
+        { label: "WhatsApp", href: "https://wa.me/972123456789" },
         { label: "Email Us", href: "mailto:info@meirfoodmachines.co.il" },
         { label: "Call Us", href: "tel:+972-123-456789" },
         { label: "Request Quote", href: "/contact" },
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Cookie Policy", href: "#" },
@@ -55,6 +56,37 @@ export default function ContactPage() {
     },
   ];
 
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+    const { name, value } = e.target;
+    setFormData((prev) => ({
+      ...prev,
+      [name]: value,
+    }));
+  };
+
+  const handleTextareaChange = (value: string) => {
+    setFormData((prev) => ({
+      ...prev,
+      message: value,
+    }));
+  };
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    setSubmitStatus("loading");
+
+    try {
+      // Simulate form submission
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      setSubmitStatus("success");
+      setFormData({ name: "", email: "", phone: "", company: "", message: "" });
+      setTimeout(() => setSubmitStatus("idle"), 3000);
+    } catch (error) {
+      setSubmitStatus("error");
+      setTimeout(() => setSubmitStatus("idle"), 3000);
+    }
+  };
+
   return (
     <ThemeProvider
       defaultButtonVariant="text-shift"
@@ -74,49 +106,201 @@ export default function ContactPage() {
           brandName="Meir Food Machines"
           navItems={navItems}
           button={{
-            text: "Get a Quote",
-            href: "/contact",
-          }}
+            text: "Get a Quote",            href: "/contact"}}
         />
       </div>
 
-      {/* Contact Section */}
-      <div id="contact" data-section="contact" className="mx-auto px-4 md:px-6">
-        <ContactFaq
-          ctaTitle="Ready to Get Started?"
-          ctaDescription="Contact us today for a free consultation. Our team will help you find the perfect vending solution for your business."
-          ctaButton={{
-            text: "Contact Us Now",
-            href: "https://wa.me/+972-example",
-          }}
-          ctaIcon={MessageCircle}
+      {/* Contact Header */}
+      <div id="contact-header" data-section="contact-header" className="mx-auto px-4 md:px-6">
+        <ContactText
+          text="Get in Touch with Meir Food Machines"
+          animationType="entrance-slide"
+          background={{ variant: "plain" }}
           useInvertedBackground={false}
-          animationType="slide-up"
-          faqs={[
+          buttons={[
             {
-              id: "1",
-              title: "📞 Phone",
-              content: "+972-123-456789",
-            },
+              text: "Call Now",              href: "tel:+972-123-456789"},
             {
-              id: "2",
-              title: "📧 Email",
-              content: "info@meirfoodmachines.co.il",
-            },
-            {
-              id: "3",
-              title: "💬 WhatsApp",
-              content: "Available for quick support and inquiries",
-            },
-            {
-              id: "4",
-              title: "🕒 Business Hours",
-              content: "Sunday - Thursday: 8:00 AM - 6:00 PM | Friday: 8:00 AM - 2:00 PM | Saturday: Closed",
-            },
+              text: "WhatsApp",              href: "https://wa.me/972123456789"},
           ]}
         />
       </div>
 
+      {/* Contact Form Section */}
+      <div id="contact-form" data-section="contact-form" className="mx-auto px-4 md:px-6 py-12 md:py-16">
+        <div className="max-w-2xl mx-auto">
+          <div className="mb-8 text-center">
+            <h2 className="text-2xl md:text-3xl font-bold mb-4">Send us a Message</h2>
+            <p className="text-gray-600 dark:text-gray-300">Fill out the form below and our team will get back to you within 24 hours.</p>
+          </div>
+
+          <form onSubmit={handleSubmit} className="space-y-6 bg-white dark:bg-gray-900 rounded-lg p-6 md:p-8 shadow-lg border border-gray-200 dark:border-gray-800">
+            {/* Name Field */}
+            <div>
+              <label htmlFor="name" className="block text-sm font-medium mb-2">
+                Full Name *
+              </label>
+              <input
+                type="text"
+                id="name"
+                name="name"
+                value={formData.name}
+                onChange={handleInputChange}
+                required
+                placeholder="Your name"
+                className="w-full px-4 py-2 border border-gray-300 dark:border-gray-700 rounded-lg bg-white dark:bg-gray-800 text-gray-900 dark:text-white placeholder-gray-500 dark:placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500"
+              />
+            </div>
+
+            {/* Email Field */}
+            <div>
+              <label htmlFor="email" className="block text-sm font-medium mb-2">
+                Email Address *
+              </label>
+              <input
+                type="email"
+                id="email"
+                name="email"
+                value={formData.email}
+                onChange={handleInputChange}
+                required
+                placeholder="your.email@company.com"
+                className="w-full px-4 py-2 border border-gray-300 dark:border-gray-700 rounded-lg bg-white dark:bg-gray-800 text-gray-900 dark:text-white placeholder-gray-500 dark:placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500"
+              />
+            </div>
+
+            {/* Phone Field */}
+            <div>
+              <label htmlFor="phone" className="block text-sm font-medium mb-2">
+                Phone Number
+              </label>
+              <input
+                type="tel"
+                id="phone"
+                name="phone"
+                value={formData.phone}
+                onChange={handleInputChange}
+                placeholder="+972 (XX) XXXX XXXX"
+                className="w-full px-4 py-2 border border-gray-300 dark:border-gray-700 rounded-lg bg-white dark:bg-gray-800 text-gray-900 dark:text-white placeholder-gray-500 dark:placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500"
+              />
+            </div>
+
+            {/* Company Field */}
+            <div>
+              <label htmlFor="company" className="block text-sm font-medium mb-2">
+                Company Name
+              </label>
+              <input
+                type="text"
+                id="company"
+                name="company"
+                value={formData.company}
+                onChange={handleInputChange}
+                placeholder="Your company"
+                className="w-full px-4 py-2 border border-gray-300 dark:border-gray-700 rounded-lg bg-white dark:bg-gray-800 text-gray-900 dark:text-white placeholder-gray-500 dark:placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500"
+              />
+            </div>
+
+            {/* Message Field */}
+            <div>
+              <label htmlFor="message" className="block text-sm font-medium mb-2">
+                Message *
+              </label>
+              <Textarea
+                value={formData.message}
+                onChange={handleTextareaChange}
+                placeholder="Tell us about your vending needs..."
+                rows={5}
+                required
+              />
+            </div>
+
+            {/* Submit Status */}
+            {submitStatus === "success" && (
+              <div className="p-4 bg-green-50 dark:bg-green-900 border border-green-200 dark:border-green-700 rounded-lg text-green-800 dark:text-green-100">
+                Thank you! Your message has been sent successfully. We'll be in touch soon.
+              </div>
+            )}
+
+            {submitStatus === "error" && (
+              <div className="p-4 bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700 rounded-lg text-red-800 dark:text-red-100">
+                There was an error sending your message. Please try again.
+              </div>
+            )}
+
+            {/* Submit Button */}
+            <button
+              type="submit"
+              disabled={submitStatus === "loading"}
+              className="w-full px-6 py-3 bg-blue-600 hover:bg-blue-700 disabled:bg-gray-400 text-white font-medium rounded-lg transition-colors duration-200"
+            >
+              {submitStatus === "loading" ? "Sending..." : "Send Message"}
+            </button>
+          </form>
+
+          {/* Contact Information Cards */}
+          <div className="grid md:grid-cols-3 gap-6 mt-12">
+            <div className="text-center p-6 bg-white dark:bg-gray-900 rounded-lg border border-gray-200 dark:border-gray-800">
+              <h3 className="font-bold mb-2">Phone</h3>
+              <p className="text-gray-600 dark:text-gray-300">
+                <a href="tel:+972-123-456789" className="hover:text-blue-600 dark:hover:text-blue-400">
+                  +972-123-456789
+                </a>
+              </p>
+            </div>
+            <div className="text-center p-6 bg-white dark:bg-gray-900 rounded-lg border border-gray-200 dark:border-gray-800">
+              <h3 className="font-bold mb-2">Email</h3>
+              <p className="text-gray-600 dark:text-gray-300">
+                <a href="mailto:info@meirfoodmachines.co.il" className="hover:text-blue-600 dark:hover:text-blue-400">
+                  info@meirfoodmachines.co.il
+                </a>
+              </p>
+            </div>
+            <div className="text-center p-6 bg-white dark:bg-gray-900 rounded-lg border border-gray-200 dark:border-gray-800">
+              <h3 className="font-bold mb-2">WhatsApp</h3>
+              <p className="text-gray-600 dark:text-gray-300">
+                <a href="https://wa.me/972123456789" className="hover:text-blue-600 dark:hover:text-blue-400" target="_blank" rel="noopener noreferrer">
+                  Message Us
+                </a>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* Embedded Map Section */}
+      <div id="contact-map" data-section="contact-map" className="mx-auto px-4 md:px-6 py-12 md:py-16">
+        <div className="max-w-4xl mx-auto">
+          <h2 className="text-2xl md:text-3xl font-bold mb-4 text-center">Our Location</h2>
+          <p className="text-center text-gray-600 dark:text-gray-300 mb-8">Visit us at our headquarters in Tel Aviv, Israel</p>
+          
+          <div className="rounded-lg overflow-hidden shadow-lg border border-gray-200 dark:border-gray-800 h-96 md:h-96">
+            <iframe
+              src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3383.6584997476374!2d34.76568!3d32.09!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x151d4c22c5555555%3A0x5555555555555555!2sTel%20Aviv%2C%20Israel!5e0!3m2!1sen!2sus!4v1234567890"
+              width="100%"
+              height="100%"
+              style={{ border: 0 }}
+              allowFullScreen
+              loading="lazy"
+              referrerPolicy="no-referrer-when-downgrade"
+              title="Meir Food Machines Location Map"
+            />
+          </div>
+          
+          <div className="mt-8 text-center">
+            <p className="text-gray-600 dark:text-gray-300 mb-4">
+              <strong>Meir Food Machines</strong><br />
+              Tel Aviv, Israel
+            </p>
+            <p className="text-sm text-gray-500 dark:text-gray-400">
+              Business hours: Sunday - Thursday, 9:00 AM - 6:00 PM<br />
+              Friday: 9:00 AM - 1:00 PM<br />
+              Saturday: Closed
+            </p>
+          </div>
+        </div>
+      </div>
+
       {/* Footer */}
       <div id="footer" data-section="footer" className="mx-auto px-4 md:px-6">
         <FooterSimple
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 487b842..29c8438 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -15,44 +15,40 @@ import { Heart, Zap, Package } from "lucide-react";
 
 export default function HomePage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "About Us", id: "about" },
-    { name: "Products", id: "products" },
-    { name: "Services", id: "services" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "About Us", id: "/about" },
+    { name: "Products", id: "/products" },
+    { name: "Services", id: "/services" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [
     {
-      title: "Company",
-      items: [
-        { label: "About Us", href: "/" },
-        { label: "Our Services", href: "/" },
-        { label: "Products", href: "/" },
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Our Services", href: "/services" },
+        { label: "Products", href: "/products" },
         { label: "Contact", href: "/contact" },
       ],
     },
     {
-      title: "Services",
-      items: [
-        { label: "Vending Machine Sales", href: "#" },
-        { label: "Rental Options", href: "#" },
-        { label: "Maintenance Plans", href: "#" },
-        { label: "Technical Support", href: "#" },
+      title: "Services",      items: [
+        { label: "Vending Machine Sales", href: "/products" },
+        { label: "Rental Options", href: "/services" },
+        { label: "Maintenance Plans", href: "/services" },
+        { label: "Technical Support", href: "/contact" },
       ],
     },
     {
-      title: "Connect",
-      items: [
-        { label: "WhatsApp", href: "https://wa.me/+972-example" },
+      title: "Connect",      items: [
+        { label: "WhatsApp", href: "https://wa.me/972123456789" },
         { label: "Email Us", href: "mailto:info@meirfoodmachines.co.il" },
         { label: "Call Us", href: "tel:+972-123-456789" },
         { label: "Request Quote", href: "/contact" },
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Cookie Policy", href: "#" },
@@ -80,9 +76,7 @@ export default function HomePage() {
           brandName="Meir Food Machines"
           navItems={navItems}
           button={{
-            text: "Get a Quote",
-            href: "/contact",
-          }}
+            text: "Get a Quote",            href: "/contact"}}
         />
       </div>
 
@@ -94,13 +88,9 @@ export default function HomePage() {
           background={{ variant: "blurBottom" }}
           buttons={[
             {
-              text: "Get a Quote",
-              href: "/contact",
-            },
+              text: "Get a Quote",              href: "/contact"},
             {
-              text: "Explore Products",
-              href: "#products",
-            },
+              text: "Explore Products",              href: "/products"},
           ]}
           buttonAnimation="slide-up"
           layoutOrder="default"
@@ -134,25 +124,13 @@ export default function HomePage() {
           features={[
             {
               id: 1,
-              title: "Professional Installation",
-              description: "Expert setup and configuration of vending machines at your location. We handle everything from site assessment to final testing.",
-              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=1",
-              imageAlt: "Professional installation service",
-            },
+              title: "Professional Installation",              description: "Expert setup and configuration of vending machines at your location. We handle everything from site assessment to final testing.",              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=1",              imageAlt: "Professional installation service"},
             {
               id: 2,
-              title: "Maintenance & Repairs",
-              description: "Regular preventative maintenance and emergency repair services to minimize downtime. Our technicians are available for quick response.",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-working-steel-fatory-equipment-steel-production_1303-22926.jpg?_wi=1",
-              imageAlt: "Maintenance and repair service",
-            },
+              title: "Maintenance & Repairs",              description: "Regular preventative maintenance and emergency repair services to minimize downtime. Our technicians are available for quick response.",              imageSrc: "http://img.b2bpic.net/free-photo/man-working-steel-fatory-equipment-steel-production_1303-22926.jpg?_wi=1",              imageAlt: "Maintenance and repair service"},
             {
               id: 3,
-              title: "Custom Solutions",
-              description: "Tailored vending solutions for unique business environments. We work with you to find the perfect machine for your specific needs.",
-              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=2",
-              imageAlt: "Custom vending solution",
-            },
+              title: "Custom Solutions",              description: "Tailored vending solutions for unique business environments. We work with you to find the perfect machine for your specific needs.",              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=2",              imageAlt: "Custom vending solution"},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
@@ -168,29 +146,11 @@ export default function HomePage() {
           tagIcon={Package}
           products={[
             {
-              id: "snack-pro",
-              name: "Snack Machine Pro",
-              price: "Starting at ₪2,500",
-              variant: "Compact to Large",
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-market_23-2149148482.jpg?_wi=1",
-              imageAlt: "Professional snack vending machine",
-            },
+              id: "snack-pro",              name: "Snack Machine Pro",              price: "Starting at ₪2,500",              variant: "Compact to Large",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-market_23-2149148482.jpg?_wi=1",              imageAlt: "Professional snack vending machine"},
             {
-              id: "drink-deluxe",
-              name: "Drink Machine Deluxe",
-              price: "Starting at ₪3,200",
-              variant: "Cold & Ambient",
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-business-woman-with-phone_23-2148815604.jpg?_wi=1",
-              imageAlt: "Premium drink vending machine",
-            },
+              id: "drink-deluxe",              name: "Drink Machine Deluxe",              price: "Starting at ₪3,200",              variant: "Cold & Ambient",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-business-woman-with-phone_23-2148815604.jpg?_wi=1",              imageAlt: "Premium drink vending machine"},
             {
-              id: "coffee-smart",
-              name: "Smart Coffee Machine",
-              price: "Starting at ₪4,500",
-              variant: "Espresso & Cappuccino",
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-loads-cups-coffee-machine_23-2148523033.jpg?_wi=1",
-              imageAlt: "Advanced smart coffee vending machine",
-            },
+              id: "coffee-smart",              name: "Smart Coffee Machine",              price: "Starting at ₪4,500",              variant: "Espresso & Cappuccino",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-loads-cups-coffee-machine_23-2148523033.jpg?_wi=1",              imageAlt: "Advanced smart coffee vending machine"},
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
@@ -198,9 +158,7 @@ export default function HomePage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Request Information",
-              href: "/contact",
-            },
+              text: "Request Information",              href: "/contact"},
           ]}
         />
       </div>
@@ -209,25 +167,9 @@ export default function HomePage() {
       <div id="social-proof" data-section="social-proof" className="mx-auto px-4 md:px-6">
         <SocialProofOne
           names={[
-            "Coca-Cola",
-            "Pepsi",
-            "Nestlé",
-            "Mondelēz",
-            "Mars Inc.",
-            "Keurig",
-            "Starbucks",
-            "Frito-Lay",
-          ]}
+            "Coca-Cola",            "Pepsi",            "Nestlé",            "Mondelēz",            "Mars Inc.",            "Keurig",            "Starbucks",            "Frito-Lay"]}
           logos={[
-            "http://img.b2bpic.net/free-vector/set-vintage-beer-badges_23-2147567687.jpg",
-            "http://img.b2bpic.net/free-vector/flat-oktoberfest-badges-collection_23-2149026787.jpg",
-            "http://img.b2bpic.net/free-vector/flat-design-food-allergy-label-set_23-2149483010.jpg",
-            "http://img.b2bpic.net/free-vector/hand-drawn-retro-branding-labels-collection_23-2149976581.jpg",
-            "http://img.b2bpic.net/free-vector/gaming-logo-template_23-2149588412.jpg",
-            "http://img.b2bpic.net/free-vector/flat-design-cafe-signage-design_23-2149291775.jpg",
-            "http://img.b2bpic.net/free-vector/st-patrick-s-day-lucky-sticker-template_742173-32242.jpg",
-            "http://img.b2bpic.net/free-vector/lettering-food-card-set_23-2148045440.jpg",
-          ]}
+            "http://img.b2bpic.net/free-vector/set-vintage-beer-badges_23-2147567687.jpg",            "http://img.b2bpic.net/free-vector/flat-oktoberfest-badges-collection_23-2149026787.jpg",            "http://img.b2bpic.net/free-vector/flat-design-food-allergy-label-set_23-2149483010.jpg",            "http://img.b2bpic.net/free-vector/hand-drawn-retro-branding-labels-collection_23-2149976581.jpg",            "http://img.b2bpic.net/free-vector/gaming-logo-template_23-2149588412.jpg",            "http://img.b2bpic.net/free-vector/flat-design-cafe-signage-design_23-2149291775.jpg",            "http://img.b2bpic.net/free-vector/st-patrick-s-day-lucky-sticker-template_742173-32242.jpg",            "http://img.b2bpic.net/free-vector/lettering-food-card-set_23-2148045440.jpg"]}
           title="Trusted by Leading Brands"
           description="Our vending machines carry products from the world's most recognized food and beverage companies."
           textboxLayout="default"
@@ -244,45 +186,13 @@ export default function HomePage() {
           tag="Customer Reviews"
           testimonials={[
             {
-              id: "1",
-              name: "David Cohen",
-              title: "Exceptional Service",
-              date: "March 2024",
-              quote: "Meir Food Machines provided outstanding service from installation to ongoing maintenance. Their team is responsive and professional. Highly recommended!",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-waitress_107420-12307.jpg",
-              avatarAlt: "David Cohen",
-            },
+              id: "1",              name: "David Cohen",              title: "Exceptional Service",              date: "March 2024",              quote: "Meir Food Machines provided outstanding service from installation to ongoing maintenance. Their team is responsive and professional. Highly recommended!",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-waitress_107420-12307.jpg",              avatarAlt: "David Cohen"},
             {
-              id: "2",
-              name: "Sarah Mizrahi",
-              title: "Perfect for Our Campus",
-              date: "February 2024",
-              quote: "The vending machines have become an essential part of our school. The company's support team is always ready to help with any issues.",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/confident-entrepreneur-satisfied-with-own-success_1163-5474.jpg",
-              avatarAlt: "Sarah Mizrahi",
-            },
+              id: "2",              name: "Sarah Mizrahi",              title: "Perfect for Our Campus",              date: "February 2024",              quote: "The vending machines have become an essential part of our school. The company's support team is always ready to help with any issues.",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/confident-entrepreneur-satisfied-with-own-success_1163-5474.jpg",              avatarAlt: "Sarah Mizrahi"},
             {
-              id: "3",
-              name: "Ronen Levy",
-              title: "Reliable and Easy to Work With",
-              date: "January 2024",
-              quote: "Meir Food Machines has been fantastic to work with. Their machines are reliable and their customer service is top-notch.",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1674.jpg",
-              avatarAlt: "Ronen Levy",
-            },
+              id: "3",              name: "Ronen Levy",              title: "Reliable and Easy to Work With",              date: "January 2024",              quote: "Meir Food Machines has been fantastic to work with. Their machines are reliable and their customer service is top-notch.",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1674.jpg",              avatarAlt: "Ronen Levy"},
             {
-              id: "4",
-              name: "Noa Segal",
-              title: "Transformed Our Break Room",
-              date: "December 2023",
-              quote: "The coffee machine has been a game-changer for our office. Employees love it and the company's support is always there when needed.",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/man-corrects-belt-fees-groom-man-s-hands-dressing-man-buttons-pants-jeans_8353-5893.jpg",
-              avatarAlt: "Noa Segal",
-            },
+              id: "4",              name: "Noa Segal",              title: "Transformed Our Break Room",              date: "December 2023",              quote: "The coffee machine has been a game-changer for our office. Employees love it and the company's support is always there when needed.",              tag: "Verified Customer",              avatarSrc: "http://img.b2bpic.net/free-photo/man-corrects-belt-fees-groom-man-s-hands-dressing-man-buttons-pants-jeans_8353-5893.jpg",              avatarAlt: "Noa Segal"},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
@@ -297,35 +207,17 @@ export default function HomePage() {
           tag="Need Help?"
           faqs={[
             {
-              id: "1",
-              title: "What is the cost of renting a vending machine?",
-              content: "Rental prices vary based on machine type and location. Snack machines start at ₪150/month, drink machines at ₪200/month, and coffee machines at ₪300/month. We offer flexible terms and can create custom packages for larger orders.",
-            },
+              id: "1",              title: "What is the cost of renting a vending machine?",              content: "Rental prices vary based on machine type and location. Snack machines start at ₪150/month, drink machines at ₪200/month, and coffee machines at ₪300/month. We offer flexible terms and can create custom packages for larger orders."},
             {
-              id: "2",
-              title: "How long does installation take?",
-              content: "Standard installation typically takes 1-2 hours depending on your location and machine setup. We'll coordinate with you to find the most convenient time and ensure your machine is operational the same day.",
-            },
+              id: "2",              title: "How long does installation take?",              content: "Standard installation typically takes 1-2 hours depending on your location and machine setup. We'll coordinate with you to find the most convenient time and ensure your machine is operational the same day."},
             {
-              id: "3",
-              title: "What maintenance services do you provide?",
-              content: "We offer comprehensive maintenance including regular cleaning, part replacement, software updates, and emergency repairs. Our standard service plan includes monthly preventative maintenance to ensure maximum uptime.",
-            },
+              id: "3",              title: "What maintenance services do you provide?",              content: "We offer comprehensive maintenance including regular cleaning, part replacement, software updates, and emergency repairs. Our standard service plan includes monthly preventative maintenance to ensure maximum uptime."},
             {
-              id: "4",
-              title: "Do you offer support for machine troubleshooting?",
-              content: "Yes! Our dedicated support team is available during business hours and handles most issues remotely or with on-site visits within 24 hours for urgent matters. We also provide comprehensive training for your staff.",
-            },
+              id: "4",              title: "Do you offer support for machine troubleshooting?",              content: "Yes! Our dedicated support team is available during business hours and handles most issues remotely or with on-site visits within 24 hours for urgent matters. We also provide comprehensive training for your staff."},
             {
-              id: "5",
-              title: "Can I purchase machines instead of renting?",
-              content: "Absolutely. We offer flexible purchase options with various financing plans. Our sales team can discuss the best option based on your business needs and budget.",
-            },
+              id: "5",              title: "Can I purchase machines instead of renting?",              content: "Absolutely. We offer flexible purchase options with various financing plans. Our sales team can discuss the best option based on your business needs and budget."},
             {
-              id: "6",
-              title: "What areas do you service?",
-              content: "We provide full service throughout Israel including Tel Aviv, Jerusalem, Haifa, and surrounding regions. Contact us for availability in your specific area.",
-            },
+              id: "6",              title: "What areas do you service?",              content: "We provide full service throughout Israel including Tel Aviv, Jerusalem, Haifa, and surrounding regions. Contact us for availability in your specific area."},
           ]}
           faqsAnimation="slide-up"
           textboxLayout="default"
diff --git a/src/app/products/page.tsx b/src/app/products/page.tsx
index 45657c1..4f36964 100644
--- a/src/app/products/page.tsx
+++ b/src/app/products/page.tsx
@@ -2,54 +2,47 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import HeroLogoBillboardSplit from "@/components/sections/hero/HeroLogoBillboardSplit";
 import ProductCardFour from "@/components/sections/product/ProductCardFour";
-import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
-import TestimonialCardFive from "@/components/sections/testimonial/TestimonialCardFive";
+import FeatureCardSix from "@/components/sections/feature/FeatureCardSix";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import Link from "next/link";
-import { Package } from "lucide-react";
+import { Package, Zap } from "lucide-react";
 
 export default function ProductsPage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "About Us", id: "about" },
-    { name: "Products", id: "products" },
-    { name: "Services", id: "services" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "About Us", id: "/about" },
+    { name: "Products", id: "/products" },
+    { name: "Services", id: "/services" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [
     {
-      title: "Company",
-      items: [
-        { label: "About Us", href: "/" },
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
         { label: "Our Services", href: "/services" },
         { label: "Products", href: "/products" },
-        { label: "Contact", href: "/" },
+        { label: "Contact", href: "/contact" },
       ],
     },
     {
-      title: "Services",
-      items: [
-        { label: "Vending Machine Sales", href: "#" },
-        { label: "Rental Options", href: "#" },
-        { label: "Maintenance Plans", href: "#" },
-        { label: "Technical Support", href: "#" },
+      title: "Services",      items: [
+        { label: "Vending Machine Sales", href: "/products" },
+        { label: "Rental Options", href: "/services" },
+        { label: "Maintenance Plans", href: "/services" },
+        { label: "Technical Support", href: "/contact" },
       ],
     },
     {
-      title: "Connect",
-      items: [
-        { label: "WhatsApp", href: "https://wa.me/+972-example" },
+      title: "Connect",      items: [
+        { label: "WhatsApp", href: "https://wa.me/972123456789" },
         { label: "Email Us", href: "mailto:info@meirfoodmachines.co.il" },
         { label: "Call Us", href: "tel:+972-123-456789" },
-        { label: "Request Quote", href: "#" },
+        { label: "Request Quote", href: "/contact" },
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Cookie Policy", href: "#" },
@@ -71,36 +64,18 @@ export default function ProductsPage() {
       secondaryButtonStyle="radial-glow"
       headingFontWeight="medium"
     >
-      <div id="nav" data-section="nav">
+      {/* Navbar */}
+      <div id="nav" data-section="nav" className="mx-auto px-4 md:px-6">
         <NavbarLayoutFloatingOverlay
           brandName="Meir Food Machines"
           navItems={navItems}
           button={{
-            text: "Get a Quote",
-            href: "/",
-          }}
+            text: "Get a Quote",            href: "/contact"}}
         />
       </div>
 
-      <div id="hero-products" data-section="hero-products">
-        <HeroLogoBillboardSplit
-          logoText="Our Vending Machines"
-          description="Premium vending solutions designed for reliability, ease of use, and exceptional performance. Find the perfect machine for your business needs."
-          background={{ variant: "plain" }}
-          buttons={[
-            { text: "View All Products", href: "#products" },
-            { text: "Contact Sales", href: "/" },
-          ]}
-          buttonAnimation="slide-up"
-          layoutOrder="default"
-          imageSrc="http://img.b2bpic.net/free-photo/medium-shot-woman-market_23-2149148482.jpg?_wi=2"
-          imageAlt="Professional snack vending machine"
-          mediaAnimation="slide-up"
-          frameStyle="card"
-        />
-      </div>
-
-      <div id="products" data-section="products">
+      {/* Products Section */}
+      <div id="products" data-section="products" className="mx-auto px-4 md:px-6">
         <ProductCardFour
           title="Our Vending Machines"
           description="Premium vending machines designed for reliability and ease of use. Choose the perfect solution for your business."
@@ -108,123 +83,48 @@ export default function ProductsPage() {
           tagIcon={Package}
           products={[
             {
-              id: "snack-pro",
-              name: "Snack Machine Pro",
-              price: "Starting at ₪2,500",
-              variant: "Compact to Large",
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-market_23-2149148482.jpg?_wi=3",
-              imageAlt: "Professional snack vending machine",
-            },
+              id: "snack-pro",              name: "Snack Machine Pro",              price: "Starting at ₪2,500",              variant: "Compact to Large",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-market_23-2149148482.jpg?_wi=1",              imageAlt: "Professional snack vending machine"},
             {
-              id: "drink-deluxe",
-              name: "Drink Machine Deluxe",
-              price: "Starting at ₪3,200",
-              variant: "Cold & Ambient",
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-business-woman-with-phone_23-2148815604.jpg?_wi=2",
-              imageAlt: "Premium drink vending machine",
-            },
+              id: "drink-deluxe",              name: "Drink Machine Deluxe",              price: "Starting at ₪3,200",              variant: "Cold & Ambient",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-business-woman-with-phone_23-2148815604.jpg?_wi=1",              imageAlt: "Premium drink vending machine"},
             {
-              id: "coffee-smart",
-              name: "Smart Coffee Machine",
-              price: "Starting at ₪4,500",
-              variant: "Espresso & Cappuccino",
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-loads-cups-coffee-machine_23-2148523033.jpg?_wi=2",
-              imageAlt: "Advanced smart coffee vending machine",
-            },
+              id: "coffee-smart",              name: "Smart Coffee Machine",              price: "Starting at ₪4,500",              variant: "Espresso & Cappuccino",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-loads-cups-coffee-machine_23-2148523033.jpg?_wi=1",              imageAlt: "Advanced smart coffee vending machine"},
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
           buttons={[
-            { text: "Request Information", href: "/" },
+            {
+              text: "Request Information",              href: "/contact"},
           ]}
         />
       </div>
 
-      <div id="social-proof-products" data-section="social-proof-products">
-        <SocialProofOne
-          names={[
-            "Coca-Cola",
-            "Pepsi",
-            "Nestlé",
-            "Mondelēz",
-            "Mars Inc.",
-            "Keurig",
-            "Starbucks",
-            "Frito-Lay",
-          ]}
-          logos={[
-            "http://img.b2bpic.net/free-vector/set-vintage-beer-badges_23-2147567687.jpg",
-            "http://img.b2bpic.net/free-vector/flat-oktoberfest-badges-collection_23-2149026787.jpg",
-            "http://img.b2bpic.net/free-vector/flat-design-food-allergy-label-set_23-2149483010.jpg",
-            "http://img.b2bpic.net/free-vector/hand-drawn-retro-branding-labels-collection_23-2149976581.jpg",
-            "http://img.b2bpic.net/free-vector/gaming-logo-template_23-2149588412.jpg",
-            "http://img.b2bpic.net/free-vector/flat-design-cafe-signage-design_23-2149291775.jpg",
-            "http://img.b2bpic.net/free-vector/st-patrick-s-day-lucky-sticker-template_742173-32242.jpg",
-            "http://img.b2bpic.net/free-vector/lettering-food-card-set_23-2148045440.jpg",
-          ]}
-          title="Trusted by Leading Brands"
-          description="Our vending machines carry products from the world's most recognized food and beverage companies."
-          textboxLayout="default"
-          useInvertedBackground={false}
-          showCard={true}
-        />
-      </div>
-
-      <div id="testimonials-products" data-section="testimonials-products">
-        <TestimonialCardFive
-          title="What Our Customers Say"
-          description="Real feedback from businesses that trust Meir Food Machines for their vending needs."
-          tag="Customer Reviews"
-          testimonials={[
+      {/* Why Choose Our Products */}
+      <div id="why-choose" data-section="why-choose" className="mx-auto px-4 md:px-6">
+        <FeatureCardSix
+          title="Why Choose Our Products"
+          description="Our vending machines are built with quality, durability, and user satisfaction in mind. Here's what sets them apart."
+          tag="Product Excellence"
+          tagIcon={Zap}
+          features={[
             {
-              id: "1",
-              name: "David Cohen",
-              date: "March 2024",
-              title: "Exceptional Service",
-              quote: "Meir Food Machines provided outstanding service from installation to ongoing maintenance. Their team is responsive and professional. Highly recommended!",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-waitress_107420-12307.jpg",
-              avatarAlt: "David Cohen",
-            },
+              id: 1,
+              title: "Energy Efficient",              description: "Designed with advanced cooling and electrical systems to reduce operating costs while maintaining optimal performance.",              imageSrc: "http://img.b2bpic.net/free-photo/solar-panel-installation-residential-roof_1163-5345.jpg?_wi=1",              imageAlt: "Energy efficient technology"},
             {
-              id: "2",
-              name: "Sarah Mizrahi",
-              date: "February 2024",
-              title: "Perfect for Our Campus",
-              quote: "The vending machines have become an essential part of our school. The company's support team is always ready to help with any issues.",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/confident-entrepreneur-satisfied-with-own-success_1163-5474.jpg",
-              avatarAlt: "Sarah Mizrahi",
-            },
+              id: 2,
+              title: "User-Friendly Interface",              description: "Intuitive touchscreen displays and easy payment options make purchasing quick and convenient for your customers.",              imageSrc: "http://img.b2bpic.net/free-photo/hand-holding-smartphone-with-payment-app_23-2148924019.jpg?_wi=1",              imageAlt: "Digital payment interface"},
             {
-              id: "3",
-              name: "Ronen Levy",
-              date: "January 2024",
-              title: "Reliable and Easy to Work With",
-              quote: "Meir Food Machines has been fantastic to work with. Their machines are reliable and their customer service is top-notch.",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1674.jpg",
-              avatarAlt: "Ronen Levy",
-            },
-            {
-              id: "4",
-              name: "Noa Segal",
-              date: "December 2023",
-              title: "Transformed Our Break Room",
-              quote: "The coffee machine has been a game-changer for our office. Employees love it and the company's support is always there when needed.",
-              tag: "Verified Customer",
-              avatarSrc: "http://img.b2bpic.net/free-photo/man-corrects-belt-fees-groom-man-s-hands-dressing-man-buttons-pants-jeans_8353-5893.jpg",
-              avatarAlt: "Noa Segal",
-            },
+              id: 3,
+              title: "Remote Monitoring",              description: "Track inventory, sales, and machine status remotely. Get real-time alerts and optimize your operations from anywhere.",              imageSrc: "http://img.b2bpic.net/free-photo/business-people-looking-at-data-visualization_1163-1521.jpg?_wi=1",              imageAlt: "Remote monitoring dashboard"},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
         />
       </div>
 
-      <div id="footer" data-section="footer">
+      {/* Footer */}
+      <div id="footer" data-section="footer" className="mx-auto px-4 md:px-6">
         <FooterSimple
           columns={footerColumns}
           bottomLeftText="© 2024 Meir Food Machines. All rights reserved."
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index d743fa1..c5ed335 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -2,54 +2,47 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import HeroLogoBillboardSplit from "@/components/sections/hero/HeroLogoBillboardSplit";
 import FeatureCardSix from "@/components/sections/feature/FeatureCardSix";
 import FaqBase from "@/components/sections/faq/FaqBase";
-import ContactFaq from "@/components/sections/contact/ContactFaq";
 import FooterSimple from "@/components/sections/footer/FooterSimple";
-import Link from "next/link";
-import { Zap, MessageCircle } from "lucide-react";
+import { Zap, HelpCircle } from "lucide-react";
 
 export default function ServicesPage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "About Us", id: "about" },
-    { name: "Products", id: "products" },
-    { name: "Services", id: "services" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "About Us", id: "/about" },
+    { name: "Products", id: "/products" },
+    { name: "Services", id: "/services" },
+    { name: "Contact", id: "/contact" },
   ];
 
   const footerColumns = [
     {
-      title: "Company",
-      items: [
-        { label: "About Us", href: "/" },
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
         { label: "Our Services", href: "/services" },
         { label: "Products", href: "/products" },
-        { label: "Contact", href: "/" },
+        { label: "Contact", href: "/contact" },
       ],
     },
     {
-      title: "Services",
-      items: [
-        { label: "Vending Machine Sales", href: "#" },
-        { label: "Rental Options", href: "#" },
-        { label: "Maintenance Plans", href: "#" },
-        { label: "Technical Support", href: "#" },
+      title: "Services",      items: [
+        { label: "Vending Machine Sales", href: "/products" },
+        { label: "Rental Options", href: "/services" },
+        { label: "Maintenance Plans", href: "/services" },
+        { label: "Technical Support", href: "/contact" },
       ],
     },
     {
-      title: "Connect",
-      items: [
-        { label: "WhatsApp", href: "https://wa.me/+972-example" },
+      title: "Connect",      items: [
+        { label: "WhatsApp", href: "https://wa.me/972123456789" },
         { label: "Email Us", href: "mailto:info@meirfoodmachines.co.il" },
         { label: "Call Us", href: "tel:+972-123-456789" },
-        { label: "Request Quote", href: "/" },
+        { label: "Request Quote", href: "/contact" },
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Cookie Policy", href: "#" },
@@ -71,36 +64,18 @@ export default function ServicesPage() {
       secondaryButtonStyle="radial-glow"
       headingFontWeight="medium"
     >
-      <div id="nav" data-section="nav">
+      {/* Navbar */}
+      <div id="nav" data-section="nav" className="mx-auto px-4 md:px-6">
         <NavbarLayoutFloatingOverlay
           brandName="Meir Food Machines"
           navItems={navItems}
           button={{
-            text: "Get a Quote",
-            href: "/",
-          }}
+            text: "Get a Quote",            href: "/contact"}}
         />
       </div>
 
-      <div id="hero-services" data-section="hero-services">
-        <HeroLogoBillboardSplit
-          logoText="Our Services"
-          description="Complete vending machine solutions from installation to ongoing support. We provide comprehensive services to keep your machines running perfectly and maximize your business success."
-          background={{ variant: "plain" }}
-          buttons={[
-            { text: "Explore Services", href: "#services-detail" },
-            { text: "Get in Touch", href: "/" },
-          ]}
-          buttonAnimation="slide-up"
-          layoutOrder="default"
-          imageSrc="http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg"
-          imageAlt="Professional technician installing vending machine"
-          mediaAnimation="slide-up"
-          frameStyle="card"
-        />
-      </div>
-
-      <div id="services-detail" data-section="services-detail">
+      {/* Services Section */}
+      <div id="services" data-section="services" className="mx-auto px-4 md:px-6">
         <FeatureCardSix
           title="Our Services"
           description="We offer complete vending machine solutions to meet your business needs. From installation to ongoing maintenance, we're with you every step of the way."
@@ -109,67 +84,39 @@ export default function ServicesPage() {
           features={[
             {
               id: 1,
-              title: "Professional Installation",
-              description: "Expert setup and configuration of vending machines at your location. We handle everything from site assessment to final testing.",
-              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg",
-              imageAlt: "Professional installation service",
-            },
+              title: "Professional Installation",              description: "Expert setup and configuration of vending machines at your location. We handle everything from site assessment to final testing.",              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=1",              imageAlt: "Professional installation service"},
             {
               id: 2,
-              title: "Maintenance & Repairs",
-              description: "Regular preventative maintenance and emergency repair services to minimize downtime. Our technicians are available for quick response.",
-              imageSrc: "http://img.b2bpic.net/free-photo/man-working-steel-fatory-equipment-steel-production_1303-22926.jpg",
-              imageAlt: "Maintenance and repair service",
-            },
+              title: "Maintenance & Repairs",              description: "Regular preventative maintenance and emergency repair services to minimize downtime. Our technicians are available for quick response.",              imageSrc: "http://img.b2bpic.net/free-photo/man-working-steel-fatory-equipment-steel-production_1303-22926.jpg?_wi=1",              imageAlt: "Maintenance and repair service"},
             {
               id: 3,
-              title: "Custom Solutions",
-              description: "Tailored vending solutions for unique business environments. We work with you to find the perfect machine for your specific needs.",
-              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg",
-              imageAlt: "Custom vending solution",
-            },
+              title: "Custom Solutions",              description: "Tailored vending solutions for unique business environments. We work with you to find the perfect machine for your specific needs.",              imageSrc: "http://img.b2bpic.net/free-photo/car-mechanic-choosing-color-car_1303-28140.jpg?_wi=2",              imageAlt: "Custom vending solution"},
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
         />
       </div>
 
-      <div id="faq-services" data-section="faq-services">
+      {/* FAQ Section */}
+      <div id="faq" data-section="faq" className="mx-auto px-4 md:px-6">
         <FaqBase
-          title="Service FAQs"
-          description="Common questions about our installation and maintenance services."
-          tag="Questions?"
+          title="Service FAQ"
+          description="Common questions about our services, support, and maintenance plans."
+          tag="Service Details"
+          tagIcon={HelpCircle}
           faqs={[
             {
-              id: "1",
-              title: "What is included in the installation service?",
-              content: "Our installation service includes site assessment, machine delivery and setup, electrical connection, initial stocking, staff training, and full testing to ensure everything is operational.",
-            },
+              id: "1",              title: "What is the cost of renting a vending machine?",              content: "Rental prices vary based on machine type and location. Snack machines start at ₪150/month, drink machines at ₪200/month, and coffee machines at ₪300/month. We offer flexible terms and can create custom packages for larger orders."},
             {
-              id: "2",
-              title: "How often do you provide maintenance?",
-              content: "Standard maintenance is included monthly with our service plans. Emergency support is available within 24 hours. We customize maintenance schedules based on your machine usage and needs.",
-            },
+              id: "2",              title: "How long does installation take?",              content: "Standard installation typically takes 1-2 hours depending on your location and machine setup. We'll coordinate with you to find the most convenient time and ensure your machine is operational the same day."},
             {
-              id: "3",
-              title: "What if a machine breaks down?",
-              content: "Contact our support team immediately. For urgent issues, we typically respond within 24 hours. We carry common replacement parts to get your machine back online quickly.",
-            },
+              id: "3",              title: "What maintenance services do you provide?",              content: "We offer comprehensive maintenance including regular cleaning, part replacement, software updates, and emergency repairs. Our standard service plan includes monthly preventative maintenance to ensure maximum uptime."},
             {
-              id: "4",
-              title: "Do you offer remote troubleshooting?",
-              content: "Yes, many issues can be resolved remotely through our technical support team. If on-site service is needed, we'll schedule it at your earliest convenience.",
-            },
+              id: "4",              title: "Do you offer support for machine troubleshooting?",              content: "Yes! Our dedicated support team is available during business hours and handles most issues remotely or with on-site visits within 24 hours for urgent matters. We also provide comprehensive training for your staff."},
             {
-              id: "5",
-              title: "Can you upgrade existing machines?",
-              content: "Absolutely. We can upgrade software, add payment systems, or swap in newer models. Contact us to discuss your specific upgrade needs.",
-            },
+              id: "5",              title: "Can I purchase machines instead of renting?",              content: "Absolutely. We offer flexible purchase options with various financing plans. Our sales team can discuss the best option based on your business needs and budget."},
             {
-              id: "6",
-              title: "What is your response time for support?",
-              content: "Standard support requests are handled within 48 hours. For critical issues affecting business operations, we provide same-day or next-day on-site support.",
-            },
+              id: "6",              title: "What areas do you service?",              content: "We provide full service throughout Israel including Tel Aviv, Jerusalem, Haifa, and surrounding regions. Contact us for availability in your specific area."},
           ]}
           faqsAnimation="slide-up"
           textboxLayout="default"
@@ -177,43 +124,8 @@ export default function ServicesPage() {
         />
       </div>
 
-      <div id="contact-services" data-section="contact-services">
-        <ContactFaq
-          ctaTitle="Ready to Get Our Services?"
-          ctaDescription="Contact us today for a free consultation and service quote. Our team will customize a solution that perfectly fits your business needs."
-          ctaButton={{
-            text: "Contact Us Now",
-            href: "https://wa.me/+972-example",
-          }}
-          ctaIcon={MessageCircle}
-          useInvertedBackground={false}
-          animationType="slide-up"
-          faqs={[
-            {
-              id: "1",
-              title: "📞 Phone",
-              content: "+972-123-456789",
-            },
-            {
-              id: "2",
-              title: "📧 Email",
-              content: "info@meirfoodmachines.co.il",
-            },
-            {
-              id: "3",
-              title: "💬 WhatsApp",
-              content: "Available for quick support and inquiries",
-            },
-            {
-              id: "4",
-              title: "🕒 Business Hours",
-              content: "Sunday - Thursday: 8:00 AM - 6:00 PM | Friday: 8:00 AM - 2:00 PM | Saturday: Closed",
-            },
-          ]}
-        />
-      </div>
-
-      <div id="footer" data-section="footer">
+      {/* Footer */}
+      <div id="footer" data-section="footer" className="mx-auto px-4 md:px-6">
         <FooterSimple
           columns={footerColumns}
           bottomLeftText="© 2024 Meir Food Machines. All rights reserved."
diff --git a/src/app/styles/variables.css b/src/app/styles/variables.css
index 9d0254f..a40a21c 100644
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -12,13 +12,13 @@
 
   --background: #ffffff;
   --card: #f9f9f9;
-  --foreground: #120a00e6;
+  --foreground: #000000;
   --primary-cta: #FF7B05;
   --primary-cta-text: #ffffff;
-  --secondary-cta: #f9f9f9;
+  --secondary-cta: #0a7039;
   --secondary-cta-text: #120a00e6;
-  --accent: #e2e2e2;
-  --background-accent: #FF7B05;
+  --accent: #FF7B05;
+  --background-accent: #0a7039;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);