diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 40a3b89..9229bb5 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -1,14 +1,44 @@
 "use client";
 
-import ReactLenis from "lenis/react";
-import BlogCardThree from '@/components/sections/blog/BlogCardThree';
+import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import { useBlogPosts } from "@/hooks/useBlogPosts";
+
+const posts = [
+  {
+    id: '1',
+    category: ['Skincare', 'Tips'],
+    title: '5 Tips for a Glowing Complexion',
+    excerpt: 'Discover our top secrets to achieving radiant, healthy-looking skin that glows from within.',
+    imageSrc: 'https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg',
+    authorName: 'Lee Coral',
+    authorAvatar: 'https://img.b2bpic.net/free-photo/studio-shot-sensual-woman-pink-suit_197531-16807.jpg',
+    date: 'Oct 20, 2023',
+  },
+  {
+    id: '2',
+    category: ['Live Shows'],
+    title: 'What to Expect in Our Next Live Show',
+    excerpt: 'Get a sneak peek into the exclusive bundles and new drops featured in our upcoming live event.',
+    imageSrc: 'https://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg',
+    authorName: 'Ariel S.',
+    authorAvatar: 'https://img.b2bpic.net/free-photo/portrait-young-female-dentist-dentistry-concept-dental-treatment_169016-67131.jpg',
+    date: 'Oct 15, 2023',
+  },
+  {
+    id: '3',
+    category: ['Cosmetics'],
+    title: 'The Ultimate Guide to Pro Cosmetics',
+    excerpt: 'Learn how to use our professional cosmetic kits to create stunning looks for any occasion.',
+    imageSrc: 'https://img.b2bpic.net/free-photo/foundation-bottles-advertising-arrangement_23-2149511243.jpg',
+    authorName: 'Glow Theory',
+    authorAvatar: 'https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg',
+    date: 'Oct 10, 2023',
+  }
+];
 
 export default function BlogPage() {
-    const { posts, isLoading } = useBlogPosts();
 
     return (
         <ThemeProvider
@@ -23,49 +53,41 @@ export default function BlogPage() {
             secondaryButtonStyle="radial-glow"
             headingFontWeight="medium"
         >
-            <ReactLenis root>
-                <div id="nav" data-section="nav">
-                    <NavbarLayoutFloatingOverlay
-                        brandName="Glow Theory"
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" },
-                        ]}
-                        button={{ text: "Join Live", href: "/#live-shows" }}
-                        className="py-4 px-6 md:px-8"
-                        buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
-                        buttonTextClassName="font-medium"
-                    />
-                </div>
+            <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingOverlay
+                    brandName="Glow Theory"
+                    navItems={[
+                        { name: "Home", id: "/" },
+                        { name: "Shop", id: "/shop" },
+                    ]}
+                    button={{ text: "Join Live", href: "/#live-shows" }}
+                    className="py-4 px-6 md:px-8"
+                    buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+                    buttonTextClassName="font-medium"
+                />
+            </div>
 
-                    {isLoading ? (
-                        <div className="w-content-width mx-auto py-20 text-center">
-                            <p className="text-foreground">Loading posts...</p>
-                        </div>
-                    ) : (
-                        <div id="blog" data-section="blog">
-                            <BlogCardThree
-                                blogs={posts}
-                                title="Featured Articles"
-                                description="Explore our latest insights"
-                                animationType="slide-up"
-                                textboxLayout="default"
-                                useInvertedBackground={false}
-                            />
-                        </div>
-                    )}
+            <div id="blog" data-section="blog">
+                <BlogCardTwo
+                    blogs={posts}
+                    title="Featured Articles"
+                    description="Explore our latest insights"
+                    animationType="slide-up"
+                    textboxLayout="default"
+                    useInvertedBackground={false}
+                />
+            </div>
 
-                    <div id="footer" data-section="footer">
-                        <FooterLogoReveal
-                            logoText="Glow Theory"
-                            leftLink={{ text: "Customer Support", href: "/#contact-support" }}
-                            rightLink={{ text: "Privacy Policy", href: "/privacy" }}
-                            className="bg-[--background] text-[--foreground] py-6 px-4"
-                            linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
-                            logoClassName="text-2xl font-bold tracking-tight"
-                        />
-                    </div>
-            </ReactLenis>
+            <div id="footer" data-section="footer">
+                <FooterLogoReveal
+                    logoText="Glow Theory"
+                    leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                    rightLink={{ text: "Privacy Policy", href: "/privacy" }}
+                    className="bg-[--background] text-[--foreground] py-6 px-4"
+                    linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+                    logoClassName="text-2xl font-bold tracking-tight"
+                />
+            </div>
         </ThemeProvider>
     );
 }
