@almadar/std 8.3.0 → 8.4.1

package/dist/behaviors/registry/service/organisms/std-service-marketplace.orb

@@ -643,8 +643,8 @@
                     "Product",
                     {
                       "emit": {
-                        "failure": "ProductLoadFailed",
-                        "success": "ProductLoaded"
+                        "success": "ProductLoaded",
+                        "failure": "ProductLoadFailed"
                       }
                     }
                   ],
@@ -652,22 +652,22 @@
                     "render-ui",
                     "main",
                     {
+                      "direction": "vertical",
+                      "className": "py-12",
                       "gap": "md",
-                      "type": "stack",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "color": "muted",
-                          "type": "typography",
                           "content": "Loading…",
-                          "variant": "caption"
+                          "variant": "caption",
+                          "type": "typography",
+                          "color": "muted"
                         }
                       ],
-                      "direction": "vertical",
-                      "align": "center",
-                      "className": "py-12"
+                      "type": "stack",
+                      "align": "center"
                     }
                   ]
                 ]
@@ -683,75 +683,74 @@
                     {
                       "children": [
                         {
+                          "type": "stack",
                           "direction": "vertical",
                           "className": "max-w-5xl mx-auto w-full",
-                          "type": "stack",
-                          "gap": "lg",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "horizontal",
-                              "align": "center",
-                              "justify": "between",
                               "children": [
                                 {
-                                  "type": "stack",
                                   "align": "center",
                                   "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "shopping-bag"
+                                      "name": "shopping-bag",
+                                      "type": "icon"
                                     },
                                     {
-                                      "content": "Products",
                                       "type": "typography",
+                                      "content": "Products",
                                       "variant": "h2"
                                     }
                                   ],
+                                  "type": "stack",
                                   "gap": "sm"
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "type": "stack",
                                   "children": [
                                     {
+                                      "type": "button",
+                                      "label": "Create Product",
                                       "action": "CREATE",
                                       "icon": "plus",
-                                      "variant": "primary",
-                                      "label": "Create Product",
-                                      "type": "button"
+                                      "variant": "primary"
                                     }
                                   ],
+                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "gap": "sm"
                                 }
                               ],
-                              "gap": "md"
+                              "type": "stack",
+                              "gap": "md",
+                              "direction": "horizontal",
+                              "align": "center",
+                              "justify": "between"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "entity": "@payload.data",
+                              "type": "data-grid",
                               "itemActions": [
                                 {
                                   "event": "VIEW",
-                                  "variant": "ghost",
-                                  "label": "View"
+                                  "label": "View",
+                                  "variant": "ghost"
                                 },
                                 {
-                                  "event": "EDIT",
+                                  "label": "Edit",
                                   "variant": "ghost",
-                                  "label": "Edit"
+                                  "event": "EDIT"
                                 },
                                 {
-                                  "label": "Delete",
+                                  "variant": "danger",
                                   "event": "DELETE",
-                                  "variant": "danger"
+                                  "label": "Delete"
                                 }
                               ],
-                              "entity": "@payload.data",
                               "fields": [],
-                              "type": "data-grid",
                               "columns": [
                                 {
                                   "variant": "h4",
@@ -764,51 +763,52 @@
                                   "name": "description",
                                   "variant": "badge",
                                   "colorMap": {
-                                    "active": "success",
-                                    "pending": "warning",
-                                    "disabled": "neutral",
                                     "archived": "neutral",
-                                    "failed": "destructive",
-                                    "draft": "warning",
                                     "done": "success",
+                                    "pending": "warning",
                                     "error": "destructive",
-                                    "inactive": "neutral",
                                     "cancelled": "destructive",
                                     "scheduled": "warning",
-                                    "completed": "success"
+                                    "completed": "success",
+                                    "disabled": "neutral",
+                                    "inactive": "neutral",
+                                    "active": "success",
+                                    "failed": "destructive",
+                                    "draft": "warning"
                                   }
                                 },
                                 {
+                                  "variant": "caption",
                                   "label": "Price",
-                                  "name": "price",
-                                  "variant": "caption"
+                                  "name": "price"
                                 }
                               ]
                             }
-                          ]
+                          ],
+                          "gap": "lg"
                         }
                       ],
                       "appName": "ServiceMarketplace",
                       "navItems": [
                         {
                           "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
+                          "icon": "package",
+                          "href": "/products"
                         },
                         {
-                          "href": "/login",
+                          "icon": "layout-list",
                           "label": "Login",
-                          "icon": "layout-list"
+                          "href": "/login"
                         },
                         {
+                          "href": "/checkout",
                           "icon": "credit-card",
-                          "label": "Checkout",
-                          "href": "/checkout"
+                          "label": "Checkout"
                         },
                         {
-                          "icon": "clipboard-list",
                           "label": "Orders",
-                          "href": "/orders"
+                          "href": "/orders",
+                          "icon": "clipboard-list"
                         }
                       ],
                       "type": "dashboard-layout"
@@ -825,36 +825,36 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
                       "gap": "md",
-                      "align": "center",
                       "className": "py-12",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "color": "destructive",
                           "type": "icon",
-                          "name": "alert-triangle"
+                          "name": "alert-triangle",
+                          "color": "destructive"
                         },
                         {
-                          "variant": "h3",
                           "content": "Failed to load product",
+                          "variant": "h3",
                           "type": "typography"
                         },
                         {
-                          "content": "@payload.error",
                           "variant": "body",
                           "color": "muted",
+                          "content": "@payload.error",
                           "type": "typography"
                         },
                         {
-                          "action": "INIT",
-                          "icon": "rotate-ccw",
                           "label": "Retry",
                           "variant": "primary",
-                          "type": "button"
+                          "type": "button",
+                          "icon": "rotate-ccw",
+                          "action": "INIT"
                         }
                       ],
-                      "direction": "vertical"
+                      "type": "stack",
+                      "align": "center"
                     }
                   ]
                 ]
@@ -1047,23 +1047,24 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
                       "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
                           "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
-                              "name": "plus-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "plus-circle"
                             },
                             {
-                              "variant": "h3",
                               "type": "typography",
-                              "content": "Create Product"
+                              "content": "Create Product",
+                              "variant": "h3"
                             }
-                          ],
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
@@ -1071,6 +1072,7 @@
                         {
                           "type": "form-section",
                           "mode": "create",
+                          "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
                             "description",
@@ -1078,12 +1080,10 @@
                             "category",
                             "inStock"
                           ],
-                          "submitEvent": "SAVE",
-                          "cancelEvent": "CLOSE"
+                          "submitEvent": "SAVE"
                         }
                       ],
-                      "gap": "md",
-                      "type": "stack"
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -1336,24 +1336,25 @@
                     "fetch",
                     "Product",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "failure": "ProductLoadFailed",
                         "success": "ProductLoaded"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
                               "content": "Edit Product",
@@ -1361,13 +1362,15 @@
                               "variant": "h3"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "sm"
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "submitEvent": "SAVE",
+                          "type": "form-section",
                           "mode": "edit",
                           "cancelEvent": "CLOSE",
                           "fields": [
@@ -1377,14 +1380,11 @@
                             "category",
                             "inStock"
                           ],
-                          "type": "form-section",
-                          "submitEvent": "SAVE",
                           "entity": "@payload.row"
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md"
+                      "gap": "md",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -1573,8 +1573,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "ProductLoaded",
-                        "failure": "ProductLoadFailed"
+                        "failure": "ProductLoadFailed",
+                        "success": "ProductLoaded"
                       }
                     }
                   ],
@@ -1582,8 +1582,11 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
                       "children": [
                         {
+                          "gap": "sm",
+                          "type": "stack",
                           "align": "center",
                           "children": [
                             {
@@ -1591,131 +1594,128 @@
                               "type": "icon"
                             },
                             {
-                              "content": "@entity.name",
                               "type": "typography",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "@entity.name"
                             }
                           ],
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm"
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "direction": "horizontal",
                           "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
-                              "content": "Name",
                               "type": "typography",
+                              "content": "Name",
                               "variant": "caption"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.name",
+                              "variant": "body",
                               "type": "typography"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "content": "Description",
+                              "type": "typography",
                               "variant": "caption",
-                              "type": "typography"
+                              "content": "Description"
                             },
                             {
-                              "variant": "body",
+                              "type": "typography",
                               "content": "@entity.description",
-                              "type": "typography"
+                              "variant": "body"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md"
+                          ]
                         },
                         {
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "variant": "caption",
-                              "content": "Price",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Price"
                             },
                             {
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.price"
+                              "content": "@entity.price",
+                              "variant": "body"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "md"
                         },
                         {
+                          "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
+                              "type": "typography",
                               "content": "Category"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
+                              "type": "typography",
                               "content": "@entity.category"
                             }
                           ],
