diff --git a/public/index.html b/public/index.html
index 16abb051..13dc5cb7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,18 +1,19 @@
-
 <!DOCTYPE html>
 <html lang="en">
   <head>
-  <meta charset='utf-8'>
-  <meta name='viewport' content='width=device-width, initial-scale=1'>
-    <meta name="description" content="Enki Jewellery & Craft Gallery shop in Kings Heath, Birmingham, UK">
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta
+      name="description"
+      content="Enki Jewellery & Craft Gallery shop in Kings Heath, Birmingham, UK"
+    />
     <title>Enki</title>
-    
-    <link rel='icon' type='image/png' href='/favicon.png'>
-    <link rel='stylesheet' href='/global.css'>
-    <link rel='stylesheet' href='/build/bundle-1637781279741.css'>
-    
-    <script defer src='/build/bundle-1637781279741.js'></script>
+
+    <link rel="icon" type="image/png" href="/favicon.png" />
+    <link rel="stylesheet" href="/global.css" />
+    <link rel="stylesheet" href="/build/bundle-1637781279741.css" />
+
+    <script defer src="/build/bundle-1637781279741.js"></script>
   </head>
-  <body>
-  </body>
-</html>
\ No newline at end of file
+  <body></body>
+</html>
diff --git a/src/components/ProductView/ProductView.svelte b/src/components/ProductView/ProductView.svelte
index 5c04a7be..3ec1b437 100644
--- a/src/components/ProductView/ProductView.svelte
+++ b/src/components/ProductView/ProductView.svelte
@@ -21,32 +21,34 @@
   }
 </script>
 
-{#if variantArr.length}
-  {#each groupedVariantProducts as variants (variants)}
+{#if productArr}
+  {#if variantArr.length}
+    {#each groupedVariantProducts as variants (variants)}
+      <div
+        in:fade={{ delay: 500 }}
+        class={showDetailedView
+          ? 'detailed-products-container'
+          : 'products-container'}
+      >
+        {#each variants as variant (variant)}
+          <SingleProduct product={variant} />
+        {/each}
+      </div>
+    {/each}
+  {:else}
     <div
       in:fade={{ delay: 500 }}
       class={showDetailedView
         ? 'detailed-products-container'
         : 'products-container'}
     >
-      {#each variants as variant (variant)}
-        <SingleProduct product={variant} />
-      {/each}
+      {#if nonVariantArr.length}
+        {#each nonVariantArr as product}
+          <SingleProduct {product} {showDetailedView} />
+        {/each}
+      {/if}
     </div>
-  {/each}
-{:else}
-  <div
-    in:fade={{ delay: 500 }}
-    class={showDetailedView
-      ? 'detailed-products-container'
-      : 'products-container'}
-  >
-    {#if nonVariantArr.length}
-      {#each nonVariantArr as product}
-        <SingleProduct {product} {showDetailedView} />
-      {/each}
-    {/if}
-  </div>
+  {/if}
 {/if}
 
 <style>