\ No newline at end of file
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 253ebd8..20751da 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -34,6 +34,8 @@ export default function LandingPage() {
             { name: "Bundles", id: "bundles" },
             { name: "Reviews", id: "reviews" },
             { name: "Support", id: "support" },
+            { name: "Shop", id: "/shop" },
+            { name: "Blog", id: "/blog" }
           ]}
           button={{ text: "Join Live", href: "#live-shows" }}
           className="py-4 px-6 md:px-8"
@@ -54,7 +56,6 @@ export default function LandingPage() {
             { imageSrc: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg?_wi=3", imageAlt: "Beauty products with a soft pink glow" },
           ]}
           mediaAnimation="opacity"
-          tagAnimation="opacity"
           buttonAnimation="opacity"
           className="bg-[--background] text-[--foreground]"
           titleClassName="text-5xl md:text-7xl lg:text-8xl font-thin tracking-wide"
diff --git a/src/app/privacy/page.tsx b/src/app/privacy/page.tsx
index 62c8cf2..7d9c876 100644
--- a/src/app/privacy/page.tsx
+++ b/src/app/privacy/page.tsx
@@ -1,22 +1,11 @@
 "use client";
 
-import { LegalSection } from "@/components/legal/LegalSection";
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
-
-export default function PrivacyPolicyPage() {
-  const navItems = [
-    { name: "Home", id: "/" },
-    { name: "About", id: "/#about" },
-    { name: "Live Shows", id: "/#live-shows" },
-    { name: "Bundles", id: "/#bundles" },
-    { name: "Reviews", id: "/#reviews" },
-    { name: "Contact", id: "/#contact-support" }
-  ];
-  const WHATNOT_LINK = "https://www.whatnot.com/live/glowtheory";
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import LegalSection from '@/components/legal/LegalSection';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 
+export default function PrivacyPage() {
   return (
     <ThemeProvider
       defaultButtonVariant="elastic-effect"
@@ -30,70 +19,63 @@ export default function PrivacyPolicyPage() {
       secondaryButtonStyle="radial-glow"
       headingFontWeight="medium"
     >
-      <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingOverlay
-            brandName="Glow Theory"
-            navItems={navItems}
-            button={{ text: "Join Live", href: WHATNOT_LINK }}
-            className="py-4 px-6 md:px-8"
-            buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
-            buttonTextClassName="font-medium"
-            menuButtonClassName="!text-[--accent]"
-          />
-        </div>
-        <div id="privacy-policy" data-section="privacy-policy">
-          <LegalSection
-            layout="page"
-            title="Privacy Policy"
-            subtitle="Last updated: October 26, 2023"
-            sections={[
-              {
-                heading: "1. Introduction",                content: [{ type: "paragraph", text: "Welcome to Glow Theory's Privacy Policy. We are committed to protecting your personal data and your right to privacy. This policy explains what information we collect, how we use it, and what rights you have in relation to it." }],
-              },
-              {
-                heading: "2. Information We Collect",                content: [
-                  { type: "paragraph", text: "We collect personal information that you voluntarily provide to us when you register on the website, express an interest in obtaining information about us or our products and services, when you participate in activities on the website (such as posting messages in our forums or entering competitions), or otherwise when you contact us." },
-                  { type: "list", items: ["Name, email address, phone number", "Billing and shipping addresses", "Payment information (handled securely by third-party processors)", "Interaction data on live shows and website browsing"] },
-                ],
-              },
-              {
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingOverlay
+          brandName="Glow Theory"
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Shop", id: "/shop" },
+          ]}
+          button={{ text: "Join Live", href: "/#live-shows" }}
+          className="py-4 px-6 md:px-8"
+          buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+          buttonTextClassName="font-medium"
+        />
+      </div>
+
+      <div id="privacy-policy" data-section="privacy-policy">
+        <LegalSection
+          layout="page"
+          title="Privacy Policy"
+          subtitle="Last Updated: October 26, 2023"
+          sections={[
+            {
+              heading: "1. Introduction",              content: [
+                {
+                  type: "paragraph",                  text: "Welcome to Glow Theory. We are committed to protecting your personal information and your right to privacy. If you have any questions or concerns about our policy, or our practices with regards to your personal information, please contact us at support@glowtheory.com."},
+              ],
+            },
+            {
+              heading: "2. Information We Collect",              content: [
+                {
+                  type: "paragraph",                  text: "We collect personal information that you voluntarily provide to us when you express an interest in obtaining information about us or our products and services, when you participate in activities on the website or otherwise when you contact us."},
+                {
+                  type: "list",                  items: [
+                    "Personal Information: We may collect names, phone numbers, email addresses, mailing addresses, job titles, contact preferences, contact or authentication data, billing addresses, and other similar information.",                    "Payment Data: We may collect data necessary to process your payment if you make purchases, such as your payment instrument number (such as a credit card number), and the security code associated with your payment instrument."],
+                },
+              ],
+            },
+            {
                 heading: "3. How We Use Your Information",                content: [
-                  { type: "paragraph", text: "We use personal information collected via our website for a variety of business purposes described below. We process your personal information for these purposes in reliance on our legitimate business interests, in order to enter into or perform a contract with you, with your consent, and/or for compliance with our legal obligations." },
-                  { type: "numbered-list", items: ["To facilitate account creation and logon process.", "To send you marketing and promotional communications.", "To post testimonials with your consent.", "To deliver products and services to you.", "To respond to your inquiries and offer support."] },
-                ],
-              },
-              {
-                heading: "4. Sharing Your Information",                content: [
-                  { type: "paragraph", text: "We only share information with your consent, to comply with laws, to provide you with services, to protect your rights, or to fulfill business obligations. Specifically, we may share your data with third-party vendors, service providers, contractors or agents who perform services for us or on our behalf and require access to such information to do that work. These include payment processing, data analysis, email delivery, hosting services, customer service, and marketing efforts." },
-                ],
-              },
-              {
-                heading: "5. Your Privacy Rights",                content: [
-                  { type: "paragraph", text: "You have certain rights under applicable data protection laws. These may include the right (i) to request access and obtain a copy of your personal information, (ii) to request rectification or erasure; (iii) to restrict the processing of your personal information; and (iv) if applicable, to data portability. In certain circumstances, you may also have the right to object to the processing of your personal information. To make such a request, please use the contact details provided below." },
-                ],
-              },
-              {
-                heading: "6. Contact Us",                content: [
-                  { type: "paragraph", text: "If you have questions or comments about this policy, you may email us at support@glowtheory.com or contact us by post at:" },
-                  { type: "paragraph", text: "Glow Theory\n123 Beauty Lane\nMiami, FL 33101\nUSA" },
-                ],
-              },
-            ]}
-            className="bg-[--background] text-[--foreground]"
-          />
-        </div>
-        <div id="footer" data-section="footer">
-          <FooterLogoReveal
-            logoText="Glow Theory"
-            leftLink={{ text: "Customer Support", href: "/#contact-support" }}
-            rightLink={{ text: "Privacy Policy", href: "/privacy" }}
-            className="bg-[--background] text-[--foreground] py-6 px-4"
-            linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
-            logoClassName="text-2xl font-bold tracking-tight"
-          />
-        </div>
-      </ReactLenis>
+                    {
+                        type: "paragraph",                        text: "We use personal information collected via our website for a variety of business purposes described below. We process your personal information for these purposes in reliance on our legitimate business interests, in order to enter into or perform a contract with you, with your consent, and/or for compliance with our legal obligations."
+                    }
+                ]
+            }
+          ]}
+        />
+      </div>
+      
+      <div id="footer" data-section="footer">
+        <FooterLogoReveal
+          logoText="Glow Theory"
+          leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+          rightLink={{ text: "Home", href: "/" }}
+          className="bg-[--background] text-[--foreground] py-6 px-4"
+          linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+          logoClassName="text-2xl font-bold tracking-tight"
+        />
+      </div>
     </ThemeProvider>
   );
 }
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index 8b9fc77..bfab6af 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 NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
@@ -88,33 +87,31 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="radial-glow"
                 headingFontWeight="medium"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            brandName="Glow Theory"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                            className="py-4 px-6 md:px-8"