-                          "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal"
+                          "type": "stack"
                         },
                         {
+                          "gap": "md",
                           "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
+                              "type": "typography",
                               "content": "In Stock"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.inStock",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ],
-                          "type": "stack",
-                          "gap": "md"
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "type": "stack",
+                          "justify": "end",
+                          "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
-                              "action": "EDIT",
-                              "label": "Edit",
-                              "icon": "edit",
                               "type": "button",
-                              "variant": "primary"
+                              "icon": "edit",
+                              "variant": "primary",
+                              "action": "EDIT",
+                              "label": "Edit"
                             },
                             {
-                              "label": "Close",
-                              "variant": "ghost",
                               "type": "button",
-                              "action": "CLOSE"
+                              "label": "Close",
+                              "action": "CLOSE",
+                              "variant": "ghost"
                             }
-                          ],
-                          "justify": "end",
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "sm"
+                          ]
                         }
                       ],
-                      "type": "stack",
                       "direction": "vertical",
-                      "gap": "md"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -1950,68 +1950,68 @@
                     "fetch",
                     "Product",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "failure": "ProductLoadFailed",
                         "success": "ProductLoaded"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
-                      "gap": "md",
-                      "direction": "vertical",
                       "children": [
                         {
                           "type": "stack",
-                          "gap": "sm",
-                          "direction": "horizontal",
-                          "align": "center",
                           "children": [
                             {
-                              "name": "alert-triangle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "alert-triangle"
                             },
                             {
-                              "type": "typography",
                               "content": "Delete Product",
+                              "type": "typography",
                               "variant": "h3"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "align": "center",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "message": "This action cannot be undone.",
+                          "variant": "error",
                           "type": "alert",
-                          "variant": "error"
+                          "message": "This action cannot be undone."
                         },
                         {
+                          "direction": "horizontal",
+                          "gap": "sm",
+                          "type": "stack",
                           "children": [
                             {
-                              "action": "CANCEL",
+                              "label": "Cancel",
                               "variant": "ghost",
                               "type": "button",
-                              "label": "Cancel"
+                              "action": "CANCEL"
                             },
                             {
-                              "variant": "danger",
+                              "label": "Delete",
+                              "action": "CONFIRM_DELETE",
                               "icon": "check",
                               "type": "button",
-                              "label": "Delete",
-                              "action": "CONFIRM_DELETE"
+                              "variant": "danger"
                             }
                           ],
-                          "type": "stack",
-                          "gap": "sm",
-                          "direction": "horizontal",
                           "justify": "end"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -2028,8 +2028,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "success": "ProductDeleted",
-                        "failure": "ProductDeleteFailed"
+                        "failure": "ProductDeleteFailed",
+                        "success": "ProductDeleted"
                       }
                     }
                   ],
@@ -2378,8 +2378,8 @@
                     "AuthSession",
                     {
                       "emit": {
-                        "failure": "AuthSessionLoadFailed",
-                        "success": "AuthSessionLoaded"
+                        "success": "AuthSessionLoaded",
+                        "failure": "AuthSessionLoadFailed"
                       }
                     }
                   ],
@@ -2387,52 +2387,28 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
-                        },
-                        {
-                          "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "href": "/checkout",
-                          "label": "Checkout",
-                          "icon": "credit-card"
-                        },
-                        {
-                          "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
-                        }
-                      ],
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "gap": "lg",
+                          "align": "center",
                           "type": "stack",
                           "direction": "vertical",
-                          "align": "center",
+                          "gap": "lg",
                           "children": [
                             {
-                              "align": "center",
                               "gap": "md",
-                              "direction": "horizontal",
+                              "align": "center",
                               "children": [
                                 {
-                                  "name": "lock",
-                                  "type": "icon"
+                                  "type": "icon",
+                                  "name": "lock"
                                 },
                                 {
-                                  "content": "Sign In",
+                                  "variant": "h2",
                                   "type": "typography",
-                                  "variant": "h2"
+                                  "content": "Sign In"
                                 }
                               ],
+                              "direction": "horizontal",
                               "type": "stack"
                             },
                             {
@@ -2446,8 +2422,8 @@
                                   "label": "Google"
                                 },
                                 {
-                                  "value": "github",
-                                  "label": "GitHub"
+                                  "label": "GitHub",
+                                  "value": "github"
                                 },
                                 {
                                   "label": "Microsoft",
@@ -2456,15 +2432,39 @@
                               ]
                             },
                             {
-                              "icon": "log-in",
-                              "label": "Login",
                               "type": "button",
+                              "icon": "log-in",
                               "variant": "primary",
-                              "action": "LOGIN"
+                              "action": "LOGIN",
+                              "label": "Login"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "label": "Products",
+                          "icon": "package"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Login",
+                          "href": "/login"
+                        },
+                        {
+                          "href": "/checkout",
+                          "icon": "credit-card",
+                          "label": "Checkout"
+                        },
+                        {
+                          "href": "/orders",
+                          "label": "Orders",
+                          "icon": "clipboard-list"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2478,13 +2478,13 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "loading-state",
                           "title": "Authorizing...",
-                          "message": "Redirecting to provider for authorization."
+                          "message": "Redirecting to provider for authorization.",
+                          "type": "loading-state"
                         }
                       ],
                       "navItems": [
@@ -2499,13 +2499,13 @@
                           "href": "/login"
                         },
                         {
-                          "icon": "credit-card",
                           "label": "Checkout",
-                          "href": "/checkout"
+                          "href": "/checkout",
+                          "icon": "credit-card"
                         },
                         {
-                          "href": "/orders",
                           "icon": "clipboard-list",
+                          "href": "/orders",
                           "label": "Orders"
                         }
                       ]
@@ -2516,11 +2516,11 @@
                     "oauth",
                     "authorize",
                     {
+                      "provider": "@entity.provider",
                       "scopes": [
                         "openid",
                         "email"
-                      ],
-                      "provider": "@entity.provider"
+                      ]
                     },
                     {
                       "emit": {
@@ -2545,23 +2545,23 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "label": "Products",
-                          "icon": "package",
-                          "href": "/products"
+                          "href": "/products",
+                          "icon": "package"
                         },
                         {
-                          "icon": "layout-list",
                           "label": "Login",
-                          "href": "/login"
+                          "href": "/login",
+                          "icon": "layout-list"
                         },
                         {
                           "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
+                          "label": "Checkout",
+                          "icon": "credit-card"
                         },
                         {
                           "label": "Orders",
@@ -2571,38 +2571,38 @@
                       ],
                       "children": [
                         {
+                          "gap": "lg",
                           "align": "center",
-                          "type": "stack",
-                          "direction": "vertical",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "external-link"
+                              "name": "external-link",
+                              "type": "icon"
                             },
                             {
-                              "content": "Authorization Required",
                               "variant": "h2",
+                              "content": "Authorization Required",
                               "type": "typography"
                             },
                             {
                               "type": "typography",
-                              "color": "muted",
+                              "content": "@entity.authUrl",
                               "variant": "body",
-                              "content": "@entity.authUrl"
+                              "color": "muted"
                             },
                             {
-                              "type": "input",
-                              "placeholder": "Paste authorization code here"
+                              "placeholder": "Paste authorization code here",
+                              "type": "input"
                             },
                             {
-                              "icon": "check",
+                              "type": "button",
+                              "action": "CALLBACK",
                               "variant": "primary",
                               "label": "Submit",
-                              "action": "CALLBACK",
-                              "type": "button"
+                              "icon": "check"
                             }
                           ],
-                          "gap": "lg"
+                          "type": "stack",
+                          "direction": "vertical"
                         }
                       ]
                     }
@@ -2632,71 +2632,71 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "label": "Products",
                           "href": "/products",
