diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 5ffa09c..b3c34fc 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -65,7 +65,7 @@ export default function BlogPage() {
                 ) : (
                     <div id="blog" data-section="blog" className="min-h-screen">
                         <BlogCardTwo
-                            items={posts}
+                            posts={posts}
                             title="Latest Articles"
                             description="Insights and updates from our team"
                             animationType="slide-up"
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index d932ade..170dff1 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -88,93 +88,70 @@ function ProductPageContent({ params }: ProductPageProps) {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
-    if (isLoading) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="bounce-effect"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="rounded"
-                contentWidth="small"
-                sizing="largeSmall"
-                background="grid"
-                cardStyle="layered-gradient"
-                primaryButtonStyle="diagonal-gradient"
-                secondaryButtonStyle="radial-glow"
-                headingFontWeight="normal"
-            >
-                <ReactLenis root>
-                    <div id="nav" data-section="nav">
-                    <NavbarStyleFullscreen
-                        navItems={navItems}
-                        brandName="Carter Brothers"
-                        bottomLeftText="Your Trusted Roofing Partner"
-                        bottomRightText="(859) 350-6500"
-                    />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <div id="loading-section" data-section="loading-section">
-                            <p className="text-foreground">Loading product...</p>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBaseReveal
-                            columns={footerColumns}
-                            copyrightText="© 2024 Carter Brothers Roof Repair. All rights reserved."
-                            ariaLabel="Footer section"
-                            className="py-8"
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
+    let content;
 
-    if (!product) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="bounce-effect"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="rounded"
-                contentWidth="small"
-                sizing="largeSmall"
-                background="grid"
-                cardStyle="layered-gradient"
-                primaryButtonStyle="diagonal-gradient"
-                secondaryButtonStyle="radial-glow"
-                headingFontWeight="normal"
-            >
-                <ReactLenis root>
-                    <div id="nav" data-section="nav">
-                        <NavbarStyleFullscreen
-                            navItems={navItems}
-                            brandName="Carter Brothers"
-                            bottomLeftText="Your Trusted Roofing Partner"
-                            bottomRightText="(859) 350-6500"
-                        />
+    if (isLoading) {
+        content = (
+            <main className="min-h-screen flex items-center justify-center pt-20">
+                <div id="loading-section" data-section="loading-section">
+                    <p className="text-foreground">Loading product...</p>
+                </div>
+            </main>
+        );
+    } else if (!product) {
+        content = (
+             <main className="min-h-screen flex items-center justify-center pt-20">
+                <div id="not-found-section" data-section="not-found-section">
+                    <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 className="min-h-screen flex items-center justify-center pt-20">
-                        <div id="not-found-section" data-section="not-found-section">
-                            <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>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBaseReveal
-                            columns={footerColumns}
-                            copyrightText="© 2024 Carter Brothers Roof Repair. All rights reserved."
-                            ariaLabel="Footer section"
-                            className="py-8"
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
+                </div>
+            </main>
+        );
+    } else {
+        content = (
+            <>
+                <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}`}
+                    buttons={[
+                        {
+                            text: isCheckoutLoading ? "Processing..." : "Check Out",                            onClick: handleCheckout,
+                        },
+                    ]}
+                />
+            </>
         );
     }
 
@@ -193,49 +170,14 @@ function ProductPageContent({ params }: ProductPageProps) {
         >
             <ReactLenis root>
                 <div id="nav" data-section="nav">
-                <NavbarStyleFullscreen
-                    navItems={navItems}
-                    brandName="Carter Brothers"
-                    bottomLeftText="Your Trusted Roofing Partner"
-                    bottomRightText="(859) 350-6500"
-                />
-                </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,
-                        },
-                    ]}
-                />
+                    <NavbarStyleFullscreen
+                        navItems={navItems}
+                        brandName="Carter Brothers"
+                        bottomLeftText="Your Trusted Roofing Partner"
+                        bottomRightText="(859) 350-6500"
+                    />
                 </div>
+                {content}
                 <div id="footer" data-section="footer">
                     <FooterBaseReveal
                         columns={footerColumns}
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 36b1b37..580f1b3 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -30,47 +30,6 @@ function ShopPageContent() {
         filters,
     } = useProductCatalog({ basePath: "/shop" });
 
-    if (isLoading) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="bounce-effect"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="rounded"
-                contentWidth="small"
-                sizing="largeSmall"
-                background="grid"
-                cardStyle="layered-gradient"
-                primaryButtonStyle="diagonal-gradient"
-                secondaryButtonStyle="radial-glow"
-                headingFontWeight="normal"
-            >
-                <ReactLenis root>
-                    <div id="nav" data-section="nav">
-                    <NavbarStyleFullscreen
-                        navItems={navItems}
-                        brandName="Carter Brothers"
-                        bottomLeftText="Your Trusted Roofing Partner"
-                        bottomRightText="(859) 350-6500"
-                    />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <div id="loading-section" data-section="loading-section">
-                            <p className="text-foreground">Loading products...</p>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBaseReveal
-                            columns={footerColumns}
-                            copyrightText="© 2024 Carter Brothers Roof Repair. All rights reserved."
-                            ariaLabel="Footer section"
-                            className="py-8"
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
     return (
         <ThemeProvider
             defaultButtonVariant="bounce-effect"
@@ -93,17 +52,25 @@ function ShopPageContent() {
                     bottomRightText="(859) 350-6500"
                 />
                 </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>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    {isLoading ? (
+                         <div id="loading-section" data-section="loading-section">
+                            <p className="text-foreground">Loading products...</p>
+                        </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>
+                    )}
+                </main>
                 <div id="footer" data-section="footer">
                     <FooterBaseReveal
                         columns={footerColumns}