diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 128e16a..7437237 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -1,6 +1,5 @@
-use client";
+"use client";
 
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { useBlogPosts } from "@/hooks/useBlogPosts";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -23,42 +22,44 @@ export default function BlogPage() {
             secondaryButtonStyle="solid"
             headingFontWeight="extrabold"
         >
-            <ReactLenis root>
+            <div id="nav" data-section="nav">
                 <NavbarLayoutFloatingInline
-                    navItems={[{ name: "Home", id: "/" }, { name: "Features", id: "features" }, { name: "Testimonials", id: "testimonials" }, { name: "Pricing", id: "pricing" }, { name: "FAQ", id: "faq" }]}
+                    navItems={[{ name: "Home", id: "/" }, { name: "Features", id: "/#features" }, { name: "Testimonials", id: "/#testimonials" }, { name: "FAQ", id: "/#faq" }]}
                     brandName="NoteGenius AI"
-                    button={{ text: "Start Free Trial", href: "#contact" }}
+                    button={{ text: "Start Free Trial", href: "/#contact" }}
                     className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
                     navItemClassName="text-foreground hover:text-primary-cta"
                     buttonClassName="px-5 py-2"
                     buttonTextClassName="text-sm font-medium"
                 />
+            </div>
 
-                    {isLoading ? (
-                        <div className="w-content-width mx-auto py-20 text-center">
-                            <p className="text-foreground">Loading posts...</p>
-                        </div>
-                    ) : (
-                        <BlogCardThree
-                            blogs={posts}
-                            title="Featured Articles"
-                            description="Explore our latest insights"
-                            textboxLayout="default"
-                            useInvertedBackground={false}
-                            animationType="slide-up"
-                        />
-                    )}
+            {isLoading ? (
+                <div className="w-content-width mx-auto py-20 text-center">
+                    <p className="text-foreground">Loading posts...</p>
+                </div>
+            ) : (
+                <BlogCardThree
+                    blogs={posts}
+                    title="Featured Articles"
+                    description="Explore our latest insights"
+                    textboxLayout="default"
+                    useInvertedBackground={false}
+                    animationType="slide-up"
+                />
+            )}
 
-                    <FooterMedia
-                        imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png?_wi=2"
-                        imageAlt="Abstract AI neural network background"
-                        columns={[{ title: "Product", items: [{ label: "Features", href: "#features" }, { label: "Pricing", href: "#pricing" }, { label: "Integrations", href: "#" }] }, { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "#" }] }, { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] }]}
-                        logoText="NoteGenius AI"
-                        copyrightText="© 2025 NoteGenius AI. All rights reserved."
-                        className="!pb-0 !pt-20"
-                        columnItemClassName="text-foreground/80 hover:text-primary-cta"
-                    />
-            </ReactLenis>
+            <div id="footer" data-section="footer">
+                <FooterMedia
+                    imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png"
+                    imageAlt="Abstract AI neural network background"
+                    columns={[{ title: "Product", items: [{ label: "Features", href: "/#features" }, { label: "Integrations", href: "#" }] }, { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "/blog" }] }, { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Help Center", href: "#" }] }]}
+                    logoText="NoteGenius AI"
+                    copyrightText="© 2025 NoteGenius AI. All rights reserved."
+                    className="!pb-0 !pt-20"
+                    columnItemClassName="text-foreground/80 hover:text-primary-cta"
+                />
+            </div>
         </ThemeProvider>
     );
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index edbeffe..ce780ac 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -28,7 +28,7 @@ export default function LandingPage() {
     >
       <div id="nav" data-section="nav">
         <NavbarLayoutFloatingInline
-          navItems={[{name: 'Features', id: 'features'}, {name: 'Testimonials', id: 'testimonials'}, {name: 'Pricing', id: 'pricing'}, {name: 'FAQ', id: 'faq'}]}
+          navItems={[{name: 'Features', id: 'features'}, {name: 'Testimonials', id: 'testimonials'}, {name: 'FAQ', id: 'faq'}]}
           brandName="NoteGenius AI"
           button={{text: 'Start Free Trial', href: '#contact'}}
           className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
@@ -52,6 +52,13 @@ export default function LandingPage() {
           imageAlt="AI note-taking app dashboard"
           imagePosition="right"
           mediaAnimation="blur-reveal"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          titleClassName="font-extrabold"
+          descriptionClassName="max-w-prose"
+          buttonContainerClassName="flex-col sm:flex-row"
+          buttonClassName="px-8 py-3"
+          buttonTextClassName="text-lg font-semibold"
         />
       </div>
 
@@ -64,6 +71,8 @@ export default function LandingPage() {
           tagAnimation="slide-up"
           buttonAnimation="slide-up"
           titleClassName="text-3xl md:text-5xl font-extrabold max-w-4xl mx-auto"
+          buttonClassName="px-8 py-3"
+          buttonTextClassName="text-lg font-medium"
         />
       </div>
 
@@ -91,8 +100,8 @@ export default function LandingPage() {
           description="Hear directly from professionals and students who have revolutionized their note-taking with NoteGenius AI."
           testimonials={[
             {id: '1', name: 'Dr. Anya Sharma', role: 'Lead Data Scientist at InnovateCorp', testimonial: 'NoteGenius AI has transformed how I manage complex research notes. The smart summaries and interconnected insights save me hours every week! A game-changer for any data-intensive role.', imageSrc: 'https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/a-professional-headshot-of-a-female-tech-1771614982508-a11d6c02.png', imageAlt: 'Dr. Anya Sharma'},
-            {id: '2', name: 'Mark Thompson', role: 'VP of Product at TechFlow Solutions', testimonial: 'Our team\'s productivity has skyrocketed since adopting NoteGenius AI. It\'s more than just a note app; it\'s a knowledge hub that truly understands and organizes our collective ideas.', imageSrc: 'https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/a-professional-headshot-of-a-male-softwa-1771614981882-0f640a6b.png', imageAlt: 'Mark Thompson'},
-            {id: '3', name: 'Chloe Lee', role: 'Graduate Student, Cognitive Science', testimonial: 'As a student, staying organized is key. NoteGenius AI helps me link concepts, summarize lectures, and prepare for exams with incredible efficiency. It\'s like having a personal AI research assistant.', imageSrc: 'https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/a-professional-headshot-of-a-female-stud-1771614982099-42643313.png', imageAlt: 'Chloe Lee'},
+            {id: '2', name: 'Mark Thompson', role: 'VP of Product at TechFlow Solutions', testimonial: "Our team's productivity has skyrocketed since adopting NoteGenius AI. It's more than just a note app; it's a knowledge hub that truly understands and organizes our collective ideas.", imageSrc: 'https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/a-professional-headshot-of-a-male-softwa-1771614981882-0f640a6b.png', imageAlt: 'Mark Thompson'},
+            {id: '3', name: 'Chloe Lee', role: 'Graduate Student, Cognitive Science', testimonial: "As a student, staying organized is key. NoteGenius AI helps me link concepts, summarize lectures, and prepare for exams with incredible efficiency. It's like having a personal AI research assistant.", imageSrc: 'https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/a-professional-headshot-of-a-female-stud-1771614982099-42643313.png', imageAlt: 'Chloe Lee'},
             {id: '4', name: 'David Rodriguez', role: 'Senior Project Manager, Global Ventures', testimonial: 'Managing multiple projects means endless notes. NoteGenius AI automatically extracts key action items and critical information, ensuring nothing falls through the cracks. Absolutely indispensable.', imageSrc: 'https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/a-professional-headshot-of-a-male-projec-1771614981766-d449e6a4.png', imageAlt: 'David Rodriguez'}
           ]}
           animationType="slide-up"
@@ -171,16 +180,19 @@ export default function LandingPage() {
           useInvertedBackground={true}
           className="!py-24"
           textClassName="text-3xl md:text-5xl font-extrabold max-w-4xl mx-auto"
+          buttonContainerClassName="flex-col sm:flex-row"
+          buttonClassName="px-8 py-3"
+          buttonTextClassName="text-lg font-medium"
         />
       </div>
 
       <div id="footer" data-section="footer">
         <FooterMedia
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png?_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png"
           imageAlt="Abstract AI neural network background"
           columns={[
-            {title: 'Product', items: [{label: 'Features', href: '#features'}, {label: 'Pricing', href: '#pricing'}, {label: 'Integrations', href: '#'}]},
-            {title: 'Company', items: [{label: 'About Us', href: '#about'}, {label: 'Careers', href: '#'}, {label: 'Blog', href: '#'}]},
+            {title: 'Product', items: [{label: 'Features', href: '#features'}, {label: 'Integrations', href: '#'}]},
+            {title: 'Company', items: [{label: 'About Us', href: '#about'}, {label: 'Careers', href: '#'}, {label: 'Blog', href: '/blog'}]},
             {title: 'Support', items: [{label: 'FAQ', href: '#faq'}, {label: 'Contact', href: '#contact'}, {label: 'Help Center', href: '#'}]}
           ]}
           logoText="NoteGenius AI"
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index a635f74..6489761 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -2,7 +2,6 @@
 
 import { Suspense, use, useCallback } from "react";
 import { useRouter } from "next/navigation";
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
 import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
@@ -88,37 +87,35 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="solid"
                 headingFontWeight="extrabold"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingInline
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            brandName="NoteGenius AI"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                            className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
-                            navItemClassName="text-foreground hover:text-primary-cta"
-                            buttonClassName="px-5 py-2"
-                            buttonTextClassName="text-sm font-medium"
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading product...</p>
-                    </main>
-                    <div id="footer" data-section="footer">
-                         <FooterMedia
-                            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png?_wi=4"
-                            imageAlt="Abstract AI neural network background"
-                            columns={[
-                                { title: "Product", items: [{ label: "Features", href: "#features" }, { label: "Pricing", href: "#pricing" }, { label: "Integrations", href: "#" }] },
-                                { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "#" }] },
-                                { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] }
-                            ]}
-                            logoText="NoteGenius AI"
-                            copyrightText="© 2025 NoteGenius AI. All rights reserved."
-                            className="!pb-0 !pt-20"
-                            columnItemClassName="text-foreground/80 hover:text-primary-cta"
-                        />
-                    </div>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    <NavbarLayoutFloatingInline
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                        brandName="NoteGenius AI"
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
+                        navItemClassName="text-foreground hover:text-primary-cta"
+                        buttonClassName="px-5 py-2"
+                        buttonTextClassName="text-sm font-medium"
+                    />
+                </div>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <p className="text-foreground">Loading product...</p>
+                </main>
+                <div id="footer" data-section="footer">
+                     <FooterMedia
+                        imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png"
+                        imageAlt="Abstract AI neural network background"
+                        columns={[
+                            { title: "Product", items: [{ label: "Features", href: "/#features" }, { label: "Integrations", href: "#" }] },
+                            { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "/blog" }] },
+                            { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Help Center", href: "#" }] }
+                        ]}
+                        logoText="NoteGenius AI"
+                        copyrightText="© 2025 NoteGenius AI. All rights reserved."
+                        className="!pb-0 !pt-20"
+                        columnItemClassName="text-foreground/80 hover:text-primary-cta"
+                    />
+                </div>
             </ThemeProvider>
         );
     }