-                          "icon": "package",
-                          "label": "Products"
+                          "icon": "package"
                         },
                         {
                           "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Login"
                         },
                         {
-                          "label": "Checkout",
+                          "href": "/checkout",
                           "icon": "credit-card",
-                          "href": "/checkout"
+                          "label": "Checkout"
                         },
                         {
-                          "icon": "clipboard-list",
                           "href": "/orders",
+                          "icon": "clipboard-list",
                           "label": "Orders"
                         }
                       ],
                       "children": [
                         {
+                          "direction": "vertical",
+                          "type": "stack",
+                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
-                              "name": "check-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "check-circle"
                             },
                             {
                               "variant": "success",
-                              "type": "alert",
-                              "message": "Authenticated successfully"
+                              "message": "Authenticated successfully",
+                              "type": "alert"
                             },
                             {
-                              "gap": "sm",
-                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "label": "Refresh Token",
-                                  "icon": "refresh-cw",
                                   "type": "button",
+                                  "label": "Refresh Token",
+                                  "variant": "ghost",
                                   "action": "REFRESH",
-                                  "variant": "ghost"
+                                  "icon": "refresh-cw"
                                 },
                                 {
-                                  "label": "Logout",
                                   "icon": "log-out",
                                   "action": "LOGOUT",
-                                  "variant": "ghost",
-                                  "type": "button"
+                                  "label": "Logout",
+                                  "type": "button",
+                                  "variant": "ghost"
                                 }
                               ],
-                              "type": "stack",
-                              "justify": "center"
+                              "justify": "center",
+                              "direction": "horizontal",
+                              "gap": "sm",
+                              "type": "stack"
                             }
-                          ],
-                          "gap": "lg",
-                          "type": "stack",
-                          "direction": "vertical"
+                          ]
                         }
-                      ],
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -2715,53 +2715,53 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
-                      "navItems": [
-                        {
-                          "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
-                        },
-                        {
-                          "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Checkout",
-                          "icon": "credit-card",
-                          "href": "/checkout"
-                        },
-                        {
-                          "label": "Orders",
-                          "icon": "clipboard-list",
-                          "href": "/orders"
-                        }
-                      ],
                       "children": [
                         {
+                          "direction": "vertical",
                           "gap": "lg",
-                          "align": "center",
                           "children": [
                             {
+                              "onRetry": "RETRY",
                               "type": "error-state",
                               "title": "Authentication Failed",
-                              "onRetry": "RETRY",
                               "message": "@entity.error"
                             },
                             {
-                              "variant": "primary",
+                              "type": "button",
                               "label": "Try Again",
                               "action": "RETRY",
-                              "icon": "rotate-ccw",
-                              "type": "button"
+                              "variant": "primary",
+                              "icon": "rotate-ccw"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "vertical"
+                          "align": "center",
+                          "type": "stack"
                         }
-                      ]
+                      ],
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "icon": "package",
+                          "label": "Products"
+                        },
+                        {
+                          "label": "Login",
+                          "icon": "layout-list",
+                          "href": "/login"
+                        },
+                        {
+                          "href": "/checkout",
+                          "icon": "credit-card",
+                          "label": "Checkout"
+                        },
+                        {
+                          "href": "/orders",
+                          "icon": "clipboard-list",
+                          "label": "Orders"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2790,71 +2790,71 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "package",
-                          "label": "Products",
-                          "href": "/products"
-                        },
-                        {
-                          "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
-                        },
+                      "children": [
                         {
-                          "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
-                        },
-                        {
-                          "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
-                        }
-                      ],
-                      "children": [
-                        {
-                          "type": "stack",
-                          "gap": "lg",
                           "children": [
                             {
                               "name": "check-circle",
                               "type": "icon"
                             },
                             {
+                              "type": "alert",
                               "variant": "success",
-                              "message": "Authenticated successfully",
-                              "type": "alert"
+                              "message": "Authenticated successfully"
                             },
                             {
                               "gap": "sm",
-                              "type": "stack",
                               "direction": "horizontal",
+                              "type": "stack",
                               "justify": "center",
                               "children": [
                                 {
-                                  "action": "REFRESH",
-                                  "icon": "refresh-cw",
+                                  "variant": "ghost",
                                   "type": "button",
+                                  "icon": "refresh-cw",
                                   "label": "Refresh Token",
-                                  "variant": "ghost"
+                                  "action": "REFRESH"
                                 },
                                 {
-                                  "label": "Logout",
-                                  "type": "button",
                                   "variant": "ghost",
+                                  "type": "button",
                                   "icon": "log-out",
+                                  "label": "Logout",
                                   "action": "LOGOUT"
                                 }
                               ]
                             }
                           ],
+                          "direction": "vertical",
                           "align": "center",
-                          "direction": "vertical"
+                          "type": "stack",
+                          "gap": "lg"
                         }
                       ],
                       "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace"
+                      "appName": "ServiceMarketplace",
+                      "navItems": [
+                        {
+                          "icon": "package",
+                          "label": "Products",
+                          "href": "/products"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/login",
+                          "label": "Login"
+                        },
+                        {
+                          "href": "/checkout",
+                          "icon": "credit-card",
+                          "label": "Checkout"
+                        },
+                        {
+                          "href": "/orders",
+                          "label": "Orders",
+                          "icon": "clipboard-list"
+                        }
+                      ]
                     }
                   ]
                 ]
@@ -2868,18 +2868,18 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
                       "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
-                          "label": "Products",
                           "href": "/products",
-                          "icon": "package"
+                          "icon": "package",
+                          "label": "Products"
                         },
                         {
+                          "href": "/login",
                           "label": "Login",
-                          "icon": "layout-list",
-                          "href": "/login"
+                          "icon": "layout-list"
                         },
                         {
                           "label": "Checkout",
@@ -2887,16 +2887,16 @@
                           "icon": "credit-card"
                         },
                         {
-                          "href": "/orders",
                           "label": "Orders",
-                          "icon": "clipboard-list"
+                          "icon": "clipboard-list",
+                          "href": "/orders"
                         }
                       ],
                       "children": [
                         {
-                          "message": "Obtaining a new access token.",
                           "type": "loading-state",
-                          "title": "Refreshing token..."
+                          "title": "Refreshing token...",
+                          "message": "Obtaining a new access token."
                         }
                       ]
                     }
@@ -2910,8 +2910,8 @@
                     },
                     {
                       "emit": {
-                        "failure": "ProductOauthFailed",
-                        "success": "ProductOauthCompleted"
+                        "success": "ProductOauthCompleted",
+                        "failure": "ProductOauthFailed"
                       }
                     }
                   ]
@@ -2933,8 +2933,8 @@
                     {
                       "navItems": [
                         {
-                          "label": "Products",
                           "href": "/products",
+                          "label": "Products",
                           "icon": "package"
                         },
                         {
@@ -2943,14 +2943,14 @@
                           "icon": "layout-list"
                         },
                         {
-                          "icon": "credit-card",
+                          "label": "Checkout",
                           "href": "/checkout",
-                          "label": "Checkout"
+                          "icon": "credit-card"
                         },
                         {
-                          "href": "/orders",
+                          "label": "Orders",
                           "icon": "clipboard-list",
-                          "label": "Orders"
+                          "href": "/orders"
                         }
                       ],
                       "type": "dashboard-layout",
@@ -2959,10 +2959,11 @@
                         {
                           "type": "stack",
                           "align": "center",
+                          "direction": "vertical",
                           "children": [
                             {
-                              "type": "stack",
                               "align": "center",
+                              "type": "stack",
                               "direction": "horizontal",
                               "gap": "md",
                               "children": [
@@ -2981,7 +2982,6 @@
                               "type": "divider"
                             },
                             {
-                              "type": "select",
                               "options": [
                                 {
                                   "value": "google",
@@ -2995,17 +2995,17 @@
                                   "label": "Microsoft",
                                   "value": "microsoft"
                                 }
-                              ]
+                              ],
+                              "type": "select"
                             },
                             {
-                              "action": "LOGIN",
                               "variant": "primary",
                               "icon": "log-in",
+                              "label": "Login",
                               "type": "button",
-                              "label": "Login"
+                              "action": "LOGIN"
                             }
                           ],
-                          "direction": "vertical",
                           "gap": "lg"
                         }
                       ]
@@ -3031,65 +3031,65 @@
                       "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "icon": "package",
+                          "label": "Products",
                           "href": "/products",
