diff --git a/.deco/blocks/pages-home-c4bcbfb771e9.json b/.deco/blocks/pages-home-c4bcbfb771e9.json
index d8781c51..405ffccd 100644
--- a/.deco/blocks/pages-home-c4bcbfb771e9.json
+++ b/.deco/blocks/pages-home-c4bcbfb771e9.json
@@ -44,145 +44,163 @@
       "preload": true
     },
     {
-      "__resolveType": "site/sections/Product/ProductShelf.tsx",
-      "title": "Featured Products",
-      "cta": "/mono",
-      "products": {
-        "__resolveType": "shopify/loaders/ProductList.ts",
-        "props": {
-          "sort": "",
-          "count": 12,
-          "query": "a"
-        },
-        "filters": {
-          "tags": [],
-          "productTypes": [],
-          "productVendors": [],
-          "variantOptions": []
+      "__resolveType": "website/sections/Rendering/SingleDeferred.tsx",
+      "section": {
+        "__resolveType": "site/sections/Product/ProductShelf.tsx",
+        "title": "Featured Products",
+        "cta": "/mono",
+        "products": {
+          "__resolveType": "shopify/loaders/ProductList.ts",
+          "props": {
+            "sort": "",
+            "count": 12,
+            "query": "a"
+          },
+          "filters": {
+            "tags": [],
+            "productTypes": [],
+            "productVendors": [],
+            "variantOptions": []
+          }
         }
       }
     },
     {
-      "__resolveType": "site/sections/Category/CategoryGrid.tsx",
-      "title": "Departments",
-      "cta": "/all",
-      "items": [
-        {
-          "label": "Men",
-          "href": "/men",
-          "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/38c33c9f-14a1-4048-973b-dc2a75caf1fa"
-        },
-        {
-          "href": "/women",
-          "label": "Women",
-          "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/f6bea2b8-b248-4b42-9246-6e924a0acc8b"
-        },
-        {
-          "href": "/kids",
-          "label": "Kids",
-          "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/1b0ecaa2-9a13-4de2-bf17-5196948ed128"
-        },
-        {
-          "href": "/accessories",
-          "label": "Accessories",
-          "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/92129655-fe40-4b29-8fdb-e7f71e67a5d1"
-        },
-        {
-          "href": "/home-and-living",
-          "label": "Home & Living",
-          "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/d0433c00-cd26-4638-b519-0cb64b9f82e8"
-        }
-      ]
+      "__resolveType": "website/sections/Rendering/SingleDeferred.tsx",
+      "section": {
+        "__resolveType": "site/sections/Category/CategoryGrid.tsx",
+        "title": "Departments",
+        "cta": "/all",
+        "items": [
+          {
+            "label": "Men",
+            "href": "/men",
+            "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/38c33c9f-14a1-4048-973b-dc2a75caf1fa"
+          },
+          {
+            "href": "/women",
+            "label": "Women",
+            "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/f6bea2b8-b248-4b42-9246-6e924a0acc8b"
+          },
+          {
+            "href": "/kids",
+            "label": "Kids",
+            "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/1b0ecaa2-9a13-4de2-bf17-5196948ed128"
+          },
+          {
+            "href": "/accessories",
+            "label": "Accessories",
+            "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/92129655-fe40-4b29-8fdb-e7f71e67a5d1"
+          },
+          {
+            "href": "/home-and-living",
+            "label": "Home & Living",
+            "image": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/d0433c00-cd26-4638-b519-0cb64b9f82e8"
+          }
+        ]
+      }
     },
     {
-      "__resolveType": "site/sections/Images/Banner.tsx",
-      "title": "Register and Save Big!",
-      "cta": {
-        "label": "Sign Up",
-        "href": "#"
-      },
-      "description": "<p><span style=\"color: rgb(45, 194, 107);\" data-mce-style=\"color: rgb(45, 194, 107);\">Sign up now to get up to 50% off on your first order. Limited time offer!</span></p>",
-      "images": {
-        "desktop": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/cf96d47f-564f-40da-ad94-7acac5f39327",
-        "mobile": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/4d5c3212-3f75-4d50-89f3-970815748b43"
+      "__resolveType": "website/sections/Rendering/SingleDeferred.tsx",
+      "section": {
+        "__resolveType": "site/sections/Images/Banner.tsx",
+        "title": "Register and Save Big!",
+        "cta": {
+          "label": "Sign Up",
+          "href": "#"
+        },
+        "description": "<p><span style=\"color: rgb(45, 194, 107);\" data-mce-style=\"color: rgb(45, 194, 107);\">Sign up now to get up to 50% off on your first order. Limited time offer!</span></p>",
+        "images": {
+          "desktop": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/cf96d47f-564f-40da-ad94-7acac5f39327",
+          "mobile": "https://ozksgdmyrqcxcwhnbepg.supabase.co/storage/v1/object/public/assets/2177/4d5c3212-3f75-4d50-89f3-970815748b43"
+        }
       }
     },
     {
-      "__resolveType": "site/sections/Product/ProductShelfTabbed.tsx",
-      "title": "Hottest Deals",
-      "tabs": [
-        {
-          "products": {
-            "__resolveType": "shopify/loaders/ProductList.ts",
-            "props": {
-              "sort": "",
-              "query": "hat and bag",
-              "count": 10
+      "__resolveType": "website/sections/Rendering/SingleDeferred.tsx",
+      "section": {
+        "__resolveType": "site/sections/Product/ProductShelfTabbed.tsx",
+        "title": "Hottest Deals",
+        "tabs": [
+          {
+            "products": {
+              "__resolveType": "shopify/loaders/ProductList.ts",
+              "props": {
+                "sort": "",
+                "query": "hat and bag",
+                "count": 10
+              },
+              "filters": {
+                "tags": [],
+                "productTypes": [],
+                "productVendors": [],
+                "variantOptions": []
+              }
             },
-            "filters": {
-              "tags": [],
-              "productTypes": [],
-              "productVendors": [],
-              "variantOptions": []
-            }
+            "title": "Accessories"
           },
-          "title": "Accessories"
-        },
-        {
-          "products": {
-            "__resolveType": "shopify/loaders/ProductList.ts",
-            "props": {
-              "sort": "",
-              "query": "Shirts",
-              "count": 10
+          {
+            "products": {
+              "__resolveType": "shopify/loaders/ProductList.ts",
+              "props": {
+                "sort": "",
+                "query": "Shirts",
+                "count": 10
+              },
+              "filters": {
+                "tags": [],
+                "productTypes": [],
+                "productVendors": [],
+                "variantOptions": []
+              }
             },
-            "filters": {
-              "tags": [],
-              "productTypes": [],
-              "productVendors": [],
-              "variantOptions": []
-            }
+            "title": "Fashion"
           },
-          "title": "Fashion"
-        },
-        {
-          "products": {
-            "__resolveType": "shopify/loaders/ProductList.ts",
-            "props": {
-              "sort": "",
-              "query": "stickers",
-              "count": 10
+          {
+            "products": {
+              "__resolveType": "shopify/loaders/ProductList.ts",
+              "props": {
+                "sort": "",
+                "query": "stickers",
+                "count": 10
+              },
+              "filters": {
+                "tags": [],
+                "productTypes": [],
+                "productVendors": [],
+                "variantOptions": []
+              }
             },
-            "filters": {
-              "tags": [],
-              "productTypes": [],
-              "productVendors": [],
-              "variantOptions": []
-            }
-          },
-          "title": "Stickers"
-        }
-      ]
+            "title": "Stickers"
+          }
+        ]
+      }
     },
     {
-      "__resolveType": "site/sections/Newsletter/Newsletter.tsx",
-      "label": "Sign up",
-      "placeholder": "Email address",
-      "empty": {
-        "title": "Get top deals, latest trends, and more.",
-        "description": "Receive our news and promotions in advance. Enjoy and get 10% off your first purchase. For more information click here."
-      },
-      "success": {
-        "title": "Thank you for subscribing!",
-        "description": "You’re now signed up to receive the latest news, trends, and exclusive promotions directly to your inbox. Stay tuned!"
-      },
-      "failed": {
-        "title": "Oops!. Something went wrong!",
-        "description": "Something went wrong. Please try again. If the problem persists, please contact us."
+      "__resolveType": "website/sections/Rendering/SingleDeferred.tsx",
+      "section": {
+        "__resolveType": "site/sections/Newsletter/Newsletter.tsx",
+        "label": "Sign up",
+        "placeholder": "Email address",
+        "empty": {
+          "title": "Get top deals, latest trends, and more.",
+          "description": "Receive our news and promotions in advance. Enjoy and get 10% off your first purchase. For more information click here."
+        },
+        "success": {
+          "title": "Thank you for subscribing!",
+          "description": "You’re now signed up to receive the latest news, trends, and exclusive promotions directly to your inbox. Stay tuned!"
+        },
+        "failed": {
+          "title": "Oops!. Something went wrong!",
+          "description": "Something went wrong. Please try again. If the problem persists, please contact us."
+        }
       }
     },
     {
-      "__resolveType": "Footer"
+      "__resolveType": "website/sections/Rendering/SingleDeferred.tsx",
+      "section": {
+        "__resolveType": "Footer"
+      }
     }
   ],
   "__resolveType": "website/pages/Page.tsx",
diff --git a/sections/Product/ProductShelf.tsx b/sections/Product/ProductShelf.tsx
index 5e4e6923..e4e108c6 100644
--- a/sections/Product/ProductShelf.tsx
+++ b/sections/Product/ProductShelf.tsx
@@ -34,24 +34,20 @@ export default function ProductShelf({ products, title, cta }: Props) {
   });
 
   return (
-    <Section.Container
-      {...viewItemListEvent}
-      class="[view-transition-name:loading-fallback-2]"
-    >
+    <Section.Container {...viewItemListEvent}>
       <Section.Header title={title} cta={cta} />
-
       <ProductSlider products={products} itemListName={title} />
     </Section.Container>
   );
 }
 
-export function LoadingFallback() {
+export function LoadingFallback({ title, cta }: Partial<Props>) {
   return (
-    <div
-      style={{ height: "716px" }}
-      class="flex justify-center items-center [view-transition-name:loading-fallback-2]"
-    >
-      <span class="loading loading-spinner" />
-    </div>
+    <Section.Container>
+      <Section.Header title={title} cta={cta} />
+      <div style={{ height: "648px" }} class="flex justify-center items-center">
+        <span class="loading loading-spinner" />
+      </div>
+    </Section.Container>
   );
 }
diff --git a/sections/Product/ProductShelfTabbed.tsx b/sections/Product/ProductShelfTabbed.tsx
index f8f7b075..aec6f5e5 100644
--- a/sections/Product/ProductShelfTabbed.tsx
+++ b/sections/Product/ProductShelfTabbed.tsx
@@ -63,10 +63,19 @@ export default function TabbedProductShelf(
   );
 }
 
-export function LoadingFallback() {
+export function LoadingFallback({ title, cta }: Partial<Props>) {
   return (
-    <div style={{ height: "716px" }} class="flex justify-center items-center">
-      <span class="loading loading-spinner" />
-    </div>
+    <Section.Container>
+      <Section.Header title={title} cta={cta} />
+
+      <Section.Tabbed>
+        <div
+          style={{ height: "648px" }}
+          class="flex justify-center items-center"
+        >
+          <span class="loading loading-spinner" />
+        </div>
+      </Section.Tabbed>
+    </Section.Container>
   );
 }