diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 23953cd..ef2176a 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -1,8 +1,7 @@
 "use client";
 
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
 import { useProductCatalog } from "@/hooks/useProductCatalog";
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
@@ -16,6 +15,17 @@ export default function ShopPage() {
         filters,
     } = useProductCatalog({ basePath: "/shop" });
 
+    const navItems = [
+        { name: "Home", id: "/" },
+        { name: "Shop", id: "/shop" },
+        { name: "Blog", id: "/blog" },
+        { name: "Features", id: "/#features" },
+        { name: "Products", id: "/#products" },
+        { name: "Testimonials", id: "/#testimonials" },
+        { name: "FAQ", id: "/#faq" },
+        { name: "Contact", id: "/#contact" }
+    ];
+
     if (isLoading) {
         return (
             <ThemeProvider
@@ -30,44 +40,42 @@ export default function ShopPage() {
                 secondaryButtonStyle="layered"
                 headingFontWeight="extrabold"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingInline
-                            navItems={[{ name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }, { name: "Features", id: "features" }, { name: "Products", id: "products" }, { name: "Testimonials", id: "testimonials" }, { name: "FAQ", id: "faq" }, { name: "Contact", id: "contact" }]}
-                            brandName="Biorogo"
-                            button={{ text: "Cart", onClick: () => {} }}
-                            className="py-4 px-6 md:px-8 lg:px-12"
-                            navItemClassName="text-foreground hover:text-primary-cta"
-                            buttonClassName=""
-                            buttonTextClassName=""
-                        />
-                    </div>
-                    <div id="loading-indicator" data-section="loading-indicator">
-                        <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">
-                        <FooterBaseCard
-                            logoText="Biorogo"
-                            columns={[
-                                { title: "Shop", items: [{ label: "All Cups", href: "/#products" }, { label: "Ceramic", href: "/#products" }, { label: "Glassware", href: "/#products" }, { label: "Travel Mugs", href: "/#products" }] },
-                                { title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
-                                { title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
-                            ]}
-                            copyrightText="© 2024 Biorogo. All rights reserved."
-                            onPrivacyClick={() => console.log('Privacy policy clicked')}
-                            ariaLabel="Site footer for Biorogo"
-                            className="py-16 md:py-20"
-                            cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
-                            logoTextClassName="text-foreground text-3xl font-extrabold"
-                            columnTitleClassName="text-foreground text-lg font-semibold"
-                            columnItemClassName="text-foreground/80 hover:text-primary-cta"
-                            copyrightTextClassName="text-foreground/60 text-sm"
-                            privacyButtonClassName="text-foreground/60 text-sm hover:text-primary-cta"
-                        />
-                    </div>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    <NavbarLayoutFloatingInline
+                        navItems={navItems}
+                        brandName="Biorogo"
+                        button={{ text: "Cart", onClick: () => {} }}
+                        className="py-4 px-6 md:px-8 lg:px-12"
+                        navItemClassName="text-foreground hover:text-primary-cta"
+                        buttonClassName=""
+                        buttonTextClassName=""
+                    />
+                </div>
+                <div id="loading-indicator" data-section="loading-indicator">
+                    <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">
+                    <FooterBaseCard
+                        logoText="Biorogo"
+                        columns={[
+                            { title: "Shop", items: [{ label: "All Cups", href: "/shop" }, { label: "Ceramic", href: "/shop" }, { label: "Glassware", href: "/shop" }, { label: "Travel Mugs", href: "/shop" }] },
+                            { title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
+                            { title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
+                        ]}
+                        copyrightText="© 2024 Biorogo. All rights reserved."
+                        onPrivacyClick={() => console.log('Privacy policy clicked')}
+                        ariaLabel="Site footer for Biorogo"
+                        className="py-16 md:py-20"
+                        cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
+                        logoTextClassName="text-foreground text-3xl font-extrabold"
+                        columnTitleClassName="text-foreground text-lg font-semibold"
+                        columnItemClassName="text-foreground/80 hover:text-primary-cta"
+                        copyrightTextClassName="text-foreground/60 text-sm"
+                        privacyButtonClassName="text-foreground/60 text-sm hover:text-primary-cta"
+                    />
+                </div>
             </ThemeProvider>
         );
     }
@@ -85,10 +93,9 @@ export default function ShopPage() {
             secondaryButtonStyle="layered"
             headingFontWeight="extrabold"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+            <div id="nav" data-section="nav">
                 <NavbarLayoutFloatingInline
-                    navItems={[{ name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }, { name: "Features", id: "features" }, { name: "Products", id: "products" }, { name: "Testimonials", id: "testimonials" }, { name: "FAQ", id: "faq" }, { name: "Contact", id: "contact" }]}
+                    navItems={navItems}
                     brandName="Biorogo"
                     button={{ text: "Cart", onClick: () => {} }}
                     className="py-4 px-6 md:px-8 lg:px-12"
@@ -96,39 +103,38 @@ export default function ShopPage() {
                     buttonClassName=""
                     buttonTextClassName=""
                 />
-                </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-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">
+                <FooterBaseCard
+                    logoText="Biorogo"
+                    columns={[
+                        { title: "Shop", items: [{ label: "All Cups", href: "/shop" }, { label: "Ceramic", href: "/shop" }, { label: "Glassware", href: "/shop" }, { label: "Travel Mugs", href: "/shop" }] },
+                        { title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
+                        { title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
+                    ]}
+                    copyrightText="© 2024 Biorogo. All rights reserved."
+                    onPrivacyClick={() => console.log('Privacy policy clicked')}
+                    ariaLabel="Site footer for Biorogo"
+                    className="py-16 md:py-20"
+                    cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
+                    logoTextClassName="text-foreground text-3xl font-extrabold"
+                    columnTitleClassName="text-foreground text-lg font-semibold"
+                    columnItemClassName="text-foreground/80 hover:text-primary-cta"
+                    copyrightTextClassName="text-foreground/60 text-sm"
+                    privacyButtonClassName="text-foreground/60 text-sm hover:text-primary-cta"
                 />
-                </div>
-                 <div id="footer" data-section="footer">
-                    <FooterBaseCard
-                        logoText="Biorogo"
-                        columns={[
-                            { title: "Shop", items: [{ label: "All Cups", href: "/#products" }, { label: "Ceramic", href: "/#products" }, { label: "Glassware", href: "/#products" }, { label: "Travel Mugs", href: "/#products" }] },
-                            { title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
-                            { title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
-                        ]}
-                        copyrightText="© 2024 Biorogo. All rights reserved."
-                        onPrivacyClick={() => console.log('Privacy policy clicked')}
-                        ariaLabel="Site footer for Biorogo"
-                        className="py-16 md:py-20"
-                        cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
-                        logoTextClassName="text-foreground text-3xl font-extrabold"
-                        columnTitleClassName="text-foreground text-lg font-semibold"
-                        columnItemClassName="text-foreground/80 hover:text-primary-cta"
-                        copyrightTextClassName="text-foreground/60 text-sm"
-                        privacyButtonClassName="text-foreground/60 text-sm hover:text-primary-cta"
-                    />
-                </div>
-            </ReactLenis>
+            </div>
         </ThemeProvider>
     );
 }