-                          "label": "Products"
+                          "icon": "package"
                         },
                         {
                           "label": "Login",
-                          "href": "/login",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/login"
                         },
                         {
-                          "label": "Checkout",
                           "href": "/checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "label": "Checkout"
                         },
                         {
                           "icon": "clipboard-list",
-                          "href": "/orders",
-                          "label": "Orders"
+                          "label": "Orders",
+                          "href": "/orders"
                         }
                       ],
                       "children": [
                         {
-                          "align": "center",
-                          "gap": "lg",
                           "direction": "vertical",
+                          "gap": "lg",
+                          "align": "center",
+                          "type": "stack",
                           "children": [
                             {
-                              "name": "check-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "check-circle"
                             },
                             {
                               "variant": "success",
-                              "message": "Authenticated successfully",
-                              "type": "alert"
+                              "type": "alert",
+                              "message": "Authenticated successfully"
                             },
                             {
-                              "gap": "sm",
-                              "type": "stack",
                               "direction": "horizontal",
                               "justify": "center",
                               "children": [
                                 {
                                   "type": "button",
-                                  "label": "Refresh Token",
-                                  "variant": "ghost",
                                   "action": "REFRESH",
+                                  "variant": "ghost",
+                                  "label": "Refresh Token",
                                   "icon": "refresh-cw"
                                 },
                                 {
+                                  "variant": "ghost",
                                   "icon": "log-out",
-                                  "label": "Logout",
+                                  "type": "button",
                                   "action": "LOGOUT",
-                                  "variant": "ghost",
-                                  "type": "button"
+                                  "label": "Logout"
                                 }
-                              ]
+                              ],
+                              "gap": "sm",
+                              "type": "stack"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         }
                       ]
                     }
@@ -3110,46 +3110,46 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace",
                       "children": [
                         {
+                          "gap": "lg",
+                          "type": "stack",
+                          "direction": "vertical",
+                          "align": "center",
                           "children": [
                             {
-                              "onRetry": "RETRY",
+                              "message": "@entity.error",
                               "title": "Authentication Failed",
                               "type": "error-state",
-                              "message": "@entity.error"
+                              "onRetry": "RETRY"
                             },
                             {
-                              "variant": "primary",
-                              "icon": "rotate-ccw",
-                              "label": "Try Again",
                               "type": "button",
-                              "action": "RETRY"
+                              "label": "Try Again",
+                              "variant": "primary",
+                              "action": "RETRY",
+                              "icon": "rotate-ccw"
                             }
-                          ],
-                          "type": "stack",
-                          "align": "center",
-                          "gap": "lg",
-                          "direction": "vertical"
+                          ]
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
-                          "label": "Products",
                           "icon": "package",
+                          "label": "Products",
                           "href": "/products"
                         },
                         {
-                          "href": "/login",
                           "label": "Login",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/login"
                         },
                         {
                           "href": "/checkout",
-                          "label": "Checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "label": "Checkout"
                         },
                         {
                           "icon": "clipboard-list",
@@ -3170,16 +3170,17 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
                       "children": [
                         {
+                          "type": "stack",
+                          "gap": "lg",
+                          "align": "center",
                           "children": [
                             {
+                              "gap": "md",
                               "type": "stack",
                               "direction": "horizontal",
                               "align": "center",
-                              "gap": "md",
                               "children": [
                                 {
                                   "type": "icon",
@@ -3187,8 +3188,8 @@
                                 },
                                 {
                                   "variant": "h2",
-                                  "content": "Sign In",
-                                  "type": "typography"
+                                  "type": "typography",
+                                  "content": "Sign In"
                                 }
                               ]
                             },
@@ -3196,58 +3197,57 @@
                               "type": "divider"
                             },
                             {
+                              "type": "select",
                               "options": [
                                 {
                                   "label": "Google",
                                   "value": "google"
                                 },
                                 {
-                                  "label": "GitHub",
-                                  "value": "github"
+                                  "value": "github",
+                                  "label": "GitHub"
                                 },
                                 {
-                                  "value": "microsoft",
-                                  "label": "Microsoft"
+                                  "label": "Microsoft",
+                                  "value": "microsoft"
                                 }
-                              ],
-                              "type": "select"
+                              ]
                             },
                             {
+                              "variant": "primary",
                               "icon": "log-in",
-                              "action": "LOGIN",
                               "label": "Login",
-                              "variant": "primary",
-                              "type": "button"
+                              "type": "button",
+                              "action": "LOGIN"
                             }
                           ],
-                          "align": "center",
-                          "type": "stack",
-                          "gap": "lg",
                           "direction": "vertical"
                         }
                       ],
+                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
+                          "icon": "package",
                           "href": "/products",
-                          "label": "Products",
-                          "icon": "package"
+                          "label": "Products"
                         },
                         {
+                          "icon": "layout-list",
                           "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
+                          "label": "Login"
                         },
                         {
-                          "href": "/checkout",
                           "label": "Checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "href": "/checkout"
                         },
                         {
+                          "label": "Orders",
                           "href": "/orders",
-                          "icon": "clipboard-list",
-                          "label": "Orders"
+                          "icon": "clipboard-list"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3519,8 +3519,8 @@
                     "OrderPayment",
                     {
                       "emit": {
-                        "success": "OrderPaymentLoaded",
-                        "failure": "OrderPaymentLoadFailed"
+                        "failure": "OrderPaymentLoadFailed",
+                        "success": "OrderPaymentLoaded"
                       }
                     }
                   ],
@@ -3528,42 +3528,65 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "label": "Products",
+                          "href": "/products",
+                          "icon": "package"
+                        },
+                        {
+                          "label": "Login",
+                          "href": "/login",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "label": "Checkout",
+                          "href": "/checkout",
+                          "icon": "credit-card"
+                        },
+                        {
+                          "icon": "clipboard-list",
+                          "label": "Orders",
+                          "href": "/orders"
+                        }
+                      ],
                       "children": [
                         {
-                          "align": "center",
-                          "gap": "lg",
                           "type": "stack",
-                          "direction": "vertical",
+                          "gap": "lg",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "horizontal",
-                              "align": "center",
-                              "gap": "md",
                               "children": [
                                 {
                                   "type": "icon",
                                   "name": "credit-card"
                                 },
                                 {
+                                  "type": "typography",
                                   "variant": "h2",
-                                  "content": "Payment",
-                                  "type": "typography"
+                                  "content": "Payment"
                                 }
-                              ]
+                              ],
+                              "align": "center",
+                              "type": "stack",
+                              "gap": "md"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "gap": "md",
+                              "type": "stack",
                               "direction": "vertical",
                               "children": [
                                 {
+                                  "placeholder": "0.00",
                                   "inputType": "number",
-                                  "type": "input",
-                                  "placeholder": "0.00"
+                                  "type": "input"
                                 },
                                 {
+                                  "type": "select",
                                   "options": [
                                     {
                                       "value": "usd",
@@ -3577,47 +3600,24 @@
                                       "value": "gbp",
                                       "label": "GBP"
                                     }
-                                  ],
-                                  "type": "select"
+                                  ]
                                 }
-                              ],
-                              "type": "stack",
-                              "gap": "md"
+                              ]
                             },
                             {
+                              "icon": "credit-card",
                               "action": "CREATE_PAYMENT",
-                              "type": "button",
                               "variant": "primary",
-                              "icon": "credit-card",
+                              "type": "button",
                               "label": "Pay"
                             }
-                          ]
+                          ],
+                          "direction": "vertical",
+                          "align": "center"
                         }
                       ],
                       "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
-                      "navItems": [
-                        {
-                          "label": "Products",
-                          "icon": "package",
-                          "href": "/products"
-                        },
-                        {
-                          "label": "Login",
-                          "href": "/login",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Checkout",
-                          "href": "/checkout",
-                          "icon": "credit-card"
-                        },
-                        {
-                          "icon": "clipboard-list",
-                          "label": "Orders",
-                          "href": "/orders"
-                        }
-                      ]
+                      "appName": "ServiceMarketplace"
                     }
                   ]
                 ]
@@ -3631,7 +3631,7 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "title": "Creating payment...",
@@ -3639,11 +3639,12 @@
                           "type": "loading-state"
                         }
                       ],
+                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
                           "label": "Products",