@@ -137,47 +134,45 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="solid"
                 headingFontWeight="extrabold"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingInline
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            brandName="NoteGenius AI"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                            className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
-                            navItemClassName="text-foreground hover:text-primary-cta"
-                            buttonClassName="px-5 py-2"
-                            buttonTextClassName="text-sm font-medium"
-                        />
-                    </div>
-                    <div id="not-found-section" data-section="not-found-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <div className="text-center">
-                                <p className="text-foreground mb-4">Product not found</p>
-                                <button
-                                    onClick={() => router.push("/shop")}
-                                    className="primary-button px-6 py-2 rounded-theme"
-                                >
-                                    Back to Shop
-                                </button>
-                            </div>
-                        </main>
-                    </div>
-                     <div id="footer" data-section="footer">
-                         <FooterMedia
-                            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png?_wi=5"
-                            imageAlt="Abstract AI neural network background"
-                            columns={[
-                                { title: "Product", items: [{ label: "Features", href: "#features" }, { label: "Pricing", href: "#pricing" }, { label: "Integrations", href: "#" }] },
-                                { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "#" }] },
-                                { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] }
-                            ]}
-                            logoText="NoteGenius AI"
-                            copyrightText="© 2025 NoteGenius AI. All rights reserved."
-                            className="!pb-0 !pt-20"
-                            columnItemClassName="text-foreground/80 hover:text-primary-cta"
-                        />
-                    </div>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    <NavbarLayoutFloatingInline
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                        brandName="NoteGenius AI"
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
+                        navItemClassName="text-foreground hover:text-primary-cta"
+                        buttonClassName="px-5 py-2"
+                        buttonTextClassName="text-sm font-medium"
+                    />
+                </div>
+                <div id="not-found-section" data-section="not-found-section">
+                    <main className="min-h-screen flex items-center justify-center pt-20">
+                        <div className="text-center">
+                            <p className="text-foreground mb-4">Product not found</p>
+                            <button
+                                onClick={() => router.push("/shop")}
+                                className="primary-button px-6 py-2 rounded-theme"
+                            >
+                                Back to Shop
+                            </button>
+                        </div>
+                    </main>
+                </div>
+                 <div id="footer" data-section="footer">
+                     <FooterMedia
+                        imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png"
+                        imageAlt="Abstract AI neural network background"
+                        columns={[
+                            { title: "Product", items: [{ label: "Features", href: "/#features" }, { label: "Integrations", href: "#" }] },
+                            { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "/blog" }] },
+                            { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Help Center", href: "#" }] }
+                        ]}
+                        logoText="NoteGenius AI"
+                        copyrightText="© 2025 NoteGenius AI. All rights reserved."
+                        className="!pb-0 !pt-20"
+                        columnItemClassName="text-foreground/80 hover:text-primary-cta"
+                    />
+                </div>
             </ThemeProvider>
         );
     }
