diff --git a/src/app/page.tsx b/src/app/page.tsx
index ff457ae..5792daf 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -8,9 +8,10 @@ import ProductCardFour from "@/components/sections/product/ProductCardFour";
 import MediaAbout from "@/components/sections/about/MediaAbout";
 import FeatureCardSixteen from "@/components/sections/feature/FeatureCardSixteen";
 import TestimonialCardTen from "@/components/sections/testimonial/TestimonialCardTen";
+import FaqBase from "@/components/sections/faq/FaqBase";
 import ContactCenter from "@/components/sections/contact/ContactCenter";
 import FooterCard from "@/components/sections/footer/FooterCard";
-import { Sparkles, Award, Shield, Grid, TrendingUp, Mail, Facebook, Instagram, Linkedin, MessageCircle } from "lucide-react";
+import { Sparkles, Award, Shield, Grid, TrendingUp, Mail, HelpCircle, MessageCircle, Facebook, Instagram, Linkedin } from "lucide-react";
 
 export default function HomePage() {
   return (
@@ -20,7 +21,7 @@ export default function HomePage() {
       borderRadius="rounded"
       contentWidth="small"
       sizing="mediumLargeSizeLargeTitles"
-      background="noise"
+      background="circleGradient"
       cardStyle="glass-depth"
       primaryButtonStyle="gradient"
       secondaryButtonStyle="radial-glow"
@@ -31,7 +32,7 @@ export default function HomePage() {
         <NavbarStyleApple
           brandName="LuxeGadgets"
           navItems={[
-            { name: "Shop", id: "products" },
+            { name: "Shop", id: "featured-products" },
             { name: "About", id: "about" },
             { name: "Testimonials", id: "testimonials" },
             { name: "Contact", id: "contact" },
@@ -48,43 +49,25 @@ export default function HomePage() {
           tag="Premium Electronics"
           tagIcon={Sparkles}
           tagAnimation="slide-up"
-          background={{ variant: "noise" }}
+          background={{ variant: "rotated-rays-animated-grid" }}
           buttons={[
-            { text: "Shop Now", href: "/products" },
+            { text: "Shop Now", href: "#featured-products" },
             { text: "Learn More", href: "#about" },
           ]}
           buttonAnimation="slide-up"
           carouselItems={[
             {
-              id: "1",
-              imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-walking-autumn-wearing-jacket_285396-10946.jpg",
-              imageAlt: "Premium Phone Case Black & Gold",
-            },
+              id: "1",              imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-walking-autumn-wearing-jacket_285396-10946.jpg",              imageAlt: "Premium Phone Case Black & Gold"},
             {
-              id: "2",
-              imageSrc: "http://img.b2bpic.net/free-photo/white-cell-phone-box-background_58702-4690.jpg",
-              imageAlt: "Screen Protector Premium Glass",
-            },
+              id: "2",              imageSrc: "http://img.b2bpic.net/free-photo/white-cell-phone-box-background_58702-4690.jpg",              imageAlt: "Screen Protector Premium Glass"},
             {
-              id: "3",
-              imageSrc: "http://img.b2bpic.net/free-photo/full-shot-woman-interacting-with-plasma-ball_23-2150572310.jpg",
-              imageAlt: "Portable Hand Fan LED Display",
-            },
+              id: "3",              imageSrc: "http://img.b2bpic.net/free-photo/full-shot-woman-interacting-with-plasma-ball_23-2150572310.jpg",              imageAlt: "Portable Hand Fan LED Display"},
             {
-              id: "4",
-              imageSrc: "http://img.b2bpic.net/free-photo/christmas-new-year-vibes-home-decorations-charming-young-woman-red-sweater_8353-8527.jpg",
-              imageAlt: "LED Decorative Strip Lighting",
-            },
+              id: "4",              imageSrc: "http://img.b2bpic.net/free-photo/christmas-new-year-vibes-home-decorations-charming-young-woman-red-sweater_8353-8527.jpg",              imageAlt: "LED Decorative Strip Lighting"},
             {
-              id: "5",
-              imageSrc: "http://img.b2bpic.net/free-photo/neon-robot-vacuum-cleaner_23-2151349247.jpg",
-              imageAlt: "Astro LED Robot Gadget",
-            },
+              id: "5",              imageSrc: "http://img.b2bpic.net/free-photo/neon-robot-vacuum-cleaner_23-2151349247.jpg",              imageAlt: "Astro LED Robot Gadget"},
             {
-              id: "6",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-photography-accesories-tablet_23-2148363446.jpg",
-              imageAlt: "Electronic Accessories Collection",
-            },
+              id: "6",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-photography-accesories-tablet_23-2148363446.jpg",              imageAlt: "Electronic Accessories Collection"},
           ]}
           autoPlay={true}
           autoPlayInterval={4000}
@@ -99,7 +82,7 @@ export default function HomePage() {
           tag="Bestsellers"
           tagIcon={Award}
           tagAnimation="slide-up"
-          buttons={[{ text: "View All Products", href: "/products" }]}
+          buttons={[{ text: "View All Products", href: "#" }]}
           buttonAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={true}
@@ -107,58 +90,22 @@ export default function HomePage() {
           gridVariant="three-columns-all-equal-width"
           products={[
             {
-              id: "1",
-              name: "Premium Leather Phone Case",
-              price: "1,299 MZN",
-              variant: "Black  Multiple Sizes",
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-using-smartphone-with-pop-socket-outdoors_23-2150168484.jpg?_wi=1",
-              imageAlt: "Black leather phone case",
-              isFavorited: false,
+              id: "1",              name: "Premium Leather Phone Case",              price: "1,299 MZN",              variant: "Black  Multiple Sizes",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-using-smartphone-with-pop-socket-outdoors_23-2150168484.jpg",              imageAlt: "Black leather phone case",              isFavorited: false,
             },
             {
-              id: "2",
-              name: "Tempered Glass Screen Protector",
-              price: "599 MZN",
-              variant: "Clear  9H Hardness",
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-perforated-fabric_23-2149894546.jpg?_wi=1",
-              imageAlt: "Tempered glass screen protector",
-              isFavorited: false,
+              id: "2",              name: "Tempered Glass Screen Protector",              price: "599 MZN",              variant: "Clear  9H Hardness",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-perforated-fabric_23-2149894546.jpg",              imageAlt: "Tempered glass screen protector",              isFavorited: false,
             },
             {
-              id: "3",
-              name: "Portable LED Hand Fan",
-              price: "899 MZN",
-              variant: "White  USB Rechargeable",
-              imageSrc: "http://img.b2bpic.net/free-photo/drone-charging-station-with-colored-light-green-foliage_23-2152011738.jpg?_wi=1",
-              imageAlt: "Portable LED hand fan",
-              isFavorited: false,
+              id: "3",              name: "Portable LED Hand Fan",              price: "899 MZN",              variant: "White  USB Rechargeable",              imageSrc: "http://img.b2bpic.net/free-photo/drone-charging-station-with-colored-light-green-foliage_23-2152011738.jpg",              imageAlt: "Portable LED hand fan",              isFavorited: false,
             },
             {
-              id: "4",
-              name: "RGB LED Strip Lights",
-              price: "1,499 MZN",
-              variant: "Multicolor  5 Meters",
-              imageSrc: "http://img.b2bpic.net/free-vector/abstract-neon-lights-background_23-2148653388.jpg?_wi=1",
-              imageAlt: "RGB LED strip lights",
-              isFavorited: false,
+              id: "4",              name: "RGB LED Strip Lights",              price: "1,499 MZN",              variant: "Multicolor  5 Meters",              imageSrc: "http://img.b2bpic.net/free-vector/abstract-neon-lights-background_23-2148653388.jpg",              imageAlt: "RGB LED strip lights",              isFavorited: false,
             },
             {
-              id: "5",
-              name: "Astro LED Robot",
-              price: "2,299 MZN",
-              variant: "Black  Smart Control",
-              imageSrc: "http://img.b2bpic.net/free-photo/view-vacuum-cleaner-robot-flat-surface-floor_23-2151736839.jpg?_wi=1",
-              imageAlt: "Astro LED robot gadget",
-              isFavorited: false,
+              id: "5",              name: "Astro LED Robot",              price: "2,299 MZN",              variant: "Black  Smart Control",              imageSrc: "http://img.b2bpic.net/free-photo/view-vacuum-cleaner-robot-flat-surface-floor_23-2151736839.jpg",              imageAlt: "Astro LED robot gadget",              isFavorited: false,
             },
             {
-              id: "6",
-              name: "Wireless Charging Pad",
-              price: "1,199 MZN",
-              variant: "Black  15W Fast Charge",
-              imageSrc: "http://img.b2bpic.net/free-photo/powerbank-cellphone-wooden-table_93675-128978.jpg?_wi=1",
-              imageAlt: "Wireless charging pad",
-              isFavorited: false,
+              id: "6",              name: "Wireless Charging Pad",              price: "1,199 MZN",              variant: "Black  15W Fast Charge",              imageSrc: "http://img.b2bpic.net/free-photo/powerbank-cellphone-wooden-table_93675-128978.jpg",              imageAlt: "Wireless charging pad",              isFavorited: false,
             },
           ]}
         />
@@ -174,7 +121,7 @@ export default function HomePage() {
           tagAnimation="slide-up"
           imageSrc="http://img.b2bpic.net/free-photo/abstract-blur-shopping-mall_74190-4591.jpg"
           imageAlt="LuxeGadgets premium store display"
-          buttons={[{ text: "Shop Now", href: "/products" }]}
+          buttons={[{ text: "Shop Now", href: "#featured-products" }]}
           buttonAnimation="slide-up"
           useInvertedBackground={false}
         />
@@ -193,25 +140,44 @@ export default function HomePage() {
           tagAnimation="slide-up"
           negativeCard={{
             items: [
-              "Generic products",
-              "Unreliable sellers",
-              "Poor quality materials",
-              "Slow delivery",
-            ],
+              "Generic products",              "Unreliable sellers",              "Poor quality materials",              "Slow delivery"],
           }}
           positiveCard={{
             items: [
-              "Premium phone cases & protective gear",
-              "Screen protectors & glass shields",
-              "Portable LED hand fans & coolers",
-              "Decorative LED strip lighting",
-              "Smart LED robots & gadgets",
-              "Modern electronic accessories",
-            ],
+              "Premium phone cases & protective gear",              "Screen protectors & glass shields",              "Portable LED hand fans & coolers",              "Decorative LED strip lighting",              "Smart LED robots & gadgets",              "Modern electronic accessories"],
           }}
         />
       </div>
 
+      {/* Best Sellers */}
+      <div id="best-sellers" data-section="best-sellers" className="w-full py-20 px-4 md:px-8">
+        <ProductCardFour
+          title="Best Sellers"
+          description="Our most popular products loved by customers across Mozambique"
+          tag="Top Rated"
+          tagIcon={TrendingUp}
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          animationType="slide-up"
+          gridVariant="four-items-2x2-equal-grid"
+          products={[
+            {
+              id: "bs1",              name: "Diamond Crystal Phone Case",              price: "1,599 MZN",              variant: "Gold  Premium Crystal",              imageSrc: "http://img.b2bpic.net/free-photo/luggage-seen-from-rear-car-window_23-2150934358.jpg",              imageAlt: "Diamond crystal phone case",              isFavorited: false,
+            },
+            {
+              id: "bs2",              name: "Anti-Blue Light Screen Guard",              price: "799 MZN",              variant: "Clear  Eye Protection",              imageSrc: "http://img.b2bpic.net/free-photo/male-make-up-artist-putting-make-up-himself_23-2150166168.jpg",              imageAlt: "Anti-blue light screen protector",              isFavorited: false,
+            },
+            {
+              id: "bs3",              name: "Silent Portable Fan",              price: "1,099 MZN",              variant: "White  Quiet Mode",              imageSrc: "http://img.b2bpic.net/free-photo/girl-tank-top-shorts-playing-tennis-seashore_23-2147870531.jpg",              imageAlt: "Silent portable fan",              isFavorited: false,
+            },
+            {
+              id: "bs4",              name: "Smart RGB LED Controller",              price: "1,799 MZN",              variant: "Black  WiFi Connected",              imageSrc: "http://img.b2bpic.net/free-photo/modern-living-room-interior-with-large-tv-screen-displaying-home-automation-system_9975-33164.jpg",              imageAlt: "Smart RGB LED controller",              isFavorited: false,
+            },
+          ]}
+        />
+      </div>
+
       {/* Testimonials Section */}
       <div id="testimonials" data-section="testimonials" className="w-full py-20 px-4 md:px-8">
         <TestimonialCardTen
@@ -224,59 +190,46 @@ export default function HomePage() {
           useInvertedBackground={true}
           testimonials={[
             {
-              id: "1",
-              title: "Exceeded My Expectations",
-              quote: "The premium phone case I purchased is absolutely stunning! The quality is exceptional and delivery was faster than expected. Highly recommend LuxeGadgets!",
-              name: "Maria Silva",
-              role: "Customer from Maputo",
-              imageSrc: "http://img.b2bpic.net/free-photo/business-woman-banner-concept-with-copy-space_23-2149601533.jpg",
-              imageAlt: "Maria Silva",
-            },
+              id: "1",              title: "Exceeded My Expectations",              quote: "The premium phone case I purchased is absolutely stunning! The quality is exceptional and delivery was faster than expected. Highly recommend LuxeGadgets!",              name: "Maria Silva",              role: "Customer from Maputo",              imageSrc: "http://img.b2bpic.net/free-photo/business-woman-banner-concept-with-copy-space_23-2149601533.jpg",              imageAlt: "Maria Silva"},
             {
-              id: "2",
-              title: "Best Place to Shop Gadgets",
-              quote: "I've purchased multiple items including the LED robot and they're all amazing quality. The eMola payment system is seamless and customer service is responsive.",
-              name: "João Neves",
-              role: "Customer from Gaza",
-              imageSrc: "http://img.b2bpic.net/free-photo/handsome-bearded-african-american-businessman-brown-classic-jacket-isolated-dark-background_613910-6551.jpg",
-              imageAlt: "João Neves",
-            },
+              id: "2",              title: "Best Place to Shop Gadgets",              quote: "I've purchased multiple items including the LED robot and they're all amazing quality. The eMola payment system is seamless and customer service is responsive.",              name: "João Neves",              role: "Customer from Gaza",              imageSrc: "http://img.b2bpic.net/free-photo/handsome-bearded-african-american-businessman-brown-classic-jacket-isolated-dark-background_613910-6551.jpg",              imageAlt: "João Neves"},
             {
-              id: "3",
-              title: "Premium Quality Products",
-              quote: "The screen protector is crystal clear and the protective case fits perfectly. Best accessory purchase I've made. LuxeGadgets is my go-to store!",
-              name: "Ana Costa",
-              role: "Customer from Beira",
-              imageSrc: "http://img.b2bpic.net/free-photo/closeup-content-pretty-businesswoman-glasses_1262-1740.jpg",
-              imageAlt: "Ana Costa",
-            },
+              id: "3",              title: "Premium Quality Products",              quote: "The screen protector is crystal clear and the protective case fits perfectly. Best accessory purchase I've made. LuxeGadgets is my go-to store!",              name: "Ana Costa",              role: "Customer from Beira",              imageSrc: "http://img.b2bpic.net/free-photo/closeup-content-pretty-businesswoman-glasses_1262-1740.jpg",              imageAlt: "Ana Costa"},
             {
-              id: "4",
-              title: "Love the LED Gadgets",
-              quote: "The LED hand fan and light strips are fantastic! Great quality, stylish design, and perfect for the Mozambican climate. Will definitely buy again!",
-              name: "Carlos Fernandes",
-              role: "Customer from Inhambane",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-man-wearing-blue-outfit-doing-money-gesture_1298-476.jpg",
-              imageAlt: "Carlos Fernandes",
-            },
+              id: "4",              title: "Love the LED Gadgets",              quote: "The LED hand fan and light strips are fantastic! Great quality, stylish design, and perfect for the Mozambican climate. Will definitely buy again!",              name: "Carlos Fernandes",              role: "Customer from Inhambane",              imageSrc: "http://img.b2bpic.net/free-photo/young-man-wearing-blue-outfit-doing-money-gesture_1298-476.jpg",              imageAlt: "Carlos Fernandes"},
             {
-              id: "5",
-              title: "Secure Payments Made Easy",
-              quote: "Using M-Pesa to pay was so convenient. Fast processing, reliable service, and my order arrived in perfect condition. LuxeGadgets is trustworthy!",
-              name: "Fatima Mahmud",
-              role: "Customer from Inhambane",
-              imageSrc: "http://img.b2bpic.net/free-photo/business-woman-posing-street_23-2148213587.jpg",
-              imageAlt: "Fatima Mahmud",
-            },
+              id: "5",              title: "Secure Payments Made Easy",              quote: "Using M-Pesa to pay was so convenient. Fast processing, reliable service, and my order arrived in perfect condition. LuxeGadgets is trustworthy!",              name: "Fatima Mahmud",              role: "Customer from Inhambane",              imageSrc: "http://img.b2bpic.net/free-photo/business-woman-posing-street_23-2148213587.jpg",              imageAlt: "Fatima Mahmud"},
             {
-              id: "6",
-              title: "Professional & Reliable",
-              quote: "Excellent customer support and premium product quality. The entire shopping experience was smooth and professional. Highly satisfied customer here!",
-              name: "Miguel Santos",
-              role: "Customer from Quelimane",
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-businessman-holding-his-hand-out_23-2148308624.jpg",
-              imageAlt: "Miguel Santos",
-            },
+              id: "6",              title: "Professional & Reliable",              quote: "Excellent customer support and premium product quality. The entire shopping experience was smooth and professional. Highly satisfied customer here!",              name: "Miguel Santos",              role: "Customer from Quelimane",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-businessman-holding-his-hand-out_23-2148308624.jpg",              imageAlt: "Miguel Santos"},
+          ]}
+        />
+      </div>
+
+      {/* FAQ Section */}
+      <div id="faq" data-section="faq" className="w-full py-20 px-4 md:px-8">
+        <FaqBase
+          title="Frequently Asked Questions"
+          description="Find answers to common questions about our products, payments, and delivery services"
+          tag="Help & Support"
+          tagIcon={HelpCircle}
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          faqsAnimation="slide-up"
+          animationType="smooth"
+          faqs={[
+            {
+              id: "1",              title: "What payment methods do you accept?",              content: "We accept secure payments via eMola (862396144 - HERMENEGILDO) and M-Pesa (843012909 - Benvinda De Deus). After payment, simply click 'Already Paid', upload your payment proof, provide your delivery details, and we'll process your order immediately."},
+            {
+              id: "2",              title: "How long does delivery take?",              content: "Standard delivery typically takes 3-5 business days within Mozambique. For express delivery, please contact our support team. Delivery times may vary depending on your location and current order volume."},
+            {
+              id: "3",              title: "Are your products authentic and guaranteed?",              content: "Yes! All our products are 100% authentic and sourced from trusted manufacturers. Every item comes with quality assurance. We stand behind our products and offer support if you have any concerns."},
+            {
+              id: "4",              title: "Can I return or exchange a product?",              content: "We offer a 14-day return and exchange policy for unused items in original packaging. Please contact our customer service team to initiate a return. Defective products are replaced immediately at no cost."},
+            {
+              id: "5",              title: "What is your warranty policy?",              content: "Most products come with manufacturer warranty. Screen protectors and phone cases have a 12-month defect warranty. Electronics like fans and LED gadgets have 6-12 month warranties depending on the product."},
+            {
+              id: "6",              title: "How can I track my order?",              content: "After your order is confirmed, you'll receive a tracking number via SMS and email. You can use this number to track your package status in real-time or contact our support team for updates."},
           ]}
         />
       </div>
@@ -305,27 +258,19 @@ export default function HomePage() {
           socialLinks={[
             {
               icon: Facebook,
-              href: "https://facebook.com/luxegadgets",
-              ariaLabel: "Follow us on Facebook",
-            },
+              href: "https://facebook.com/luxegadgets",              ariaLabel: "Follow us on Facebook"},
             {
               icon: Instagram,
-              href: "https://instagram.com/luxegadgets",
-              ariaLabel: "Follow us on Instagram",
-            },
+              href: "https://instagram.com/luxegadgets",              ariaLabel: "Follow us on Instagram"},
             {
               icon: Linkedin,
-              href: "https://linkedin.com/company/luxegadgets",
-              ariaLabel: "Follow us on LinkedIn",
-            },
+              href: "https://linkedin.com/company/luxegadgets",              ariaLabel: "Follow us on LinkedIn"},
             {
               icon: MessageCircle,
-              href: "https://wa.me/258843012909",
-              ariaLabel: "Chat with us on WhatsApp",
-            },
+              href: "https://wa.me/258843012909",              ariaLabel: "Chat with us on WhatsApp"},
           ]}
         />
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}