-                          "icon": "package",
-                          "href": "/products"
+                          "href": "/products",
+                          "icon": "package"
                         },
                         {
                           "href": "/login",
@@ -3651,17 +3652,16 @@
                           "icon": "layout-list"
                         },
                         {
-                          "icon": "credit-card",
                           "label": "Checkout",
-                          "href": "/checkout"
+                          "href": "/checkout",
+                          "icon": "credit-card"
                         },
                         {
-                          "icon": "clipboard-list",
+                          "href": "/orders",
                           "label": "Orders",
-                          "href": "/orders"
+                          "icon": "clipboard-list"
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ],
                   [
@@ -3700,24 +3700,18 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
-                      "children": [
-                        {
-                          "message": "Processing your payment.",
-                          "type": "loading-state",
-                          "title": "Confirming payment..."
-                        }
-                      ],
                       "navItems": [
                         {
-                          "icon": "package",
+                          "label": "Products",
                           "href": "/products",
-                          "label": "Products"
+                          "icon": "package"
                         },
                         {
+                          "href": "/login",
                           "icon": "layout-list",
-                          "label": "Login",
-                          "href": "/login"
+                          "label": "Login"
                         },
                         {
                           "href": "/checkout",
@@ -3726,11 +3720,17 @@
                         },
                         {
                           "href": "/orders",
-                          "label": "Orders",
-                          "icon": "clipboard-list"
+                          "icon": "clipboard-list",
+                          "label": "Orders"
                         }
                       ],
-                      "type": "dashboard-layout"
+                      "children": [
+                        {
+                          "type": "loading-state",
+                          "message": "Processing your payment.",
+                          "title": "Confirming payment..."
+                        }
+                      ]
                     }
                   ],
                   [
@@ -3742,8 +3742,8 @@
                     },
                     {
                       "emit": {
-                        "success": "ProductStripeCompleted",
-                        "failure": "ProductStripeFailed"
+                        "failure": "ProductStripeFailed",
+                        "success": "ProductStripeCompleted"
                       }
                     }
                   ]
@@ -3763,17 +3763,26 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
+                      "children": [
+                        {
+                          "type": "error-state",
+                          "title": "Payment Failed",
+                          "message": "@entity.error",
+                          "onRetry": "RETRY"
+                        }
+                      ],
                       "navItems": [
                         {
+                          "icon": "package",
                           "href": "/products",
-                          "label": "Products",
-                          "icon": "package"
+                          "label": "Products"
                         },
                         {
-                          "href": "/login",
                           "icon": "layout-list",
-                          "label": "Login"
+                          "label": "Login",
+                          "href": "/login"
                         },
                         {
                           "href": "/checkout",
@@ -3781,18 +3790,9 @@
                           "icon": "credit-card"
                         },
                         {
-                          "icon": "clipboard-list",
                           "label": "Orders",
-                          "href": "/orders"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "children": [
-                        {
-                          "type": "error-state",
-                          "message": "@entity.error",
-                          "title": "Payment Failed",
-                          "onRetry": "RETRY"
+                          "href": "/orders",
+                          "icon": "clipboard-list"
                         }
                       ]
                     }
@@ -3817,11 +3817,35 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "icon": "package",
+                          "label": "Products"
+                        },
+                        {
+                          "label": "Login",
+                          "href": "/login",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "href": "/checkout",
+                          "label": "Checkout",
+                          "icon": "credit-card"
+                        },
+                        {
+                          "label": "Orders",
+                          "icon": "clipboard-list",
+                          "href": "/orders"
+                        }
+                      ],
                       "appName": "ServiceMarketplace",
                       "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "stack",
+                          "gap": "lg",
+                          "align": "center",
                           "children": [
                             {
                               "name": "check-circle",
@@ -3829,8 +3853,8 @@
                             },
                             {
                               "message": "Payment successful! Sending receipt...",
-                              "type": "alert",
-                              "variant": "success"
+                              "variant": "success",
+                              "type": "alert"
                             },
                             {
                               "type": "typography",
@@ -3839,38 +3863,14 @@
                               "variant": "body"
                             },
                             {
-                              "type": "button",
+                              "icon": "rotate-ccw",
                               "action": "RESET",
-                              "label": "New Payment",
+                              "type": "button",
                               "variant": "ghost",
-                              "icon": "rotate-ccw"
+                              "label": "New Payment"
                             }
                           ],
-                          "align": "center",
-                          "direction": "vertical",
-                          "gap": "lg"
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
-                        },
-                        {
-                          "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "icon": "credit-card",
-                          "label": "Checkout",
-                          "href": "/checkout"
-                        },
-                        {
-                          "href": "/orders",
-                          "icon": "clipboard-list",
-                          "label": "Orders"
+                          "direction": "vertical"
                         }
                       ]
                     }
@@ -3891,8 +3891,6 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
                           "icon": "package",
@@ -3900,27 +3898,29 @@
                           "href": "/products"
                         },
                         {
+                          "icon": "layout-list",
                           "href": "/login",
-                          "label": "Login",
-                          "icon": "layout-list"
+                          "label": "Login"
                         },
                         {
-                          "href": "/checkout",
                           "label": "Checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "href": "/checkout"
                         },
                         {
                           "href": "/orders",
-                          "icon": "clipboard-list",
-                          "label": "Orders"
+                          "label": "Orders",
+                          "icon": "clipboard-list"
                         }
                       ],
+                      "type": "dashboard-layout",
+                      "appName": "ServiceMarketplace",
                       "children": [
                         {
                           "title": "Payment Failed",
+                          "message": "@entity.error",
                           "onRetry": "RETRY",
-                          "type": "error-state",
-                          "message": "@entity.error"
+                          "type": "error-state"
                         }
                       ]
                     }
@@ -3937,115 +3937,78 @@
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/login",
-                          "label": "Login"
-                        },
-                        {
-                          "icon": "credit-card",
-                          "label": "Checkout",
-                          "href": "/checkout"
-                        },
-                        {
-                          "href": "/orders",
-                          "label": "Orders",
-                          "icon": "clipboard-list"
-                        }
-                      ],
                       "appName": "ServiceMarketplace",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
                           "align": "center",
+                          "direction": "vertical",
+                          "gap": "lg",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "stack",
-                              "align": "center",
                               "direction": "horizontal",
-                              "gap": "md",
+                              "align": "center",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "credit-card"
+                                  "name": "credit-card",
+                                  "type": "icon"
                                 },
                                 {
+                                  "variant": "h2",
                                   "content": "Payment",
-                                  "type": "typography",
-                                  "variant": "h2"
+                                  "type": "typography"
                                 }
-                              ]
+                              ],
+                              "gap": "md"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "gap": "md",
-                              "direction": "vertical",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "placeholder": "0.00",
                                   "inputType": "number",
+                                  "placeholder": "0.00",
                                   "type": "input"
                                 },
                                 {
-                                  "type": "select",
                                   "options": [
                                     {
-                                      "label": "USD",
-                                      "value": "usd"
+                                      "value": "usd",
+                                      "label": "USD"
                                     },
                                     {
                                       "label": "EUR",
                                       "value": "eur"
                                     },
                                     {
-                                      "value": "gbp",
-                                      "label": "GBP"
+                                      "label": "GBP",
+                                      "value": "gbp"
                                     }
-                                  ]
+                                  ],
+                                  "type": "select"
                                 }
                               ],
-                              "type": "stack"
+                              "direction": "vertical",
+                              "gap": "md"
                             },
                             {
-                              "type": "button",
                               "action": "CREATE_PAYMENT",
                               "variant": "primary",
-                              "icon": "credit-card",
-                              "label": "Pay"
+                              "type": "button",
+                              "label": "Pay",
+                              "icon": "credit-card"
                             }
-                          ],
-                          "gap": "lg"
+                          ]
                         }