@@ -195,68 +190,66 @@ function ProductPageContent({ params }: ProductPageProps) {
             secondaryButtonStyle="solid"
             headingFontWeight="extrabold"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingInline
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                        brandName="NoteGenius AI"
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
-                        navItemClassName="text-foreground hover:text-primary-cta"
-                        buttonClassName="px-5 py-2"
-                        buttonTextClassName="text-sm font-medium"
-                    />
-                </div>
-                <div id="product-detail-card" data-section="product-detail-card">
-                    <ProductDetailCard
-                        layout="page"
-                        name={product.name}
-                        price={product.price}
-                        salePrice={meta.salePrice}
-                        rating={product.rating || 0}
-                        description={product.description}
-                        images={images}
-                        variants={variants.length > 0 ? variants : undefined}
-                        quantity={quantityVariant}
-                        ribbon={meta.ribbon}
-                        inventoryStatus={meta.inventoryStatus}
-                        inventoryQuantity={meta.inventoryQuantity}
-                        sku={meta.sku}
-                        buttons={[
-                            { text: "Add To Cart", onClick: handleAddToCart },
-                            { text: "Buy Now", onClick: handleBuyNow },
-                        ]}
-                    />
-                </div>
-                <ProductCart
-                    isOpen={cartOpen}
-                    onClose={() => setCartOpen(false)}
-                    items={cartItems}
-                    onQuantityChange={updateQuantity}
-                    onRemove={removeItem}
-                    total={`$${cartTotal}`}
+            <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingInline
+                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                    brandName="NoteGenius AI"
+                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
+                    navItemClassName="text-foreground hover:text-primary-cta"
+                    buttonClassName="px-5 py-2"
+                    buttonTextClassName="text-sm font-medium"
+                />
+            </div>
+            <div id="product-detail-card" data-section="product-detail-card">
+                <ProductDetailCard
+                    layout="page"
+                    name={product.name}
+                    price={product.price}
+                    salePrice={meta.salePrice}
+                    rating={product.rating || 0}
+                    description={product.description}
+                    images={images}
+                    variants={variants.length > 0 ? variants : undefined}
+                    quantity={quantityVariant}
+                    ribbon={meta.ribbon}
+                    inventoryStatus={meta.inventoryStatus}
+                    inventoryQuantity={meta.inventoryQuantity}
+                    sku={meta.sku}
                     buttons={[
-                        {
-                            text: isCheckoutLoading ? "Processing..." : "Check Out",                            onClick: handleCheckout,
-                        },
+                        { text: "Add To Cart", onClick: handleAddToCart },
+                        { text: "Buy Now", onClick: handleBuyNow },
                     ]}
                 />
-                <div id="footer" data-section="footer">
-                    <FooterMedia
-                        imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png?_wi=6"
-                        imageAlt="Abstract AI neural network background"
-                        columns={[
-                            { title: "Product", items: [{ label: "Features", href: "#features" }, { label: "Pricing", href: "#pricing" }, { label: "Integrations", href: "#" }] },
-                            { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "#" }] },
-                            { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] }
-                        ]}
-                        logoText="NoteGenius AI"
-                        copyrightText="© 2025 NoteGenius AI. All rights reserved."
-                        className="!pb-0 !pt-20"
-                        columnItemClassName="text-foreground/80 hover:text-primary-cta"
-                    />
-                </div>
-            </ReactLenis>
+            </div>
+            <ProductCart
+                isOpen={cartOpen}
+                onClose={() => setCartOpen(false)}
+                items={cartItems}
+                onQuantityChange={updateQuantity}
+                onRemove={removeItem}
+                total={`$${cartTotal}`}
+                buttons={[
+                    {
+                        text: isCheckoutLoading ? "Processing..." : "Check Out",                        onClick: handleCheckout,
+                    },
+                ]}
+            />
+            <div id="footer" data-section="footer">
+                <FooterMedia
+                    imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png"
+                    imageAlt="Abstract AI neural network background"
+                    columns={[
+                        { title: "Product", items: [{ label: "Features", href: "/#features" }, { label: "Integrations", href: "#" }] },
+                        { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "/blog" }] },
+                        { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Help Center", href: "#" }] }
+                    ]}
+                    logoText="NoteGenius AI"
+                    copyrightText="© 2025 NoteGenius AI. All rights reserved."
+                    className="!pb-0 !pt-20"
+                    columnItemClassName="text-foreground/80 hover:text-primary-cta"
+                />
+            </div>
         </ThemeProvider>
     );
 }
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 88d7547..bffa829 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
@@ -30,22 +29,20 @@ export default function ShopPage() {
                 secondaryButtonStyle="solid"
                 headingFontWeight="extrabold"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingInline
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                        brandName="NoteGenius AI"
-                        button={{ text: "Cart", onClick: () => console.log("cart") }}
-                        className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
-                        navItemClassName="text-foreground hover:text-primary-cta"
-                        buttonClassName="px-5 py-2"
-                        buttonTextClassName="text-sm font-medium"
-                    />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading products...</p>
-                    </main>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingInline
+                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                    brandName="NoteGenius AI"
+                    button={{ text: "Cart", onClick: () => console.log("cart") }}
+                    className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
+                    navItemClassName="text-foreground hover:text-primary-cta"
+                    buttonClassName="px-5 py-2"
+                    buttonTextClassName="text-sm font-medium"
+                />
+                </div>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <p className="text-foreground">Loading products...</p>
+                </main>
             </ThemeProvider>
         );
     }