-                            buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
-                            buttonTextClassName="font-medium"
-                        />
-                    </div>
-                    <div id="loading-section" data-section="loading-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <p className="text-foreground">Loading product...</p>
-                        </main>
-                    </div>
-                    <div id="footer" data-section="footer">
-                        <FooterLogoReveal
-                            logoText="Glow Theory"
-                            leftLink={{ text: "Customer Support", href: "/#contact-support" }}
-                            rightLink={{ text: "Privacy Policy", href: "/privacy" }}
-                            className="bg-[--background] text-[--foreground] py-6 px-4"
-                            linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
-                            logoClassName="text-2xl font-bold tracking-tight"
-                        />
-                    </div>
-                </ReactLenis>
+                <div id="navbar" data-section="navbar">
+                    <NavbarLayoutFloatingOverlay
+                        brandName="Glow Theory"
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        className="py-4 px-6 md:px-8"
+                        buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+                        buttonTextClassName="font-medium"
+                    />
+                </div>
+                <div id="loading-section" data-section="loading-section">
+                    <main className="min-h-screen flex items-center justify-center pt-20">
+                        <p className="text-foreground">Loading product...</p>
+                    </main>
+                </div>
+                <div id="footer" data-section="footer">
+                    <FooterLogoReveal
+                        logoText="Glow Theory"
+                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                        rightLink={{ text: "Privacy Policy", href: "/privacy" }}
+                        className="bg-[--background] text-[--foreground] py-6 px-4"
+                        linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+                        logoClassName="text-2xl font-bold tracking-tight"
+                    />
+                </div>
             </ThemeProvider>
         );
     }