-                      ]
-                    }
-                  ]
-                ]
-              },
-              {
-                "from": "error",
-                "to": "idle",
-                "event": "RETRY",
-                "effects": [
-                  [
-                    "render-ui",
-                    "main",
-                    {
-                      "appName": "ServiceMarketplace",
-                      "type": "dashboard-layout",
+                      ],
                       "navItems": [
                         {
-                          "icon": "package",
+                          "label": "Products",
                           "href": "/products",
-                          "label": "Products"
+                          "icon": "package"
                         },
                         {
                           "href": "/login",
@@ -4054,36 +4017,51 @@
                         },
                         {
                           "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
+                          "label": "Checkout",
+                          "icon": "credit-card"
                         },
                         {
-                          "href": "/orders",
                           "icon": "clipboard-list",
-                          "label": "Orders"
+                          "label": "Orders",
+                          "href": "/orders"
                         }
-                      ],
+                      ]
+                    }
+                  ]
+                ]
+              },
+              {
+                "from": "error",
+                "to": "idle",
+                "event": "RETRY",
+                "effects": [
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "appName": "ServiceMarketplace",
                       "children": [
                         {
-                          "direction": "vertical",
-                          "type": "stack",
                           "align": "center",
+                          "type": "stack",
+                          "gap": "lg",
+                          "direction": "vertical",
                           "children": [
                             {
-                              "align": "center",
+                              "direction": "horizontal",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "name": "credit-card",
-                                  "type": "icon"
+                                  "type": "icon",
+                                  "name": "credit-card"
                                 },
                                 {
+                                  "content": "Payment",
                                   "variant": "h2",
-                                  "type": "typography",
-                                  "content": "Payment"
+                                  "type": "typography"
                                 }
                               ],
-                              "type": "stack",
-                              "direction": "horizontal",
+                              "align": "center",
                               "gap": "md"
                             },
                             {
@@ -4091,12 +4069,12 @@
                             },
                             {
                               "gap": "md",
-                              "type": "stack",
                               "direction": "vertical",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "type": "input",
                                   "inputType": "number",
+                                  "type": "input",
                                   "placeholder": "0.00"
                                 },
                                 {
@@ -4110,8 +4088,8 @@
                                       "value": "eur"
                                     },
                                     {
-                                      "value": "gbp",
-                                      "label": "GBP"
+                                      "label": "GBP",
+                                      "value": "gbp"
                                     }
                                   ],
                                   "type": "select"
@@ -4119,93 +4097,93 @@
                               ]
                             },
                             {
-                              "type": "button",
-                              "action": "CREATE_PAYMENT",
                               "icon": "credit-card",
+                              "variant": "primary",
+                              "type": "button",
                               "label": "Pay",
-                              "variant": "primary"
+                              "action": "CREATE_PAYMENT"
                             }
-                          ],
-                          "gap": "lg"
+                          ]
                         }
-                      ]
-                    }
-                  ]
-                ]
-              },
-              {
-                "from": "error",
-                "to": "idle",
-                "event": "RESET",
-                "effects": [
-                  [
-                    "render-ui",
-                    "main",
-                    {
+                      ],
                       "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
                       "navItems": [
                         {
-                          "label": "Products",
                           "icon": "package",
+                          "label": "Products",
                           "href": "/products"
                         },
                         {
-                          "icon": "layout-list",
                           "label": "Login",
-                          "href": "/login"
+                          "href": "/login",
+                          "icon": "layout-list"
                         },
                         {
-                          "href": "/checkout",
                           "label": "Checkout",
-                          "icon": "credit-card"
+                          "icon": "credit-card",
+                          "href": "/checkout"
                         },
                         {
                           "label": "Orders",
-                          "icon": "clipboard-list",
-                          "href": "/orders"
+                          "href": "/orders",
+                          "icon": "clipboard-list"
                         }
-                      ],
+                      ]
+                    }
+                  ]
+                ]
+              },
+              {
+                "from": "error",
+                "to": "idle",
+                "event": "RESET",
+                "effects": [
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "stack",
                           "direction": "vertical",
+                          "gap": "lg",
+                          "align": "center",
                           "children": [
                             {
                               "direction": "horizontal",
-                              "type": "stack",
                               "children": [
                                 {
                                   "type": "icon",
                                   "name": "credit-card"
                                 },
                                 {
+                                  "content": "Payment",
                                   "variant": "h2",
-                                  "type": "typography",
-                                  "content": "Payment"
+                                  "type": "typography"
                                 }
                               ],
                               "gap": "md",
-                              "align": "center"
+                              "align": "center",
+                              "type": "stack"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "type": "stack",
                               "gap": "md",
-                              "direction": "vertical",
                               "children": [
                                 {
-                                  "inputType": "number",
                                   "placeholder": "0.00",
-                                  "type": "input"
+                                  "type": "input",
+                                  "inputType": "number"
                                 },
                                 {
-                                  "type": "select",
                                   "options": [
                                     {
-                                      "label": "USD",
-                                      "value": "usd"
+                                      "value": "usd",
+                                      "label": "USD"
                                     },
                                     {
                                       "value": "eur",
@@ -4215,21 +4193,43 @@
                                       "value": "gbp",
                                       "label": "GBP"
                                     }
-                                  ]
+                                  ],
+                                  "type": "select"
                                 }
                               ],
-                              "type": "stack"
+                              "direction": "vertical"
                             },
                             {
-                              "variant": "primary",
-                              "action": "CREATE_PAYMENT",
+                              "icon": "credit-card",
                               "type": "button",
                               "label": "Pay",
-                              "icon": "credit-card"
+                              "action": "CREATE_PAYMENT",
+                              "variant": "primary"
                             }
-                          ],
-                          "align": "center",
-                          "gap": "lg"
+                          ]
+                        }
+                      ],
+                      "appName": "ServiceMarketplace",
+                      "navItems": [
+                        {
+                          "href": "/products",
+                          "icon": "package",
+                          "label": "Products"
+                        },
+                        {
+                          "href": "/login",
+                          "icon": "layout-list",
+                          "label": "Login"
+                        },
+                        {
+                          "label": "Checkout",
+                          "icon": "credit-card",
+                          "href": "/checkout"
+                        },
+                        {
+                          "href": "/orders",
+                          "icon": "clipboard-list",
+                          "label": "Orders"
                         }
                       ]
                     }
@@ -4352,49 +4352,49 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "children": [
-                        {
-                          "direction": "vertical",
-                          "children": [
-                            {
-                              "type": "icon",
-                              "name": "mail"
-                            },
-                            {
-                              "color": "muted",
-                              "variant": "body",
-                              "content": "Receipt will be sent after payment.",
-                              "type": "typography"
-                            }
-                          ],
-                          "type": "stack",
-                          "gap": "md",
-                          "align": "center"
-                        }
-                      ],
                       "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "icon": "package",
                           "label": "Products",
+                          "icon": "package",
                           "href": "/products"
                         },
                         {
+                          "href": "/login",
                           "label": "Login",
-                          "icon": "layout-list",
-                          "href": "/login"
+                          "icon": "layout-list"
                         },
                         {
-                          "label": "Checkout",
+                          "icon": "credit-card",
                           "href": "/checkout",
-                          "icon": "credit-card"
+                          "label": "Checkout"
                         },
                         {
-                          "href": "/orders",
                           "icon": "clipboard-list",
+                          "href": "/orders",
                           "label": "Orders"
                         }
+                      ],
+                      "children": [
+                        {
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "vertical",
+                          "align": "center",
+                          "children": [
+                            {
+                              "type": "icon",
+                              "name": "mail"
+                            },
+                            {
+                              "variant": "body",
+                              "type": "typography",
+                              "content": "Receipt will be sent after payment.",
+                              "color": "muted"
+                            }
+                          ]
+                        }
                       ]
                     }
                   ]
@@ -4413,16 +4413,16 @@
                       "appName": "ServiceMarketplace",
                       "children": [
                         {
+                          "type": "loading-state",
                           "title": "Sending receipt...",
-                          "message": "Delivering your payment receipt.",
-                          "type": "loading-state"
+                          "message": "Delivering your payment receipt."
                         }
                       ],
                       "navItems": [
                         {
+                          "icon": "package",
                           "label": "Products",
-                          "href": "/products",
-                          "icon": "package"
+                          "href": "/products"
                         },
                         {
                           "icon": "layout-list",
@@ -4435,8 +4435,8 @@
                           "label": "Checkout"
                         },
                         {
-                          "href": "/orders",
                           "label": "Orders",
+                          "href": "/orders",
                           "icon": "clipboard-list"
                         }
                       ]
@@ -4447,14 +4447,14 @@
                     "email",
                     "send",
                     {
-                      "body": "@entity.body",
+                      "to": "@entity.to",
                       "subject": "@entity.subject",
-                      "to": "@entity.to"
+                      "body": "@entity.body"
                     },
                     {
                       "emit": {
-                        "success": "ProductEmailCompleted",
-                        "failure": "ProductEmailFailed"
+                        "failure": "ProductEmailFailed",
+                        "success": "ProductEmailCompleted"
                       }
                     }
                   ]