@@ -63,45 +60,43 @@ export default function ShopPage() {
             secondaryButtonStyle="solid"
             headingFontWeight="extrabold"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingInline
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                        brandName="NoteGenius AI"
-                        button={{ text: "Cart", onClick: () => console.log("cart") }}
-                        className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
-                        navItemClassName="text-foreground hover:text-primary-cta"
-                        buttonClassName="px-5 py-2"
-                        buttonTextClassName="text-sm font-medium"
-                    />
-                </div>
-                <div id="product-catalog" data-section="product-catalog">
-                    <ProductCatalog
-                        layout="page"
-                        products={products}
-                        searchValue={search}
-                        onSearchChange={setSearch}
-                        searchPlaceholder="Search products..."
-                        filters={filters}
-                        emptyMessage="No products found"
-                    />
-                </div>
-                <div id="footer" data-section="footer">
-                    <FooterMedia
-                        imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png?_wi=3"
-                        imageAlt="Abstract AI neural network background"
-                        columns={[
-                            { title: "Product", items: [{ label: "Features", href: "#features" }, { label: "Pricing", href: "#pricing" }, { label: "Integrations", href: "#" }] },
-                            { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "#" }] },
-                            { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Help Center", href: "#" }] }
-                        ]}
-                        logoText="NoteGenius AI"
-                        copyrightText="© 2025 NoteGenius AI. All rights reserved."
-                        className="!pb-0 !pt-20"
-                        columnItemClassName="text-foreground/80 hover:text-primary-cta"
-                    />
-                </div>
-            </ReactLenis>
+            <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingInline
+                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                    brandName="NoteGenius AI"
+                    button={{ text: "Cart", onClick: () => console.log("cart") }}
+                    className="py-4 px-6 md:px-8 lg:px-12 backdrop-blur-md bg-background/80"
+                    navItemClassName="text-foreground hover:text-primary-cta"
+                    buttonClassName="px-5 py-2"
+                    buttonTextClassName="text-sm font-medium"
+                />
+            </div>
+            <div id="product-catalog" data-section="product-catalog">
+                <ProductCatalog
+                    layout="page"
+                    products={products}
+                    searchValue={search}
+                    onSearchChange={setSearch}
+                    searchPlaceholder="Search products..."
+                    filters={filters}
+                    emptyMessage="No products found"
+                />
+            </div>
+            <div id="footer" data-section="footer">
+                <FooterMedia
+                    imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_32SzEkxKoNyIbQ4hnQYui6BHsfB/an-abstract-digital-background-with-subt-1771614980980-6c543249.png"
+                    imageAlt="Abstract AI neural network background"
+                    columns={[
+                        { title: "Product", items: [{ label: "Features", href: "/#features" }, { label: "Integrations", href: "#" }] },
+                        { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Careers", href: "#" }, { label: "Blog", href: "/blog" }] },
+                        { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Help Center", href: "#" }] }
+                    ]}
+                    logoText="NoteGenius AI"
+                    copyrightText="© 2025 NoteGenius AI. All rights reserved."
+                    className="!pb-0 !pt-20"
+                    columnItemClassName="text-foreground/80 hover:text-primary-cta"
+                />
+            </div>
         </ThemeProvider>
     );
 }