diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
index c6bfeaf83..7898da93b 100644
--- a/locale/defaultMessages.json
+++ b/locale/defaultMessages.json
@@ -4212,19 +4212,23 @@
   "src_dot_orders_dot_views_dot_OrderDetails_dot_55607988": {
     "string": "Invoice is Generating"
   },
-  "src_dot_orders_dot_views_dot_OrderDetails_dot_580490159": {
-    "context": "window title",
-    "string": "Order #{orderNumber}"
-  },
   "src_dot_orders_dot_views_dot_OrderDetails_dot_617145655": {
     "string": "Shipping method successfully updated"
   },
-  "src_dot_orders_dot_views_dot_OrderDetails_dot_694622335": {
+  "src_dot_orders_dot_views_dot_OrderDetails_dot_927945225": {
+    "string": "Fulfillment successfully cancelled"
+  },
+  "src_dot_orders_dot_views_dot_OrderDetails_dot_OrderDraftDetails_dot_694622335": {
     "context": "window title",
     "string": "Draft Order #{orderNumber}"
   },
-  "src_dot_orders_dot_views_dot_OrderDetails_dot_927945225": {
-    "string": "Fulfillment successfully cancelled"
+  "src_dot_orders_dot_views_dot_OrderDetails_dot_OrderNormalDetails_dot_580490159": {
+    "context": "window title",
+    "string": "Order #{orderNumber}"
+  },
+  "src_dot_orders_dot_views_dot_OrderDetails_dot_OrderUnconfirmedDetails_dot_580490159": {
+    "context": "window title",
+    "string": "Order #{orderNumber}"
   },
   "src_dot_orders_dot_views_dot_OrderDraftList_dot_1161115149": {
     "context": "dialog header",
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index c8a2fc495..7b216054b 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -125634,7 +125634,7 @@ exports[`Storyshots Views / Orders / Order draft default 1`] = `
                   >
                     <form>
                       <div
-                        class="MuiFormControl-root-id MuiTextField-root-id OrderDraftDetailsProducts-quantityField-id MuiFormControl-fullWidth-id"
+                        class="MuiFormControl-root-id MuiTextField-root-id TableLineForm-quantityField-id MuiFormControl-fullWidth-id"
                       >
                         <div
                           class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
@@ -125668,12 +125668,16 @@ exports[`Storyshots Views / Orders / Order draft default 1`] = `
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colPrice-id"
                   >
-                    $65.95
+                    <a
+                      class="MuiTypography-root-id Link-root-id Link-primary-id MuiTypography-body1-id"
+                    >
+                      $168.30
+                    </a>
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colTotal-id"
                   >
-                    $131.90
+                    $336.60
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colAction-id"
@@ -125738,7 +125742,7 @@ exports[`Storyshots Views / Orders / Order draft default 1`] = `
                   >
                     <form>
                       <div
-                        class="MuiFormControl-root-id MuiTextField-root-id OrderDraftDetailsProducts-quantityField-id MuiFormControl-fullWidth-id"
+                        class="MuiFormControl-root-id MuiTextField-root-id TableLineForm-quantityField-id MuiFormControl-fullWidth-id"
                       >
                         <div
                           class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
@@ -125772,12 +125776,16 @@ exports[`Storyshots Views / Orders / Order draft default 1`] = `
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colPrice-id"
                   >
-                    $68.20
+                    <a
+                      class="MuiTypography-root-id Link-root-id Link-primary-id MuiTypography-body1-id"
+                    >
+                      $168.30
+                    </a>
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colTotal-id"
                   >
-                    $136.40
+                    $336.60
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colAction-id"
@@ -126223,86 +126231,10 @@ exports[`Storyshots Views / Orders / Order draft loading 1`] = `
                   class="MuiTableRow-root-id"
                 >
                   <td
-                    class="MuiTableCell-root-id MuiTableCell-body-id TableCellAvatar-root-id OrderDraftDetailsProducts-colName-id"
+                    class="MuiTableCell-root-id MuiTableCell-body-id"
+                    colspan="5"
                   >
-                    <div
-                      class="TableCellAvatar-content-id"
-                    >
-                      <div
-                        class="MuiAvatar-root-id MuiAvatar-circle-id TableCellAvatar-avatar-id MuiAvatar-colorDefault-id"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
-                          focusable="false"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            d="M19 8l-4 4h3c0 3.31-2.69 6-6 6-1.01 0-1.97-.25-2.8-.7l-1.46 1.46C8.97 19.54 10.43 20 12 20c4.42 0 8-3.58 8-8h3l-4-4zM6 12c0-3.31 2.69-6 6-6 1.01 0 1.97.25 2.8.7l1.46-1.46C15.03 4.46 13.57 4 12 4c-4.42 0-8 3.58-8 8H1l4 4 4-4H6z"
-                          />
-                        </svg>
-                      </div>
-                      <div
-                        class="TableCellAvatar-children-id"
-                      >
-                        <span
-                          class="Skeleton-skeleton-id"
-                        >
-                          ‌
-                        </span>
-                      </div>
-                    </div>
-                  </td>
-                  <td
-                    class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colQuantity-id"
-                  >
-                    <span
-                      class="Skeleton-skeleton-id"
-                    >
-                      ‌
-                    </span>
-                  </td>
-                  <td
-                    class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colPrice-id"
-                  >
-                    <span
-                      class="Skeleton-skeleton-id"
-                    >
-                      ‌
-                    </span>
-                  </td>
-                  <td
-                    class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colTotal-id"
-                  >
-                    <span
-                      class="Skeleton-skeleton-id"
-                    >
-                      ‌
-                    </span>
-                  </td>
-                  <td
-                    class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colAction-id"
-                  >
-                    <button
-                      class="MuiButtonBase-root-id MuiIconButton-root-id"
-                      tabindex="0"
-                      type="button"
-                    >
-                      <span
-                        class="MuiIconButton-label-id"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="MuiSvgIcon-root-id MuiSvgIcon-colorPrimary-id"
-                          focusable="false"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
-                          />
-                        </svg>
-                      </span>
-                    </button>
+                    No Products added to Order
                   </td>
                 </tr>
               </tbody>
@@ -126679,7 +126611,7 @@ exports[`Storyshots Views / Orders / Order draft no user permissions 1`] = `
                   >
                     <form>
                       <div
-                        class="MuiFormControl-root-id MuiTextField-root-id OrderDraftDetailsProducts-quantityField-id MuiFormControl-fullWidth-id"
+                        class="MuiFormControl-root-id MuiTextField-root-id TableLineForm-quantityField-id MuiFormControl-fullWidth-id"
                       >
                         <div
                           class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
@@ -126713,12 +126645,16 @@ exports[`Storyshots Views / Orders / Order draft no user permissions 1`] = `
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colPrice-id"
                   >
-                    $65.95
+                    <a
+                      class="MuiTypography-root-id Link-root-id Link-primary-id MuiTypography-body1-id"
+                    >
+                      $168.30
+                    </a>
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colTotal-id"
                   >
-                    $131.90
+                    $336.60
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colAction-id"
@@ -126783,7 +126719,7 @@ exports[`Storyshots Views / Orders / Order draft no user permissions 1`] = `
                   >
                     <form>
                       <div
-                        class="MuiFormControl-root-id MuiTextField-root-id OrderDraftDetailsProducts-quantityField-id MuiFormControl-fullWidth-id"
+                        class="MuiFormControl-root-id MuiTextField-root-id TableLineForm-quantityField-id MuiFormControl-fullWidth-id"
                       >
                         <div
                           class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
@@ -126817,12 +126753,16 @@ exports[`Storyshots Views / Orders / Order draft no user permissions 1`] = `
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colPrice-id"
                   >
-                    $68.20
+                    <a
+                      class="MuiTypography-root-id Link-root-id Link-primary-id MuiTypography-body1-id"
+                    >
+                      $168.30
+                    </a>
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colTotal-id"
                   >
-                    $136.40
+                    $336.60
                   </td>
                   <td
                     class="MuiTableCell-root-id MuiTableCell-body-id OrderDraftDetailsProducts-colAction-id"