@@ -4475,6 +4475,26 @@
                     "main",
                     {
                       "appName": "ServiceMarketplace",
+                      "type": "dashboard-layout",
+                      "children": [
+                        {
+                          "align": "center",
+                          "gap": "md",
+                          "children": [
+                            {
+                              "type": "icon",
+                              "name": "check-circle"
+                            },
+                            {
+                              "message": "Receipt sent successfully",
+                              "type": "alert",
+                              "variant": "success"
+                            }
+                          ],
+                          "type": "stack",
+                          "direction": "vertical"
+                        }
+                      ],
                       "navItems": [
                         {
                           "icon": "package",
@@ -4482,9 +4502,9 @@
                           "href": "/products"
                         },
                         {
-                          "label": "Login",
+                          "href": "/login",
                           "icon": "layout-list",
-                          "href": "/login"
+                          "label": "Login"
                         },
                         {
                           "icon": "credit-card",
@@ -4492,31 +4512,11 @@
                           "label": "Checkout"
                         },
                         {
+                          "icon": "clipboard-list",
                           "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
-                        }
-                      ],
-                      "children": [
-                        {
-                          "type": "stack",
-                          "gap": "md",
-                          "align": "center",
-                          "direction": "vertical",
-                          "children": [
-                            {
-                              "name": "check-circle",
-                              "type": "icon"
-                            },
-                            {
-                              "type": "alert",
-                              "message": "Receipt sent successfully",
-                              "variant": "success"
-                            }
-                          ]
+                          "href": "/orders"
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -4535,13 +4535,35 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "ServiceMarketplace",
+                      "children": [
+                        {
+                          "type": "stack",
+                          "gap": "md",
+                          "align": "center",
+                          "direction": "vertical",
+                          "children": [
+                            {
+                              "type": "error-state",
+                              "onRetry": "RETRY_RECEIPT",
+                              "message": "Could not send receipt email.",
+                              "title": "Receipt Failed"
+                            },
+                            {
+                              "icon": "refresh-cw",
+                              "action": "RETRY_RECEIPT",
+                              "label": "Retry",
+                              "variant": "primary",
+                              "type": "button"
+                            }
+                          ]
+                        }
+                      ],
                       "navItems": [
                         {
-                          "label": "Products",
                           "href": "/products",
-                          "icon": "package"
+                          "icon": "package",
+                          "label": "Products"
                         },
                         {
                           "label": "Login",
@@ -4549,39 +4571,17 @@
                           "icon": "layout-list"
                         },
                         {
-                          "icon": "credit-card",
                           "label": "Checkout",
-                          "href": "/checkout"
+                          "href": "/checkout",
+                          "icon": "credit-card"
                         },
                         {
-                          "label": "Orders",
+                          "href": "/orders",
                           "icon": "clipboard-list",
-                          "href": "/orders"
+                          "label": "Orders"
                         }
                       ],
-                      "children": [
-                        {
-                          "type": "stack",
-                          "children": [
-                            {
-                              "type": "error-state",
-                              "message": "Could not send receipt email.",
-                              "onRetry": "RETRY_RECEIPT",
-                              "title": "Receipt Failed"
-                            },
-                            {
-                              "type": "button",
-                              "label": "Retry",
-                              "action": "RETRY_RECEIPT",
-                              "variant": "primary",
-                              "icon": "refresh-cw"
-                            }
-                          ],
-                          "direction": "vertical",
-                          "gap": "md",
-                          "align": "center"
-                        }
-                      ]
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -4604,8 +4604,8 @@
                     "email",
                     "send",
                     {
-                      "subject": "@entity.subject",
                       "body": "@entity.body",
+                      "subject": "@entity.subject",
                       "to": "@entity.to"
                     },
                     {
@@ -4626,37 +4626,37 @@
                     "render-ui",
                     "main",
                     {
-                      "children": [
-                        {
-                          "title": "Sending receipt...",
-                          "message": "Delivering your payment receipt.",
-                          "type": "loading-state"
-                        }
-                      ],
                       "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "label": "Products",
                           "href": "/products",
-                          "icon": "package"
+                          "icon": "package",
+                          "label": "Products"
                         },
                         {
-                          "href": "/login",
                           "icon": "layout-list",
-                          "label": "Login"
+                          "label": "Login",
+                          "href": "/login"
                         },
                         {
+                          "label": "Checkout",
                           "href": "/checkout",
-                          "icon": "credit-card",
-                          "label": "Checkout"
+                          "icon": "credit-card"
                         },
                         {
+                          "href": "/orders",
                           "icon": "clipboard-list",
-                          "label": "Orders",
-                          "href": "/orders"
+                          "label": "Orders"
                         }
                       ],
-                      "appName": "ServiceMarketplace"
+                      "appName": "ServiceMarketplace",
+                      "children": [
+                        {
+                          "type": "loading-state",
+                          "title": "Sending receipt...",
+                          "message": "Delivering your payment receipt."
+                        }
+                      ]
                     }
                   ],
                   [
@@ -4664,9 +4664,9 @@
                     "email",
                     "send",
                     {
-                      "body": "@entity.body",
                       "to": "@entity.to",
-                      "subject": "@entity.subject"
+                      "subject": "@entity.subject",
+                      "body": "@entity.body"
                     },
                     {
                       "emit": {
@@ -4841,8 +4841,8 @@
                     "Order",
                     {
                       "emit": {
-                        "failure": "OrderLoadFailed",
-                        "success": "OrderLoaded"
+                        "success": "OrderLoaded",
+                        "failure": "OrderLoadFailed"
                       }
                     }
                   ],
@@ -4850,22 +4850,22 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "stack",
                       "align": "center",
-                      "gap": "md",
+                      "className": "py-12",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "color": "muted",
-                          "variant": "caption",
                           "type": "typography",
-                          "content": "Loading…"
+                          "variant": "caption",
+                          "content": "Loading…",
+                          "color": "muted"
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "className": "py-12"
+                      "gap": "md",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -4879,135 +4879,135 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Products",
+                          "href": "/products",
+                          "icon": "package"
+                        },
+                        {
+                          "label": "Login",
+                          "href": "/login",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "credit-card",
+                          "href": "/checkout",
+                          "label": "Checkout"
+                        },
+                        {
+                          "label": "Orders",
+                          "icon": "clipboard-list",
+                          "href": "/orders"
+                        }
+                      ],
+                      "appName": "ServiceMarketplace",
                       "children": [
                         {
+                          "type": "stack",
+                          "className": "max-w-5xl mx-auto w-full",
                           "children": [
                             {
                               "justify": "between",
                               "gap": "md",
+                              "direction": "horizontal",
                               "type": "stack",
                               "align": "center",
                               "children": [
                                 {
+                                  "type": "stack",
+                                  "gap": "sm",
                                   "align": "center",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "name": "list",
                                       "type": "icon"
                                     },
                                     {
-                                      "content": "Orders",
                                       "variant": "h2",
+                                      "content": "Orders",
                                       "type": "typography"
                                     }
-                                  ],
-                                  "gap": "sm",
-                                  "direction": "horizontal",
-                                  "type": "stack"
+                                  ]
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "type": "button",
+                                      "icon": "plus",
                                       "action": "CREATE",
                                       "variant": "primary",
-                                      "icon": "plus",
-                                      "label": "Create Order"
+                                      "label": "Create Order",
+                                      "type": "button"
                                     }
                                   ],
-                                  "type": "stack"
+                                  "gap": "sm",
+                                  "type": "stack",
+                                  "direction": "horizontal"
+                                }
+                              ]
+                            },
+                            {
+                              "type": "divider"
+                            },
+                            {
+                              "entity": "@payload.data",
+                              "fields": [],
+                              "itemActions": [
+                                {
+                                  "event": "VIEW",
+                                  "variant": "ghost",
+                                  "label": "View"
+                                },
+                                {
+                                  "variant": "ghost",
+                                  "event": "EDIT",
+                                  "label": "Edit"
+                                },
+                                {
+                                  "variant": "danger",
+                                  "event": "DELETE",
+                                  "label": "Delete"
                                 }
                               ],
-                              "direction": "horizontal"
-                            },
-                            {
-                              "type": "divider"
-                            },
-                            {
                               "columns": [
                                 {
-                                  "variant": "h4",
                                   "icon": "list",
-                                  "label": "Product Name",
-                                  "name": "productName"
+                                  "variant": "h4",
+                                  "name": "productName",
+                                  "label": "Product Name"
                                 },
                                 {
+                                  "variant": "badge",
                                   "name": "amount",
+                                  "label": "Amount",
                                   "colorMap": {
+                                    "active": "success",
+                                    "draft": "warning",
+                                    "failed": "destructive",
+                                    "disabled": "neutral",
                                     "cancelled": "destructive",
+                                    "scheduled": "warning",
                                     "archived": "neutral",
-                                    "pending": "warning",
-                                    "inactive": "neutral",
-                                    "disabled": "neutral",
-                                    "draft": "warning",
                                     "done": "success",
-                                    "active": "success",
-                                    "scheduled": "warning",
                                     "error": "destructive",
-                                    "failed": "destructive",
-                                    "completed": "success"
-                                  },
-                                  "label": "Amount",
-                                  "variant": "badge"
+                                    "completed": "success",
+                                    "inactive": "neutral",
+                                    "pending": "warning"
+                                  }
                                 },
                                 {
+                                  "variant": "caption",
                                   "label": "Payment Status",
-                                  "name": "paymentStatus",
-                                  "variant": "caption"
+                                  "name": "paymentStatus"
                                 }
                               ],
