diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 805930c..e2d6f81 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -2,13 +2,15 @@ import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "./styles/variables.css";
 import "./styles/base.css";
+import { ServiceWrapper } from "@/providers/serviceWrapper/ServiceWrapper";
+import { Tag } from "@/components/tag/Tag";
 
 const inter = Inter({
   variable: "--font-inter",  subsets: ["latin"],
 });
 
 export const metadata: Metadata = {
-  title: "Al Rayah Bakeries - Fresh Bread & Pastries in Sharjah",  description: "Al Rayah Bakeries serves fresh-baked bread, pastries, and cakes to Sharjah. Open 24 hours with affordable prices and fast delivery."};
+  title: "Al Rayah Bakeries | Fresh Bread & Pastries in Sharjah",  description: "Al Rayah Bakeries serves fresh-baked bread, pastries, and cakes in Sharjah. Open 24 hours with affordable prices and fast delivery."};
 
 export default function RootLayout({
   children,
@@ -18,11 +20,32 @@ export default function RootLayout({
   return (
     <html lang="en" suppressHydrationWarning>
       <body className={`${inter.variable}`}>
-        {children}
+        <ServiceWrapper>
+          <Tag />
+          {children}
+        </ServiceWrapper>
         <script
           id="lenis"
-          src="https://cdn.jsdelivr.net/gh/darkroomengineering/lenis@0.2.28/bundled/lenis.js"
-          async
+          dangerouslySetInnerHTML={{
+            __html: `
+              const lenis = new Lenis({
+                duration: 1.2,
+                easing: (t) => Math.min(1, 1.001 - Math.pow(2, -10 * t)),
+                direction: 'vertical',
+                gestureDirection: 'vertical',
+                smooth: true,
+                mouseMultiplier: 1,
+                smoothTouch: false,
+                touchMultiplier: 2,
+                infinite: false,
+              });
+              function raf(time) {
+                lenis.raf(time);
+                requestAnimationFrame(raf);
+              }
+              requestAnimationFrame(raf);
+            `,
+          }}
         />
       
         <script
diff --git a/src/app/page.tsx b/src/app/page.tsx
index f3327e1..768ee8d 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,197 +2,246 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import HeroSplitTestimonial from '@/components/sections/hero/HeroSplitTestimonial';
-import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
-import ProductCardFour from '@/components/sections/product/ProductCardFour';
-import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
-import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
-import { ContactSplit } from '@/components/sections/contact/ContactSplit';
-import FooterSimple from '@/components/sections/footer/FooterSimple';
-import { Star, Zap, Shield, TrendingUp, Users, ArrowRight } from 'lucide-react';
+import HeroSplitTestimonial from "@/components/sections/hero/HeroSplitTestimonial";
+import MetricSplitMediaAbout from "@/components/sections/about/MetricSplitMediaAbout";
+import ProductCardFour from "@/components/sections/product/ProductCardFour";
+import FeatureBorderGlow from "@/components/sections/feature/featureBorderGlow/FeatureBorderGlow";
+import TestimonialCardTwo from "@/components/sections/testimonial/TestimonialCardTwo";
+import ContactSplit from "@/components/sections/contact/ContactSplit";
+import FooterSimple from "@/components/sections/footer/FooterSimple";
+import { Clock, DollarSign, Heart, Sparkles, Truck, Zap } from "lucide-react";
 
-const navItems = [
-  { name: "Home", id: "/" },
-  { name: "About", id: "about" },
-  { name: "Products", id: "products" },
-  { name: "Features", id: "features" },
-  { name: "Testimonials", id: "testimonials" },
-  { name: "Contact", id: "contact" },
-];
-
-const heroTestimonials = [
-  {
-    name: "Sarah Johnson",    handle: "@sarahjohnson",    testimonial: "Amazing products and excellent service!",    rating: 5,
-    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Sarah Johnson"
-  },
-  {
-    name: "Ahmed Hassan",    handle: "@ahmedhassan",    testimonial: "Best experience I've had!",    rating: 5,
-    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Ahmed Hassan"
-  },
-  {
-    name: "Maria Garcia",    handle: "@mariagarcia",    testimonial: "Highly recommended for everyone!",    rating: 5,
-    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Maria Garcia"
-  }
-];
-
-const metrics = [
-  { value: "500", title: "Happy Customers" },
-  { value: "1000+", title: "Orders Delivered" }
-];
-
-const products = [
-  {
-    id: "1",    name: "Premium Bread",    price: "$8.99",    variant: "Fresh Baked",    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Premium Bread",    isFavorited: false
-  },
-  {
-    id: "2",    name: "Croissants",    price: "$5.99",    variant: "Buttery",    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Croissants",    isFavorited: false
-  },
-  {
-    id: "3",    name: "Birthday Cake",    price: "$24.99",    variant: "Custom",    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Birthday Cake",    isFavorited: false
-  },
-  {
-    id: "4",    name: "Donut Box",    price: "$12.99",    variant: "Assorted",    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Donut Box",    isFavorited: false
-  }
-];
-
-const features = [
-  { icon: Zap, title: "Fast Delivery", description: "Get your orders delivered quickly" },
-  { icon: Shield, title: "Quality Assured", description: "Fresh baked products guaranteed" },
-  { icon: TrendingUp, title: "24/7 Available", description: "Always open for your needs" },
-  { icon: Users, title: "Customer Support", description: "Dedicated support team ready" }
-];
-
-const testimonials = [
-  {
-    id: "1",    name: "Fatima Al-Mansouri",    role: "Business Owner",    testimonial: "Al Rayah Bakeries has been our trusted supplier for years. Their quality never disappoints!",    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Fatima Al-Mansouri",    icon: Star
-  },
-  {
-    id: "2",    name: "Mohammed Ahmed",    role: "Restaurant Manager",    testimonial: "Fresh products delivered on time, every single day. Highly professional!",    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Mohammed Ahmed",    icon: Star
-  },
-  {
-    id: "3",    name: "Layla Khalil",    role: "Event Planner",    testimonial: "Their custom cakes are absolutely stunning and delicious. Customers love them!",    imageSrc: "/placeholders/placeholder1.webp",    imageAlt: "Layla Khalil",    icon: Star
-  }
-];
-
-const footerColumns = [
-  {
-    title: "Quick Links",    items: [
-      { label: "Home", href: "/" },
-      { label: "About", href: "#about" },
-      { label: "Contact", href: "#contact" }
-    ]
-  },
-  {
-    title: "Products",    items: [
-      { label: "Bread", href: "#products" },
-      { label: "Pastries", href: "#products" },
-      { label: "Cakes", href: "#products" }
-    ]
-  },
-  {
-    title: "Legal",    items: [
-      { label: "Privacy Policy", href: "/" },
-      { label: "Terms of Service", href: "/" }
-    ]
-  }
-];
-
-export default function Home() {
+export default function LandingPage() {
   return (
     <ThemeProvider
-      defaultButtonVariant="text-stagger"
-      defaultTextAnimation="entrance-slide"
-      borderRadius="rounded"
-      contentWidth="medium"
-      sizing="medium"
-      background="circleGradient"
-      cardStyle="glass-elevated"
-      primaryButtonStyle="gradient"
+      defaultButtonVariant="icon-arrow"
+      defaultTextAnimation="background-highlight"
+      borderRadius="soft"
+      contentWidth="mediumLarge"
+      sizing="largeSmallSizeLargeTitles"
+      background="none"
+      cardStyle="gradient-bordered"
+      primaryButtonStyle="primary-glow"
       secondaryButtonStyle="glass"
-      headingFontWeight="normal"
+      headingFontWeight="semibold"
     >
       <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay navItems={navItems} button={{ text: "Sign Up", href: "contact" }} />
+        <NavbarLayoutFloatingOverlay
+          brandName="Al Rayah"
+          navItems={[
+            { name: "Home", id: "hero" },
+            { name: "About", id: "about" },
+            { name: "Products", id: "products" },
+            { name: "Reviews", id: "testimonials" },
+            { name: "Contact", id: "contact" },
+          ]}
+          button={{ text: "Call Now", href: "tel:0654650200" }}
+          buttonClassName="bg-primary-cta text-primary-cta-text hover:opacity-90"
+        />
       </div>
 
       <div id="hero" data-section="hero">
         <HeroSplitTestimonial
-          title="Al Rayah Bakeries"
-          description="Fresh-baked bread, pastries, and cakes delivered to your door in Sharjah"
+          title="Fresh Bread & Pastries in Sharjah — Open 24 Hours"
+          description="Al Rayah Bakeries serves the finest fresh-baked bread, pastries, and cakes to the Sharjah community. Quality, freshness, and affordable prices every single day."
+          tag="⭐ 4.3 Rating | 270+ Reviews"
+          tagAnimation="slide-up"
           background={{ variant: "plain" }}
-          testimonials={heroTestimonials}
-          useInvertedBackground={false}
-          mediaAnimation="slide-up"
-          imageSrc="/placeholders/placeholder1.webp"
-          imageAlt="Al Rayah Bakeries"
+          imageSrc="http://img.b2bpic.net/free-photo/baker-holding-fresh-bread-hands_169016-1421.jpg"
+          imageAlt="Fresh baked bread and pastries at Al Rayah Bakeries"
+          mediaAnimation="opacity"
+          imagePosition="right"
+          testimonials={[
+            {
+              name: "Ahmed Al Mansouri",              handle: "Local Customer",              testimonial: "Fresh bread and great service. Always open when I need it!",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/cheerful-multiracial-business-team_1262-21007.jpg?_wi=1",              imageAlt: "Ahmed Al Mansouri"
+            },
+            {
+              name: "Fatima Al Kaabi",              handle: "Regular Customer",              testimonial: "Very affordable bakery in Sharjah. The pastries are delicious!",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/signs-symbols-gestures-concept-cheerful-young-mixed-race-lady-with-long-straight-hair-smiling-broadly-showing-thumbs-up-gesture-as-sign-approval-respect-liking_344912-1033.jpg?_wi=1",              imageAlt: "Fatima Al Kaabi"
+            },
+            {
+              name: "Mohammed Al Mazrouei",              handle: "Business Owner",              testimonial: "Best quality bread for my restaurant. Reliable and fast delivery!",              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-businessman-standing-airport_107420-85035.jpg?_wi=1",              imageAlt: "Mohammed Al Mazrouei"
+            },
+          ]}
+          testimonialRotationInterval={5000}
+          buttons={[
+            { text: "Call Now", href: "tel:0654650200" },
+            { text: "Order Pickup", href: "#products" },
+          ]}
+          buttonAnimation="slide-up"
         />
       </div>
 
       <div id="about" data-section="about">
         <MetricSplitMediaAbout
-          title="About Al Rayah Bakeries"
-          description="Serving Sharjah with the finest baked goods since our founding"
-          metrics={metrics}
+          tag="About Us"
+          tagAnimation="slide-up"
+          title="Trusted by Sharjah Families for Fresh Baked Goodness"
+          description="Al Rayah Bakeries has been serving the Sharjah community with fresh bread, pastries, and baked goods. We focus on quality ingredients, traditional baking methods, and affordable prices for everyone. Open 24 hours to serve you whenever you need us."
+          metrics={[
+            { value: "24/7", title: "Always Open" },
+            { value: "Fresh", title: "Daily Baked" },
+          ]}
           useInvertedBackground={false}
+          imageSrc="http://img.b2bpic.net/free-photo/high-angle-arepas-basket_23-2148742414.jpg?_wi=1"
+          imageAlt="Fresh Arabic bread from Al Rayah Bakeries"
+          mediaAnimation="opacity"
           metricsAnimation="slide-up"
-          mediaAnimation="slide-up"
-          imageSrc="/placeholders/placeholder1.webp"
-          imageAlt="About us"
         />
       </div>
 
       <div id="products" data-section="products">
         <ProductCardFour
-          products={products}
-          title="Our Products"
-          description="Explore our delicious selection of fresh baked goods"
-          gridVariant="four-items-2x2-equal-grid"
-          animationType="slide-up"
+          title="Featured Products"
+          description="Explore our selection of fresh-baked breads, pastries, cakes, and sweets made daily"
+          tag="Menu Items"
+          tagAnimation="slide-up"
           textboxLayout="default"
+          gridVariant="uniform-all-items-equal"
+          animationType="slide-up"
           useInvertedBackground={false}
+          products={[
+            {
+              id: "1",              name: "Fresh Arabic Bread",              price: "AED 1-3",              variant: "Daily Fresh Baked",              imageSrc: "http://img.b2bpic.net/free-photo/high-angle-arepas-basket_23-2148742414.jpg?_wi=2",              imageAlt: "Fresh Arabic bread"
+            },
+            {
+              id: "2",              name: "Assorted Pastries",              price: "AED 5-15",              variant: "Sweet & Savory",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-chocolate-chips-cake-with-raisins-fruits-white-background-pie-cookie-biscuit-sweet-cake_140725-115586.jpg",              imageAlt: "Assorted pastries selection"
+            },
+            {
+              id: "3",              name: "Custom Cakes",              price: "AED 20-50",              variant: "Celebrations & Events",              imageSrc: "http://img.b2bpic.net/free-photo/woman-looking-turkish-sweets-shop_107420-94726.jpg",              imageAlt: "Custom decorated cakes"
+            },
+            {
+              id: "4",              name: "Traditional Sweets",              price: "AED 5-25",              variant: "Arabic Specialties",              imageSrc: "http://img.b2bpic.net/free-photo/pasta-with-yellow_1203-1348.jpg",              imageAlt: "Traditional arabic sweets"
+            },
+          ]}
+          buttons={[{ text: "Order Now", href: "tel:0654650200" }]}
         />
       </div>
 
       <div id="features" data-section="features">
         <FeatureBorderGlow
-          features={features}
-          title="Why Choose Us"
-          description="Quality, freshness, and service that exceeds expectations"
-          animationType="slide-up"
+          title="Why Customers Choose Al Rayah"
+          description="Quality, freshness, and service that keeps our community coming back"
           textboxLayout="default"
+          animationType="slide-up"
           useInvertedBackground={false}
+          features={[
+            {
+              icon: Sparkles,
+              title: "Freshly Baked Daily",              description: "All products baked fresh every morning and throughout the day"
+            },
+            {
+              icon: DollarSign,
+              title: "Affordable Prices",              description: "AED 1-50 per person — quality bakery goods for every budget"
+            },
+            {
+              icon: Clock,
+              title: "Open 24 Hours",              description: "Always available whenever you need fresh bread and pastries"
+            },
+            {
+              icon: Zap,
+              title: "Quick Pickup",              description: "Fast service and convenient pickup for your busy schedule"
+            },
+            {
+              icon: Truck,
+              title: "Fast Local Delivery",              description: "Quick delivery service throughout Sharjah"
+            },
+            {
+              icon: Heart,
+              title: "Trusted Quality",              description: "4.3★ rating from 270+ satisfied customers"
+            },
+          ]}
         />
       </div>
 
       <div id="testimonials" data-section="testimonials">
         <TestimonialCardTwo
-          testimonials={testimonials}
           title="What Our Customers Say"
-          description="Real feedback from our valued customers"
-          animationType="slide-up"
+          description="Real feedback from families and businesses who trust Al Rayah Bakeries"
+          tag="Customer Reviews"
+          tagAnimation="slide-up"
           textboxLayout="default"
+          animationType="slide-up"
           useInvertedBackground={false}
+          testimonials={[
+            {
+              id: "1",              name: "Sarah Johnson",              role: "Family Customer",              testimonial: "Fresh bread and great service. Always open when I need it! My family loves coming here.",              imageSrc: "http://img.b2bpic.net/free-photo/cheerful-multiracial-business-team_1262-21007.jpg?_wi=2",              imageAlt: "Sarah Johnson"
+            },
+            {
+              id: "2",              name: "Michael Chen",              role: "Restaurant Owner",              testimonial: "Best quality bread for my restaurant. Reliable and fast delivery. Highly recommended!",              imageSrc: "http://img.b2bpic.net/free-photo/signs-symbols-gestures-concept-cheerful-young-mixed-race-lady-with-long-straight-hair-smiling-broadly-showing-thumbs-up-gesture-as-sign-approval-respect-liking_344912-1033.jpg?_wi=2",              imageAlt: "Michael Chen"
+            },
+            {
+              id: "3",              name: "Emily Rodriguez",              role: "Office Manager",              testimonial: "Very affordable bakery in Sharjah. The pastries are delicious and perfect for office meetings.",              imageSrc: "http://img.b2bpic.net/free-photo/smiling-businessman-standing-airport_107420-85035.jpg?_wi=2",              imageAlt: "Emily Rodriguez"
+            },
+            {
+              id: "4",              name: "David Kim",              role: "Late-Night Customer",              testimonial: "Love that you're open 24 hours! Perfect for my night shift. Fresh bread always available.",              imageSrc: "http://img.b2bpic.net/free-photo/man-looking-shop-mirror-night-out_23-2149143996.jpg",              imageAlt: "David Kim"
+            },
+          ]}
         />
       </div>
 
       <div id="contact" data-section="contact">
         <ContactSplit
-          tag="Get In Touch"
-          title="Order Your Fresh Baked Goods Today"
-          description="Contact us for bulk orders, special requests, or delivery information"
-          background={{ variant: "plain" }}
+          tag="Ready to Order?"
+          title="Craving Fresh Bread & Pastries?"
+          description="Contact Al Rayah Bakeries today. We're open 24 hours with quick pickup and delivery options throughout Sharjah."
+          background={{ variant: "radial-gradient" }}
           useInvertedBackground={false}
-          mediaAnimation="slide-up"
+          imageSrc="http://img.b2bpic.net/free-photo/glass-jar-milk-dried-dates-basket-gogals-marble-table_114579-29995.jpg"
+          imageAlt="Fresh bakery breakfast items"
+          mediaAnimation="opacity"
+          mediaPosition="right"
           inputPlaceholder="Enter your email"
-          buttonText="Sign Up"
+          buttonText="Get Updates"
+          termsText="We respect your privacy. Unsubscribe at any time."
         />
       </div>
 
       <div id="footer" data-section="footer">
         <FooterSimple
-          columns={footerColumns}
-          bottomLeftText="© 2025 Al Rayah Bakeries"
-          bottomRightText="All rights reserved"
+          columns={[
+            {
+              title: "Contact",              items: [
+                { label: "Call Now", href: "tel:0654650200" },
+                { label: "WhatsApp", href: "https://wa.me/971654650200" },
+                {
+                  label: "Get Directions",                  href: "https://maps.google.com/?q=Al+Sharq+St+Al+Qulai'aah+Sharjah"
+                },
+              ],
+            },
+            {
+              title: "Services",              items: [
+                { label: "Pickup Orders", href: "#products" },
+                { label: "Delivery", href: "tel:0654650200" },
+                { label: "Custom Cakes", href: "#products" },
+                { label: "Catering", href: "tel:0654650200" },
+              ],
+            },
+            {
+              title: "Information",              items: [
+                { label: "About Us", href: "#about" },
+                { label: "Hours: 24/7", href: "#" },
+                { label: "Reviews", href: "#testimonials" },
+              ],
+            },
+            {
+              title: "Location",              items: [
+                {
+                  label: "Al Sharq St",                  href: "https://maps.google.com/?q=Al+Sharq+St+Al+Qulai'aah+Sharjah"
+                },
+                {
+                  label: "Al Qulai'aah",                  href: "https://maps.google.com/?q=Al+Sharq+St+Al+Qulai'aah+Sharjah"
+                },
+                {
+                  label: "Sharjah, UAE",                  href: "https://maps.google.com/?q=Al+Sharq+St+Al+Qulai'aah+Sharjah"
+                },
+              ],
+            },
+          ]}
+          bottomLeftText="© 2025 Al Rayah Bakeries. All rights reserved."
+          bottomRightText="Open 24 Hours | Fresh Daily"
         />
       </div>
     </ThemeProvider>
