diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index ea17d99..307a411 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -35,6 +35,66 @@ export default function ShopPage() {
             >
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
+                        <NavbarLayoutFloatingInline
+                            brandName="McLaren Labs"
+                            navItems={[
+                                { name: "Home", id: "/" },
+                                { name: "What We Do", id: "about" },
+                                { name: "Work", id: "case-studies" },
+                                { name: "Contact", id: "contact" },
+                                { name: "Shop", id: "/shop" }
+                            ]}
+                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        />
+                    </div>
+                    <main className="min-h-screen flex items-center justify-center pt-20">
+                        <p className="text-foreground">Loading products...</p>
+                    </main>
+                    <div id="footer" data-section="footer">
+                        <FooterLogoEmphasis
+                            logoText="McLaren Labs"
+                            columns={[
+                                {
+                                    items: [
+                                        { label: "Home", href: "hero" },
+                                        { label: "Our Approach", href: "about" }
+                                    ]
+                                },
+                                {
+                                    items: [
+                                        { label: "Case Studies", href: "case-studies" },
+                                        { label: "Contact", href: "contact" }
+                                    ]
+                                },
+                                {
+                                    items: [
+                                        { label: "Privacy", href: "https://example.com/privacy" },
+                                        { label: "Terms", href: "https://example.com/terms" }
+                                    ]
+                                }
+                            ]}
+                        />
+                    </div>
+                </ReactLenis>
+            </ThemeProvider>
+        );
+    }
+
+    return (
+        <ThemeProvider
+            defaultButtonVariant="slide-background"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="pill"
+            contentWidth="medium"
+            sizing="mediumLargeSizeMediumTitles"
+            background="floatingGradient"
+            cardStyle="subtle-shadow"
+            primaryButtonStyle="inset-glow"
+            secondaryButtonStyle="solid"
+            headingFontWeight="semibold"
+        >
+            <ReactLenis root>
+                <div id="navbar" data-section="navbar">
                     <NavbarLayoutFloatingInline
                         brandName="McLaren Labs"
                         navItems={[
@@ -46,11 +106,19 @@ export default function ShopPage() {
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading products...</p>
-                    </main>
-                    <div id="footer" data-section="footer">
+                </div>
+                <div id="productCatalog" data-section="productCatalog">
+                    <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">
                     <FooterLogoEmphasis
                         logoText="McLaren Labs"
                         columns={[
@@ -74,74 +142,6 @@ export default function ShopPage() {
                             }
                         ]}
                     />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
-    return (
-        <ThemeProvider
-            defaultButtonVariant="slide-background"
-            defaultTextAnimation="entrance-slide"
-            borderRadius="pill"
-            contentWidth="medium"
-            sizing="mediumLargeSizeMediumTitles"
-            background="floatingGradient"
-            cardStyle="subtle-shadow"
-            primaryButtonStyle="inset-glow"
-            secondaryButtonStyle="solid"
-            headingFontWeight="semibold"
-        >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                <NavbarLayoutFloatingInline
-                    brandName="McLaren Labs"
-                    navItems={[
-                        { name: "Home", id: "/" },
-                        { name: "What We Do", id: "about" },
-                        { name: "Work", id: "case-studies" },
-                        { name: "Contact", id: "contact" },
-                        { name: "Shop", id: "/shop" }
-                    ]}
-                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                />
-                </div>
-                <div id="productCatalog" data-section="productCatalog">
-                <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">
-                <FooterLogoEmphasis
-                    logoText="McLaren Labs"
-                    columns={[
-                        {
-                            items: [
-                                { label: "Home", href: "hero" },
-                                { label: "Our Approach", href: "about" }
-                            ]
-                        },
-                        {
-                            items: [
-                                { label: "Case Studies", href: "case-studies" },
-                                { label: "Contact", href: "contact" }
-                            }
-                        },
-                        {
-                            items: [
-                                { label: "Privacy", href: "https://example.com/privacy" },
-                                { label: "Terms", href: "https://example.com/terms" }
-                            }
-                        }
-                    ]}
-                />
                 </div>
             </ReactLenis>
         </ThemeProvider>