-                              "entity": "@payload.data",
-                              "type": "data-grid",
-                              "fields": [],
-                              "itemActions": [
-                                {
-                                  "event": "VIEW",
-                                  "variant": "ghost",
-                                  "label": "View"
-                                },
-                                {
-                                  "label": "Edit",
-                                  "variant": "ghost",
-                                  "event": "EDIT"
-                                },
-                                {
-                                  "label": "Delete",
-                                  "event": "DELETE",
-                                  "variant": "danger"
-                                }
-                              ]
+                              "type": "data-grid"
                             }
                           ],
-                          "className": "max-w-5xl mx-auto w-full",
-                          "direction": "vertical",
                           "gap": "lg",
-                          "type": "stack"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "ServiceMarketplace",
-                      "navItems": [
-                        {
-                          "href": "/products",
-                          "label": "Products",
-                          "icon": "package"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/login",
-                          "label": "Login"
-                        },
-                        {
-                          "icon": "credit-card",
-                          "href": "/checkout",
-                          "label": "Checkout"
-                        },
-                        {
-                          "label": "Orders",
-                          "href": "/orders",
-                          "icon": "clipboard-list"
+                          "direction": "vertical"
                         }
                       ]
                     }
@@ -5023,11 +5023,15 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "stack",
+                      "align": "center",
+                      "className": "py-12",
+                      "gap": "md",
                       "children": [
                         {
                           "type": "icon",
-                          "color": "destructive",
-                          "name": "alert-triangle"
+                          "name": "alert-triangle",
+                          "color": "destructive"
                         },
                         {
                           "variant": "h3",
@@ -5035,24 +5039,20 @@
                           "type": "typography"
                         },
                         {
-                          "type": "typography",
                           "color": "muted",
+                          "type": "typography",
                           "content": "@payload.error",
                           "variant": "body"
                         },
                         {
+                          "label": "Retry",
+                          "action": "INIT",
                           "variant": "primary",
                           "icon": "rotate-ccw",
-                          "action": "INIT",
-                          "type": "button",
-                          "label": "Retry"
+                          "type": "button"
                         }
                       ],
-                      "type": "stack",
-                      "gap": "md",
-                      "direction": "vertical",
-                      "align": "center",
-                      "className": "py-12"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -5237,10 +5237,14 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
                       "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
+                          "type": "stack",
                           "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
                               "type": "icon",
@@ -5251,28 +5255,24 @@
                               "type": "typography",
                               "content": "Create Order"
                             }
-                          ],
-                          "type": "stack",
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "submitEvent": "SAVE",
-                          "cancelEvent": "CLOSE",
+                          "mode": "create",
                           "fields": [
                             "productName",
                             "amount",
                             "paymentStatus",
                             "orderDate"
                           ],
-                          "mode": "create",
+                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE",
                           "type": "form-section"
                         }
-                      ],
-                      "direction": "vertical",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -5517,8 +5517,8 @@
                     "Order",
                     {
                       "emit": {
-                        "failure": "OrderLoadFailed",
-                        "success": "OrderLoaded"
+                        "success": "OrderLoaded",
+                        "failure": "OrderLoadFailed"
                       },
                       "id": "@payload.id"
                     }
@@ -5527,8 +5527,13 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
                               "type": "icon",
@@ -5536,34 +5541,29 @@
                             },
                             {
                               "type": "typography",
-                              "content": "Edit Order",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "Edit Order"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "sm",
-                          "type": "stack"
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "entity": "@payload.row",
-                          "submitEvent": "SAVE",
                           "fields": [
                             "productName",
                             "amount",
                             "paymentStatus",
                             "orderDate"
                           ],
-                          "cancelEvent": "CLOSE",
+                          "submitEvent": "SAVE",
+                          "type": "form-section",
                           "mode": "edit",
-                          "type": "form-section"
+                          "cancelEvent": "CLOSE"
                         }
-                      ],
-                      "gap": "md",
-                      "type": "stack",
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -5604,8 +5604,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "OrderUpdateFailed",
-                        "success": "OrderUpdated"
+                        "success": "OrderUpdated",
+                        "failure": "OrderUpdateFailed"
                       }
                     }
                   ],
@@ -5742,11 +5742,11 @@
                     "fetch",
                     "Order",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "failure": "OrderLoadFailed",
                         "success": "OrderLoaded"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
@@ -5754,94 +5754,92 @@
                     "modal",
                     {
                       "gap": "md",
-                      "direction": "vertical",
-                      "type": "stack",
                       "children": [
                         {
+                          "direction": "horizontal",
                           "align": "center",
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "eye"
+                              "name": "eye",
+                              "type": "icon"
                             },
                             {
+                              "type": "typography",
                               "variant": "h3",
-                              "content": "@entity.productName",
-                              "type": "typography"
+                              "content": "@entity.productName"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "content": "Product Name",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.productName",
                               "type": "typography",
+                              "content": "@entity.productName",
                               "variant": "body"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
                           "direction": "horizontal",
-                          "type": "stack",
                           "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
                               "content": "Amount",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.amount",
                               "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.amount"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         },
                         {
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Payment Status",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
-                              "content": "@entity.paymentStatus",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.paymentStatus"
                             }
                           ],
-                          "type": "stack",
+                          "gap": "md",
                           "direction": "horizontal",
-                          "gap": "md"
+                          "type": "stack"
                         },
                         {
-                          "type": "stack",
-                          "gap": "md",
                           "direction": "horizontal",
+                          "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
-                              "content": "Order Date",
                               "type": "typography",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "content": "Order Date"
                             },
                             {
+                              "variant": "body",
                               "content": "@entity.orderDate",
-                              "type": "typography",
-                              "variant": "body"
+                              "type": "typography"
                             }
                           ]
                         },
@@ -5849,27 +5847,29 @@
                           "type": "divider"
                         },
                         {
-                          "gap": "sm",
-                          "type": "stack",
                           "justify": "end",
                           "children": [
                             {
-                              "icon": "edit",
-                              "action": "EDIT",
-                              "type": "button",
                               "label": "Edit",
-                              "variant": "primary"
+                              "type": "button",
+                              "variant": "primary",
+                              "icon": "edit",
+                              "action": "EDIT"
                             },
                             {
                               "type": "button",
+                              "label": "Close",
                               "variant": "ghost",
-                              "action": "CLOSE",
-                              "label": "Close"
+                              "action": "CLOSE"
                             }
                           ],
+                          "type": "stack",
+                          "gap": "sm",
                           "direction": "horizontal"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -6096,66 +6096,66 @@
                     "fetch",
                     "Order",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "success": "OrderLoaded",
                         "failure": "OrderLoadFailed"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
-                      "type": "stack",
                       "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
+                          "align": "center",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "alert-triangle"
+                              "name": "alert-triangle",
+                              "type": "icon"
                             },
                             {
-                              "type": "typography",
                               "content": "Delete Order",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             }
                           ],
-                          "type": "stack",
                           "gap": "sm",
                           "direction": "horizontal",
-                          "align": "center"
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
                           "message": "This action cannot be undone.",
-                          "type": "alert"
+                          "type": "alert",
+                          "variant": "error"
                         },
                         {
-                          "gap": "sm",
-                          "type": "stack",
                           "direction": "horizontal",
+                          "justify": "end",
                           "children": [
                             {
-                              "type": "button",
                               "action": "CANCEL",
                               "variant": "ghost",
-                              "label": "Cancel"
+                              "label": "Cancel",
+                              "type": "button"
                             },
                             {
                               "label": "Delete",
                               "action": "CONFIRM_DELETE",
                               "variant": "danger",
-                              "icon": "check",
-                              "type": "button"
+                              "type": "button",
+                              "icon": "check"
                             }
                           ],
-                          "justify": "end"
+                          "type": "stack",
+                          "gap": "sm"
                         }
                       ]
                     }
@@ -6174,8 +6174,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "OrderDeleteFailed",
-                        "success": "OrderDeleted"
+                        "success": "OrderDeleted",
+                        "failure": "OrderDeleteFailed"
                       }
                     }
                   ],