diff --git a/partials/content.hbs b/partials/content.hbs
index 3492401..f87c870 100644
--- a/partials/content.hbs
+++ b/partials/content.hbs
@@ -22,39 +22,7 @@
             {{/is}}
 
             <h1 class="single-title">{{title}}</h1>
-
-
-<div id="total-rose-ash-shop-ws"></div>
-<div hx-ext="ws" ws-connect="shop-ws/ws-total"></div>
-<div
-    id="total-rose-ash-shop"
-    hx-gett="shop/orders/total"
-    hx-trigger="load delay:1ms, configured from:body, ordered from:body delay:1ms, paid from:body"
-    hx-swap="innerHTML"
-  >
-  </div>
-  <div
-    id="order-form-rose-ash-shop"
-    hx-get="order"
-    hx-trigger="load delay:1ms"
-    hx-on::config-request = "event.detail.path = !(new URLSearchParams(window.location.search).get('order')) ? 'shop/order/?embed=true' : 'shop/order/?embed=true&orderId=' + new URLSearchParams(window.location.search).get('order');" 
-    hx-swap="outerHTML"
-    >
-    <div class="spinner-border" role="status">
-        <span class="sr-only">Loading...</span>
-    </div>
-  </div>
-  <div
-    id="order-detail-rose-ash-shop"
-    hx-get="order"
-    hx-trigger="load delay:1ms, paid from:body"
-    hx-on::config-request="event.detail.path = new URLSearchParams(window.location.search).get('order') ? 'shop/order/' + new URLSearchParams(window.location.search).get('order')+ '/?embed=true' : null; //6a919002-94eb-467d-a226-5dd05b7f44a3 '"
-    hx-on::confirm = " if (!new URLSearchParams(window.location.search).get('order')) { event.preventDefault(); }" 
-    hx-swap="innerHTML"
-  >
-  </div>
-
-
+            {{> "shop-top"}}
             {{#if custom_excerpt}}
                 <div class="single-excerpt">
                     {{custom_excerpt}}
diff --git a/partials/shop-top.hbs b/partials/shop-top.hbs
new file mode 100644
index 0000000..3c7ea04
--- /dev/null
+++ b/partials/shop-top.hbs
@@ -0,0 +1,30 @@
+
+            <div id="total-rose-ash-shop-ws"></div>
+            <div hx-ext="ws" ws-connect="shop-ws/ws-total"></div>
+            <div
+            id="order-form-rose-ash-shop"
+            hx-get="order"
+            hx-trigger="load delay:1ms"
+            hx-on::config-request = "
+                event.detail.path = !(
+                    new URLSearchParams(window.location.search
+                ).get('order'))
+                    ? 'shop/order/?embed=true' 
+                    : 'shop/order/?embed=true&orderId=' + new URLSearchParams(window.location.search).get('order');
+                ";
+            hx-swap="outerHTML"
+            >
+            <div class="spinner-border" role="status">
+                <span class="sr-only">Loading...</span>
+            </div>
+            </div>
+            <div
+            id="order-detail-rose-ash-shop"
+            hx-get="order"
+            hx-trigger="load delay:1ms"
+            hx-on::config-request="event.detail.path = new URLSearchParams(window.location.search).get('order') ? 'shop/order/' + new URLSearchParams(window.location.search).get('order')+ '/?embed=true' : null; //6a919002-94eb-467d-a226-5dd05b7f44a3 '"
+            hx-on::confirm = " if (!new URLSearchParams(window.location.search).get('order')) { event.preventDefault(); }" 
+            hx-swap="innerHTML"
+            >
+            </div>
+