@@ -133,41 +130,39 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="radial-glow"
                 headingFontWeight="medium"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            brandName="Glow Theory"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                            className="py-4 px-6 md:px-8"
-                            buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
-                            buttonTextClassName="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 text-primary-cta-text"
-                                >
-                                    Back to Shop
-                                </button>
-                            </div>
-                        </main>
-                    </div>
-                    <div id="footer" data-section="footer">
-                        <FooterLogoReveal
-                            logoText="Glow Theory"
-                            leftLink={{ text: "Customer Support", href: "/#contact-support" }}
-                            rightLink={{ text: "Privacy Policy", href: "/privacy" }}
-                            className="bg-[--background] text-[--foreground] py-6 px-4"
-                            linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
-                            logoClassName="text-2xl font-bold tracking-tight"
-                        />
-                    </div>
-                </ReactLenis>
+                <div id="navbar" data-section="navbar">
+                    <NavbarLayoutFloatingOverlay
+                        brandName="Glow Theory"
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        className="py-4 px-6 md:px-8"
+                        buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+                        buttonTextClassName="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 text-primary-cta-text"
+                            >
+                                Back to Shop
+                            </button>
+                        </div>
+                    </main>
+                </div>
+                <div id="footer" data-section="footer">
+                    <FooterLogoReveal
+                        logoText="Glow Theory"
+                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                        rightLink={{ text: "Privacy Policy", href: "/privacy" }}
+                        className="bg-[--background] text-[--foreground] py-6 px-4"
+                        linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+                        logoClassName="text-2xl font-bold tracking-tight"
+                    />
+                </div>
             </ThemeProvider>
         );
     }
@@ -185,64 +180,62 @@ function ProductPageContent({ params }: ProductPageProps) {
             secondaryButtonStyle="radial-glow"
             headingFontWeight="medium"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingOverlay
-                        brandName="Glow Theory"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        className="py-4 px-6 md:px-8"
-                        buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
-                        buttonTextClassName="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>
-                <div id="product-cart" data-section="product-cart">
-                    <ProductCart
-                        isOpen={cartOpen}
-                        onClose={() => setCartOpen(false)}
-                        items={cartItems}
-                        onQuantityChange={updateQuantity}
-                        onRemove={removeItem}
-                        total={`$${cartTotal}`}
-                        buttons={[
-                            {
-                                text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
-                            },
-                        ]}
-                    />
-                </div>
-                <div id="footer" data-section="footer">
-                    <FooterLogoReveal
-                        logoText="Glow Theory"
-                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
-                        rightLink={{ text: "Privacy Policy", href: "/privacy" }}
-                        className="bg-[--background] text-[--foreground] py-6 px-4"
-                        linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
-                        logoClassName="text-2xl font-bold tracking-tight"
-                    />
-                </div>
-            </ReactLenis>
+            <div id="navbar" data-section="navbar">
+                <NavbarLayoutFloatingOverlay
+                    brandName="Glow Theory"
+                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    className="py-4 px-6 md:px-8"
+                    buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+                    buttonTextClassName="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>
+            <div id="product-cart" data-section="product-cart">
+                <ProductCart
+                    isOpen={cartOpen}
+                    onClose={() => setCartOpen(false)}
+                    items={cartItems}
+                    onQuantityChange={updateQuantity}
+                    onRemove={removeItem}
+                    total={`$${cartTotal}`}
+                    buttons={[
+                        {
+                            text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
+                        },
+                    ]}
+                />
+            </div>
+            <div id="footer" data-section="footer">
+                <FooterLogoReveal
+                    logoText="Glow Theory"
+                    leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                    rightLink={{ text: "Privacy Policy", href: "/privacy" }}
+                    className="bg-[--background] text-[--foreground] py-6 px-4"
+                    linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+                    logoClassName="text-2xl font-bold tracking-tight"
+                />
+            </div>
         </ThemeProvider>
     );
 }
\ No newline at end of file
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index fd8ab17..5f79d05 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { Suspense, useCallback } from "react";
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
@@ -58,33 +57,31 @@ function ShopPageContent() {
                 secondaryButtonStyle="radial-glow"
                 headingFontWeight="medium"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            brandName="Glow Theory"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                            className="py-4 px-6 md:px-8"
-                            buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
-                            buttonTextClassName="font-medium"
-                        />
-                    </div>
-                    <div id="loading-section" data-section="loading-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <p className="text-foreground">Loading products...</p>
-                        </main>
-                    </div>
-                    <div id="footer" data-section="footer">
-                        <FooterLogoReveal
-                            logoText="Glow Theory"
-                            leftLink={{ text: "Customer Support", href: "/#contact-support" }}
-                            rightLink={{ text: "Privacy Policy", href: "/privacy" }}
-                            className="bg-[--background] text-[--foreground] py-6 px-4"
-                            linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
-                            logoClassName="text-2xl font-bold tracking-tight"
-                        />
-                    </div>
-                </ReactLenis>
+                <div id="navbar" data-section="navbar">
+                    <NavbarLayoutFloatingOverlay
+                        brandName="Glow Theory"
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        className="py-4 px-6 md:px-8"
+                        buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+                        buttonTextClassName="font-medium"
+                    />
+                </div>
+                <div id="loading-section" data-section="loading-section">
+                    <main className="min-h-screen flex items-center justify-center pt-20">
+                        <p className="text-foreground">Loading products...</p>
+                    </main>
+                </div>
+                <div id="footer" data-section="footer">
+                    <FooterLogoReveal
+                        logoText="Glow Theory"
+                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                        rightLink={{ text: "Privacy Policy", href: "/privacy" }}
+                        className="bg-[--background] text-[--foreground] py-6 px-4"
+                        linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+                        logoClassName="text-2xl font-bold tracking-tight"
+                    />
+                </div>
             </ThemeProvider>
         );
     }
@@ -102,54 +99,52 @@ function ShopPageContent() {
             secondaryButtonStyle="radial-glow"
             headingFontWeight="medium"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingOverlay
-                        brandName="Glow Theory"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        className="py-4 px-6 md:px-8"
-                        buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
-                        buttonTextClassName="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="product-cart" data-section="product-cart">
-                    <ProductCart
-                        isOpen={cartOpen}
-                        onClose={() => setCartOpen(false)}
-                        items={cartItems}
-                        onQuantityChange={updateQuantity}
-                        onRemove={removeItem}
-                        total={`$${cartTotal}`}
-                        buttons={[
-                            {
-                                text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
-                            },
-                        ]}
-                    />
-                </div>
-                <div id="footer" data-section="footer">
-                    <FooterLogoReveal
-                        logoText="Glow Theory"
-                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
-                        rightLink={{ text: "Privacy Policy", href: "/privacy" }}
-                        className="bg-[--background] text-[--foreground] py-6 px-4"
-                        linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
-                        logoClassName="text-2xl font-bold tracking-tight"
-                    />
-                </div>
-            </ReactLenis>
+            <div id="navbar" data-section="navbar">
+                <NavbarLayoutFloatingOverlay
+                    brandName="Glow Theory"
+                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    className="py-4 px-6 md:px-8"
+                    buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+                    buttonTextClassName="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="product-cart" data-section="product-cart">
+                <ProductCart
+                    isOpen={cartOpen}
+                    onClose={() => setCartOpen(false)}
+                    items={cartItems}
+                    onQuantityChange={updateQuantity}
+                    onRemove={removeItem}
+                    total={`$${cartTotal}`}
+                    buttons={[
+                        {
+                            text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
+                        },
+                    ]}
+                />
+            </div>
+            <div id="footer" data-section="footer">
+                <FooterLogoReveal
+                    logoText="Glow Theory"
+                    leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                    rightLink={{ text: "Privacy Policy", href: "/privacy" }}
+                    className="bg-[--background] text-[--foreground] py-6 px-4"
+                    linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+                    logoClassName="text-2xl font-bold tracking-tight"
+                />
+            </div>
         </ThemeProvider>
     );
 }