@almadar/std 8.2.0 → 8.3.0

package/behaviors/registry/app/organisms/std-crm.orb

@@ -563,9 +563,9 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "md",
+                      "align": "center",
                       "className": "py-12",
-                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
                           "type": "spinner"
@@ -577,8 +577,8 @@
                           "type": "typography"
                         }
                       ],
-                      "direction": "vertical",
-                      "align": "center"
+                      "type": "stack",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -592,6 +592,8 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "CRM",
                       "navItems": [
                         {
                           "icon": "users",
@@ -599,131 +601,129 @@
                           "href": "/contacts"
                         },
                         {
-                          "label": "Deals",
                           "href": "/deals",
-                          "icon": "briefcase"
+                          "icon": "briefcase",
+                          "label": "Deals"
                         },
                         {
                           "href": "/pipeline",
-                          "label": "Pipeline",
-                          "icon": "bar-chart-2"
+                          "icon": "bar-chart-2",
+                          "label": "Pipeline"
                         },
                         {
-                          "label": "Notes",
                           "icon": "file-text",
-                          "href": "/notes"
+                          "href": "/notes",
+                          "label": "Notes"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "CRM",
                       "children": [
                         {
                           "direction": "vertical",
                           "children": [
                             {
-                              "type": "stack",
                               "children": [
                                 {
                                   "gap": "sm",
+                                  "align": "center",
+                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "users"
                                     },
                                     {
-                                      "type": "typography",
+                                      "variant": "h2",
                                       "content": "Contacts",
-                                      "variant": "h2"
+                                      "type": "typography"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "align": "center"
+                                  ]
                                 },
                                 {
+                                  "type": "stack",
                                   "direction": "horizontal",
                                   "gap": "sm",
-                                  "type": "stack",
                                   "children": [
                                     {
+                                      "action": "CREATE",
                                       "label": "Add Contact",
-                                      "variant": "primary",
                                       "type": "button",
-                                      "icon": "plus",
-                                      "action": "CREATE"
+                                      "variant": "primary",
+                                      "icon": "plus"
                                     }
                                   ]
                                 }
                               ],
-                              "direction": "horizontal",
-                              "gap": "md",
+                              "align": "center",
+                              "type": "stack",
                               "justify": "between",
-                              "align": "center"
+                              "gap": "md",
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "cols": 1.0,
                               "children": [
                                 {
-                                  "value": "@entity",
                                   "icon": "users",
                                   "type": "stat-display",
-                                  "label": "Total Contacts"
+                                  "label": "Total Contacts",
+                                  "value": "@entity"
                                 }
                               ],
+                              "cols": 1.0,
                               "type": "simple-grid"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "itemActions": [
-                                {
-                                  "event": "VIEW",
-                                  "variant": "ghost",
-                                  "label": "View"
-                                },
-                                {
-                                  "variant": "ghost",
-                                  "event": "EDIT",
-                                  "label": "Edit"
-                                },
-                                {
-                                  "event": "DELETE",
-                                  "variant": "danger",
-                                  "label": "Delete"
-                                }
-                              ],
-                              "fields": [],
-                              "type": "data-list",
-                              "variant": "card",
-                              "entity": "@payload.data",
                               "columns": [
                                 {
+                                  "name": "name",
                                   "variant": "h3",
-                                  "icon": "user",
-                                  "name": "name"
+                                  "icon": "user"
                                 },
                                 {
                                   "name": "status",
                                   "variant": "badge"
                                 },
                                 {
-                                  "name": "company",
-                                  "variant": "body"
+                                  "variant": "body",
+                                  "name": "company"
                                 },
                                 {
                                   "variant": "caption",
                                   "name": "email"
                                 },
                                 {
-                                  "name": "phone",
-                                  "variant": "caption"
+                                  "variant": "caption",
+                                  "name": "phone"
                                 }
                               ],
-                              "gap": "sm"
+                              "fields": [],
+                              "itemActions": [
+                                {
+                                  "variant": "ghost",
+                                  "label": "View",
+                                  "event": "VIEW"
+                                },
+                                {
+                                  "label": "Edit",
+                                  "event": "EDIT",
+                                  "variant": "ghost"
+                                },
+                                {
+                                  "label": "Delete",
+                                  "event": "DELETE",
+                                  "variant": "danger"
+                                }
+                              ],
+                              "type": "data-list",
+                              "variant": "card",
+                              "gap": "sm",
+                              "entity": "@payload.data"
                             }
                           ],
                           "type": "stack",
@@ -744,16 +744,13 @@
                     "render-ui",
                     "main",
                     {
-                      "align": "center",
                       "gap": "md",
-                      "direction": "vertical",
-                      "type": "stack",
                       "className": "py-12",
                       "children": [
                         {
                           "name": "alert-triangle",
-                          "type": "icon",
-                          "color": "destructive"
+                          "color": "destructive",
+                          "type": "icon"
                         },
                         {
                           "variant": "h3",
@@ -761,19 +758,22 @@
                           "content": "Failed to load contact"
                         },
                         {
-                          "variant": "body",
-                          "color": "muted",
+                          "content": "@payload.error",
                           "type": "typography",
-                          "content": "@payload.error"
+                          "variant": "body",
+                          "color": "muted"
                         },
                         {
-                          "type": "button",
+                          "label": "Retry",
                           "variant": "primary",
                           "action": "INIT",
                           "icon": "rotate-ccw",
-                          "label": "Retry"
+                          "type": "button"
                         }
-                      ]
+                      ],
+                      "align": "center",
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -957,8 +957,8 @@
                     "Contact",
                     {
                       "emit": {
-                        "success": "ContactLoaded",
-                        "failure": "ContactLoadFailed"
+                        "failure": "ContactLoadFailed",
+                        "success": "ContactLoaded"
                       }
                     }
                   ],
@@ -966,32 +966,31 @@
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
+                      "type": "stack",
                       "direction": "vertical",
                       "children": [
                         {
+                          "type": "stack",
                           "direction": "horizontal",
                           "gap": "sm",
                           "children": [
                             {
-                              "name": "plus-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "plus-circle"
                             },
                             {
-                              "type": "typography",
                               "content": "New Contact",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "submitEvent": "SAVE",
-                          "mode": "create",
                           "cancelEvent": "CLOSE",
+                          "submitEvent": "SAVE",
                           "fields": [
                             "name",
                             "company",
@@ -999,10 +998,11 @@
                             "phone",
                             "status"
                           ],
-                          "type": "form-section"
+                          "type": "form-section",
+                          "mode": "create"
                         }
                       ],
-                      "type": "stack"
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -1043,8 +1043,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "ContactSaved",
-                        "failure": "ContactSaveFailed"
+                        "failure": "ContactSaveFailed",
+                        "success": "ContactSaved"
                       }
                     }
                   ],
@@ -1256,8 +1256,8 @@
                     "Contact",
                     {
                       "emit": {
-                        "failure": "ContactLoadFailed",
-                        "success": "ContactLoaded"
+                        "success": "ContactLoaded",
+                        "failure": "ContactLoadFailed"
                       },
                       "id": "@payload.id"
                     }
@@ -1266,12 +1266,15 @@
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
                       "children": [
                         {
+                          "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
                               "content": "Edit Contact",
@@ -1279,30 +1282,27 @@
                               "type": "typography"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "sm",
                           "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "mode": "edit",
+                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE",
                           "entity": "@payload.row",
+                          "type": "form-section",
                           "fields": [
                             "name",
                             "company",
                             "email",
                             "phone",
                             "status"
-                          ],
-                          "submitEvent": "SAVE",
-                          "type": "form-section",
-                          "mode": "edit",
-                          "cancelEvent": "CLOSE"
+                          ]
                         }
                       ],
                       "type": "stack",
-                      "direction": "vertical",
                       "gap": "md"
                     }
                   ]
@@ -1344,8 +1344,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "ContactUpdateFailed",
-                        "success": "ContactUpdated"
+                        "success": "ContactUpdated",
+                        "failure": "ContactUpdateFailed"
                       }
                     }
                   ],
@@ -1492,8 +1492,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "failure": "ContactLoadFailed",
-                        "success": "ContactLoaded"
+                        "success": "ContactLoaded",
+                        "failure": "ContactLoadFailed"
                       }
                     }
                   ],
@@ -1502,22 +1502,21 @@
                     "modal",
                     {
                       "gap": "md",
-                      "direction": "vertical",
                       "type": "stack",
                       "children": [
                         {
                           "gap": "sm",
-                          "direction": "horizontal",
                           "align": "center",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "name": "eye",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "eye"
                             },
                             {
+                              "content": "@entity.name",
                               "variant": "h3",
-                              "type": "typography",
-                              "content": "@entity.name"
+                              "type": "typography"
                             }
                           ],
                           "type": "stack"
@@ -1526,76 +1525,76 @@
                           "type": "divider"
                         },
                         {
-                          "direction": "horizontal",
-                          "gap": "md",
-                          "type": "stack",
                           "children": [
                             {
-                              "content": "Name",
+                              "variant": "caption",
                               "type": "typography",
-                              "variant": "caption"
+                              "content": "Name"
                             },
                             {
+                              "content": "@entity.name",
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.name"
+                              "variant": "body"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "md",
+                          "type": "stack"
                         },
                         {
-                          "type": "stack",
                           "children": [
                             {
                               "content": "Company",
-                              "type": "typography",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
-                              "variant": "body",
+                              "type": "typography",
                               "content": "@entity.company",
-                              "type": "typography"
+                              "variant": "body"
                             }
                           ],
+                          "type": "stack",
                           "gap": "md",
                           "direction": "horizontal"
                         },
                         {
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "Email"
                             },
                             {
-                              "type": "typography",
                               "content": "@entity.email",
-                              "variant": "body"
+                              "variant": "body",
+                              "type": "typography"
                             }
                           ],
-                          "direction": "horizontal",
                           "type": "stack",
                           "gap": "md"
                         },
                         {
                           "type": "stack",
                           "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "Phone"
+                              "content": "Phone",
+                              "variant": "caption"
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.phone",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.phone"
                             }
-                          ],
-                          "direction": "horizontal"
+                          ]
                         },
                         {
                           "type": "stack",
-                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "typography",
@@ -1603,38 +1602,39 @@
                               "content": "Status"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
+                              "type": "typography",
                               "content": "@entity.status"
                             }
                           ],
-                          "direction": "horizontal"
+                          "gap": "md"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "gap": "sm",
-                          "type": "stack",
+                          "justify": "end",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "label": "Edit",
-                              "variant": "primary",
                               "action": "EDIT",
                               "type": "button",
-                              "icon": "edit"
+                              "variant": "primary",
+                              "icon": "edit",
+                              "label": "Edit"
                             },
                             {
-                              "variant": "ghost",
+                              "action": "CLOSE",
                               "type": "button",
                               "label": "Close",
-                              "action": "CLOSE"
+                              "variant": "ghost"
                             }
                           ],
-                          "justify": "end",
-                          "direction": "horizontal"
+                          "gap": "sm",
+                          "type": "stack"
                         }
-                      ]
+                      ],
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -1869,26 +1869,21 @@
                     "fetch",
                     "Contact",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "ContactLoaded",
                         "failure": "ContactLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
                       "gap": "md",
                       "direction": "vertical",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "gap": "sm",
-                          "align": "center",
-                          "type": "stack",
                           "children": [
                             {
                               "name": "alert-triangle",
@@ -1896,41 +1891,46 @@
                             },
                             {
                               "variant": "h3",
-                              "type": "typography",
-                              "content": "Delete Contact"
+                              "content": "Delete Contact",
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "alert",
                           "message": "This action cannot be undone.",
-                          "variant": "error"
+                          "variant": "error",
+                          "type": "alert"
                         },
                         {
-                          "type": "stack",
-                          "justify": "end",
                           "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
-                              "label": "Cancel",
-                              "type": "button",
                               "action": "CANCEL",
-                              "variant": "ghost"
-                            },
-                            {
+                              "label": "Cancel",
+                              "variant": "ghost",
+                              "type": "button"
+                            },
+                            {
+                              "icon": "check",
+                              "type": "button",
                               "variant": "danger",
-                              "action": "CONFIRM_DELETE",
                               "label": "Delete",
-                              "icon": "check",
-                              "type": "button"
+                              "action": "CONFIRM_DELETE"
                             }
                           ],
-                          "gap": "sm"
+                          "justify": "end"
                         }
-                      ]
+                      ],
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -2215,8 +2215,8 @@
                     "Deal",
                     {
                       "emit": {
-                        "success": "DealLoaded",
-                        "failure": "DealLoadFailed"
+                        "failure": "DealLoadFailed",
+                        "success": "DealLoaded"
                       }
                     }
                   ],
@@ -2224,20 +2224,20 @@
                     "render-ui",
                     "main",
                     {
-                      "align": "center",
-                      "type": "stack",
                       "direction": "vertical",
+                      "align": "center",
                       "gap": "md",
+                      "type": "stack",
                       "className": "py-12",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
-                          "variant": "caption",
                           "color": "muted",
-                          "content": "Loading…"
+                          "content": "Loading…",
+                          "type": "typography",
+                          "variant": "caption"
                         }
                       ]
                     }
@@ -2253,80 +2253,76 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "CRM",
                       "children": [
                         {
-                          "className": "max-w-5xl mx-auto w-full",
-                          "direction": "vertical",
                           "children": [
                             {
+                              "gap": "md",
                               "justify": "between",
                               "align": "center",
-                              "type": "stack",
                               "direction": "horizontal",
-                              "gap": "md",
                               "children": [
                                 {
+                                  "type": "stack",
+                                  "gap": "sm",
+                                  "direction": "horizontal",
+                                  "align": "center",
                                   "children": [
                                     {
                                       "name": "briefcase",
                                       "type": "icon"
                                     },
                                     {
-                                      "variant": "h2",
+                                      "content": "Deals",
                                       "type": "typography",
-                                      "content": "Deals"
+                                      "variant": "h2"
                                     }
-                                  ],
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center"
+                                  ]
                                 },
                                 {
                                   "children": [
                                     {
-                                      "variant": "primary",
-                                      "label": "New Deal",
+                                      "type": "button",
                                       "action": "CREATE",
                                       "icon": "plus",
-                                      "type": "button"
+                                      "label": "New Deal",
+                                      "variant": "primary"
                                     }
                                   ],
+                                  "gap": "sm",
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  "direction": "horizontal"
                                 }
-                              ]
+                              ],
+                              "type": "stack"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "entity": "@payload.data",
                               "itemActions": [
                                 {
-                                  "variant": "ghost",
                                   "label": "View",
-                                  "event": "VIEW"
+                                  "event": "VIEW",
+                                  "variant": "ghost"
                                 },
                                 {
-                                  "event": "EDIT",
                                   "variant": "ghost",
+                                  "event": "EDIT",
                                   "label": "Edit"
                                 },
                                 {
-                                  "event": "DELETE",
                                   "variant": "danger",
+                                  "event": "DELETE",
                                   "label": "Delete"
                                 }
                               ],
-                              "gap": "md",
-                              "cols": 2.0,
                               "columns": [
                                 {
-                                  "icon": "briefcase",
                                   "name": "title",
-                                  "variant": "h3"
+                                  "variant": "h3",
+                                  "icon": "briefcase"
                                 },
                                 {
                                   "name": "stage",
@@ -2338,41 +2334,45 @@
                                   "name": "value"
                                 },
                                 {
-                                  "variant": "caption",
                                   "label": "Contact",
+                                  "variant": "caption",
                                   "name": "contactId"
                                 }
                               ],
+                              "gap": "md",
+                              "entity": "@payload.data",
+                              "type": "data-grid",
                               "fields": [],
-                              "type": "data-grid"
+                              "cols": 2.0
                             }
                           ],
+                          "direction": "vertical",
                           "type": "stack",
+                          "className": "max-w-5xl mx-auto w-full",
                           "gap": "lg"
                         }
                       ],
                       "type": "dashboard-layout",
-                      "appName": "CRM",
                       "navItems": [
                         {
+                          "icon": "users",
                           "label": "Contacts",
-                          "href": "/contacts",
-                          "icon": "users"
+                          "href": "/contacts"
                         },
                         {
+                          "href": "/deals",
                           "label": "Deals",
-                          "icon": "briefcase",
-                          "href": "/deals"
+                          "icon": "briefcase"
                         },
                         {
                           "href": "/pipeline",
-                          "icon": "bar-chart-2",
-                          "label": "Pipeline"
+                          "label": "Pipeline",
+                          "icon": "bar-chart-2"
                         },
                         {
+                          "icon": "file-text",
                           "label": "Notes",
-                          "href": "/notes",
-                          "icon": "file-text"
+                          "href": "/notes"
                         }
                       ]
                     }
@@ -2388,36 +2388,36 @@
                     "render-ui",
                     "main",
                     {
-                      "className": "py-12",
-                      "align": "center",
                       "children": [
                         {
-                          "type": "icon",
                           "name": "alert-triangle",
-                          "color": "destructive"
+                          "color": "destructive",
+                          "type": "icon"
                         },
                         {
+                          "type": "typography",
                           "variant": "h3",
-                          "content": "Failed to load deal",
-                          "type": "typography"
+                          "content": "Failed to load deal"
                         },
                         {
                           "color": "muted",
-                          "variant": "body",
+                          "content": "@payload.error",
                           "type": "typography",
-                          "content": "@payload.error"
+                          "variant": "body"
                         },
                         {
                           "label": "Retry",
-                          "type": "button",
-                          "action": "INIT",
+                          "icon": "rotate-ccw",
                           "variant": "primary",
-                          "icon": "rotate-ccw"
+                          "type": "button",
+                          "action": "INIT"
                         }
                       ],
-                      "gap": "md",
+                      "direction": "vertical",
+                      "align": "center",
                       "type": "stack",
-                      "direction": "vertical"
+                      "className": "py-12",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -2593,8 +2593,8 @@
                     "Deal",
                     {
                       "emit": {
-                        "failure": "DealLoadFailed",
-                        "success": "DealLoaded"
+                        "success": "DealLoaded",
+                        "failure": "DealLoadFailed"
                       }
                     }
                   ],
@@ -2602,11 +2602,13 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
                       "direction": "vertical",
                       "type": "stack",
-                      "gap": "md",
                       "children": [
                         {
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
                               "name": "plus-circle",
@@ -2614,13 +2616,11 @@
                             },
                             {
                               "type": "typography",
-                              "content": "Create Deal",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "Create Deal"
                             }
                           ],
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm"
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
@@ -2628,6 +2628,7 @@
                         {
                           "cancelEvent": "CLOSE",
                           "submitEvent": "SAVE",
+                          "mode": "create",
                           "fields": [
                             "title",
                             "contactId",
@@ -2635,7 +2636,6 @@
                             "stage",
                             "closedAt"
                           ],
-                          "mode": "create",
                           "type": "form-section"
                         }
                       ]
@@ -2882,11 +2882,11 @@
                     "fetch",
                     "Deal",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "success": "DealLoaded",
-                        "failure": "DealLoadFailed"
-                      },
-                      "id": "@payload.id"
+                        "failure": "DealLoadFailed",
+                        "success": "DealLoaded"
+                      }
                     }
                   ],
                   [
@@ -2897,25 +2897,26 @@
                         {
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
+                              "variant": "h3",
                               "type": "typography",
-                              "content": "Edit Deal",
-                              "variant": "h3"
+                              "content": "Edit Deal"
                             }
                           ],
-                          "direction": "horizontal",
                           "gap": "sm",
-                          "type": "stack"
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "entity": "@payload.row",
+                          "mode": "edit",
                           "type": "form-section",
+                          "entity": "@payload.row",
                           "fields": [
                             "title",
                             "contactId",
@@ -2923,14 +2924,13 @@
                             "stage",
                             "closedAt"
                           ],
-                          "mode": "edit",
-                          "submitEvent": "SAVE",
-                          "cancelEvent": "CLOSE"
+                          "cancelEvent": "CLOSE",
+                          "submitEvent": "SAVE"
                         }
                       ],
                       "gap": "md",
-                      "direction": "vertical",
-                      "type": "stack"
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -3109,59 +3109,57 @@
                     "fetch",
                     "Deal",
                     {
-                      "id": "@payload.id",
                       "emit": {
-                        "success": "DealLoaded",
-                        "failure": "DealLoadFailed"
-                      }
+                        "failure": "DealLoadFailed",
+                        "success": "DealLoaded"
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
-                          "gap": "sm",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "eye"
+                              "name": "eye",
+                              "type": "icon"
                             },
                             {
-                              "content": "@entity.title",
                               "variant": "h3",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.title"
                             }
                           ],
-                          "align": "center"
+                          "gap": "sm",
+                          "align": "center",
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "content": "Title",
-                              "type": "typography",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
+                              "type": "typography",
                               "content": "@entity.title"
                             }
                           ],
-                          "direction": "horizontal",
-                          "type": "stack"
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "md",
                           "children": [
                             {
@@ -3171,59 +3169,61 @@
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.contactId",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.contactId"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
                               "content": "Value",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.value",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.value"
                             }
-                          ],
-                          "direction": "horizontal",
-                          "gap": "md",
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
+                              "content": "Stage",
                               "type": "typography",
-                              "content": "Stage"
+                              "variant": "caption"
                             },
                             {
-                              "content": "@entity.stage",
                               "type": "typography",
+                              "content": "@entity.stage",
                               "variant": "body"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "md",
+                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
                               "variant": "caption",
-                              "type": "typography",
-                              "content": "Closed At"
+                              "content": "Closed At",
+                              "type": "typography"
                             },
                             {
+                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.closedAt",
-                              "type": "typography"
+                              "content": "@entity.closedAt"
                             }
                           ]
                         },
@@ -3231,28 +3231,28 @@
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "action": "EDIT",
-                              "icon": "edit",
+                              "label": "Edit",
                               "variant": "primary",
-                              "type": "button",
-                              "label": "Edit"
+                              "icon": "edit",
+                              "action": "EDIT",
+                              "type": "button"
                             },
                             {
+                              "label": "Close",
                               "type": "button",
-                              "variant": "ghost",
                               "action": "CLOSE",
-                              "label": "Close"
+                              "variant": "ghost"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "sm",
-                          "justify": "end"
+                          "justify": "end",
+                          "type": "stack",
+                          "gap": "sm"
                         }
                       ],
-                      "gap": "md",
+                      "type": "stack",
                       "direction": "vertical"
                     }
                   ]
@@ -3480,19 +3480,25 @@
                     "fetch",
                     "Deal",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "DealLoaded",
                         "failure": "DealLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
+                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
+                          "gap": "sm",
+                          "align": "center",
+                          "direction": "horizontal",
                           "type": "stack",
                           "children": [
                             {
@@ -3504,44 +3510,38 @@
                               "content": "Delete Deal",
                               "variant": "h3"
                             }
-                          ],
-                          "align": "center",
-                          "gap": "sm",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
                           "type": "alert",
+                          "variant": "error",
                           "message": "This action cannot be undone."
                         },
                         {
+                          "gap": "sm",
                           "children": [
                             {
-                              "action": "CANCEL",
                               "type": "button",
+                              "variant": "ghost",
                               "label": "Cancel",
-                              "variant": "ghost"
+                              "action": "CANCEL"
                             },
                             {
-                              "icon": "check",
+                              "action": "CONFIRM_DELETE",
                               "type": "button",
+                              "variant": "danger",
                               "label": "Delete",
-                              "action": "CONFIRM_DELETE",
-                              "variant": "danger"
+                              "icon": "check"
                             }
                           ],
                           "justify": "end",
-                          "gap": "sm",
-                          "direction": "horizontal",
-                          "type": "stack"
+                          "type": "stack",
+                          "direction": "horizontal"
                         }
-                      ],
-                      "gap": "md",
-                      "direction": "vertical",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -3558,8 +3558,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "DealDeleteFailed",
-                        "success": "DealDeleted"
+                        "success": "DealDeleted",
+                        "failure": "DealDeleteFailed"
                       }
                     }
                   ],
@@ -3801,8 +3801,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -3810,7 +3810,6 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "CRM",
                       "navItems": [
                         {
                           "href": "/contacts",
@@ -3818,9 +3817,9 @@
                           "label": "Contacts"
                         },
                         {
+                          "href": "/deals",
                           "label": "Deals",
-                          "icon": "briefcase",
-                          "href": "/deals"
+                          "icon": "briefcase"
                         },
                         {
                           "href": "/pipeline",
@@ -3828,26 +3827,24 @@
                           "label": "Pipeline"
                         },
                         {
-                          "icon": "file-text",
                           "label": "Notes",
+                          "icon": "file-text",
                           "href": "/notes"
                         }
                       ],
                       "type": "dashboard-layout",
+                      "appName": "CRM",
                       "children": [
                         {
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Pipeline"
@@ -3855,75 +3852,75 @@
                                   ]
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "between",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
                                       "gap": "md",
+                                      "type": "stack",
                                       "children": [
                                         {
-                                          "name": "bar-chart-2",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "bar-chart-2"
                                         },
                                         {
-                                          "type": "typography",
                                           "variant": "h2",
-                                          "content": "Pipeline"
+                                          "content": "Pipeline",
+                                          "type": "typography"
                                         }
                                       ]
                                     },
                                     {
-                                      "label": "Refresh",
-                                      "type": "button",
-                                      "variant": "secondary",
                                       "icon": "refresh-cw",
-                                      "action": "REFRESH"
+                                      "variant": "secondary",
+                                      "type": "button",
+                                      "action": "REFRESH",
+                                      "label": "Refresh"
                                     }
                                   ],
+                                  "gap": "md",
+                                  "direction": "horizontal",
+                                  "justify": "between",
                                   "type": "stack"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "padding": "md",
-                                  "type": "box",
                                   "children": [
                                     {
                                       "cols": 3.0,
-                                      "type": "simple-grid",
                                       "children": [
                                         {
                                           "value": "@entity.totalDeals",
-                                          "type": "stat-display",
-                                          "label": "TotalDeals"
+                                          "label": "TotalDeals",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.totalValue",
                                           "label": "TotalValue",
+                                          "value": "@entity.totalValue",
                                           "type": "stat-display"
                                         },
                                         {
+                                          "value": "@entity.wonDeals",
                                           "label": "WonDeals",
-                                          "type": "stat-display",
-                                          "value": "@entity.wonDeals"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "label": "LostDeals",
                                           "value": "@entity.lostDeals",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "LostDeals"
                                         },
                                         {
-                                          "value": "@entity.conversionRate",
+                                          "label": "ConversionRate",
                                           "type": "stat-display",
-                                          "label": "ConversionRate"
+                                          "value": "@entity.conversionRate"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
@@ -3934,9 +3931,9 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "variant": "caption",
+                                          "type": "typography",
                                           "content": "Chart View",
-                                          "type": "typography"
+                                          "variant": "caption"
                                         }
                                       ]
                                     },
@@ -3952,8 +3949,8 @@
                                     }
                                   ],
                                   "gap": "md",
-                                  "type": "grid",
-                                  "cols": 2.0
+                                  "cols": 2.0,
+                                  "type": "grid"
                                 },
                                 {
                                   "data": [
@@ -3962,24 +3959,24 @@
                                       "value": 12.0
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "value": 22.0,
                                       "date": "May"
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
                                   ],
                                   "type": "line-chart"
@@ -3988,17 +3985,28 @@
                                   "type": "chart-legend",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
                                   ]
                                 },
                                 {
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
+                                  ],
                                   "type": "graph-view",
+                                  "width": 400.0,
                                   "nodes": [
                                     {
                                       "label": "Start",
@@ -4013,20 +4021,12 @@
                                       "label": "End"
                                     }
                                   ],
-                                  "width": 400.0,
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
-                                    },
-                                    {
-                                      "source": "b",
-                                      "target": "c"
-                                    }
-                                  ],
                                   "height": 200.0
                                 }
-                              ]
+                              ],
+                              "direction": "vertical",
+                              "type": "stack",
+                              "gap": "lg"
                             }
                           ],
                           "type": "scaled-diagram"
@@ -4046,8 +4046,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -4055,37 +4055,37 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "CRM",
                       "navItems": [
                         {
-                          "label": "Contacts",
+                          "href": "/contacts",
                           "icon": "users",
-                          "href": "/contacts"
+                          "label": "Contacts"
                         },
                         {
-                          "icon": "briefcase",
                           "label": "Deals",
-                          "href": "/deals"
+                          "href": "/deals",
+                          "icon": "briefcase"
                         },
                         {
+                          "label": "Pipeline",
                           "icon": "bar-chart-2",
-                          "href": "/pipeline",
-                          "label": "Pipeline"
+                          "href": "/pipeline"
                         },
                         {
                           "label": "Notes",
-                          "icon": "file-text",
-                          "href": "/notes"
+                          "href": "/notes",
+                          "icon": "file-text"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "CRM",
                       "children": [
                         {
                           "children": [
                             {
                               "gap": "lg",
-                              "direction": "vertical",
                               "type": "stack",
+                              "direction": "vertical",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -4102,86 +4102,85 @@
                                 {
                                   "direction": "horizontal",
                                   "gap": "md",
+                                  "type": "stack",
                                   "justify": "between",
                                   "children": [
                                     {
                                       "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "bar-chart-2"
+                                          "name": "bar-chart-2",
+                                          "type": "icon"
                                         },
                                         {
                                           "type": "typography",
-                                          "content": "Pipeline",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "content": "Pipeline"
                                         }
                                       ],
-                                      "type": "stack",
-                                      "direction": "horizontal"
+                                      "direction": "horizontal",
+                                      "type": "stack"
                                     },
                                     {
-                                      "icon": "refresh-cw",
                                       "action": "REFRESH",
                                       "variant": "secondary",
+                                      "icon": "refresh-cw",
                                       "type": "button",
                                       "label": "Refresh"
                                     }
-                                  ],
-                                  "type": "stack"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "padding": "md",
                                   "type": "box",
                                   "children": [
                                     {
                                       "children": [
                                         {
-                                          "type": "stat-display",
+                                          "value": "@entity.totalDeals",
                                           "label": "TotalDeals",
-                                          "value": "@entity.totalDeals"
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "label": "TotalValue",
                                           "type": "stat-display",
-                                          "value": "@entity.totalValue",
-                                          "label": "TotalValue"
+                                          "value": "@entity.totalValue"
                                         },
                                         {
+                                          "type": "stat-display",
                                           "label": "WonDeals",
-                                          "value": "@entity.wonDeals",
-                                          "type": "stat-display"
+                                          "value": "@entity.wonDeals"
                                         },
                                         {
-                                          "type": "stat-display",
+                                          "value": "@entity.lostDeals",
                                           "label": "LostDeals",
-                                          "value": "@entity.lostDeals"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "label": "ConversionRate",
                                           "value": "@entity.conversionRate",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "ConversionRate"
                                         }
                                       ],
                                       "type": "simple-grid",
                                       "cols": 3.0
                                     }
-                                  ],
-                                  "padding": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "cols": 2.0,
                                   "children": [
                                     {
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "content": "Chart View",
-                                          "variant": "caption"
+                                          "variant": "caption",
+                                          "type": "typography"
                                         }
                                       ],
                                       "type": "card"
@@ -4190,47 +4189,47 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "content": "Graph View",
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "type": "typography"
+                                          "content": "Graph View"
                                         }
                                       ]
                                     }
                                   ],
-                                  "type": "grid",
-                                  "gap": "md"
+                                  "cols": 2.0,
+                                  "gap": "md",
+                                  "type": "grid"
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "value": 12.0,
-                                      "date": "Jan"
+                                      "date": "Jan",
+                                      "value": 12.0
                                     },
                                     {
                                       "date": "Feb",
                                       "value": 19.0
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
-                                      "value": 25.0,
-                                      "date": "Apr"
+                                      "date": "Apr",
+                                      "value": 25.0
                                     },
                                     {
-                                      "value": 22.0,
-                                      "date": "May"
+                                      "date": "May",
+                                      "value": 22.0
                                     },
                                     {
                                       "date": "Jun",
                                       "value": 30.0
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
@@ -4240,19 +4239,11 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "edges": [
-                                    {
-                                      "target": "b",
-                                      "source": "a"
-                                    },
-                                    {
-                                      "target": "c",
-                                      "source": "b"
-                                    }
-                                  ],
+                                  "height": 200.0,
                                   "nodes": [
                                     {
                                       "label": "Start",
@@ -4268,7 +4259,16 @@
                                     }
                                   ],
                                   "width": 400.0,
-                                  "height": 200.0,
+                                  "edges": [
+                                    {
+                                      "target": "b",
+                                      "source": "a"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
+                                  ],
                                   "type": "graph-view"
                                 }
                               ]
@@ -4291,8 +4291,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -4303,13 +4303,13 @@
                       "navItems": [
                         {
                           "href": "/contacts",
-                          "icon": "users",
-                          "label": "Contacts"
+                          "label": "Contacts",
+                          "icon": "users"
                         },
                         {
+                          "icon": "briefcase",
                           "label": "Deals",
-                          "href": "/deals",
-                          "icon": "briefcase"
+                          "href": "/deals"
                         },
                         {
                           "href": "/pipeline",
@@ -4317,11 +4317,13 @@
                           "label": "Pipeline"
                         },
                         {
-                          "icon": "file-text",
                           "label": "Notes",
-                          "href": "/notes"
+                          "href": "/notes",
+                          "icon": "file-text"
                         }
                       ],
+                      "appName": "CRM",
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "children": [
@@ -4333,8 +4335,8 @@
                                 {
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Pipeline"
@@ -4343,13 +4345,15 @@
                                   "type": "breadcrumb"
                                 },
                                 {
+                                  "gap": "md",
                                   "type": "stack",
+                                  "justify": "between",
                                   "direction": "horizontal",
-                                  "gap": "md",
                                   "children": [
                                     {
-                                      "direction": "horizontal",
                                       "type": "stack",
+                                      "direction": "horizontal",
+                                      "gap": "md",
                                       "children": [
                                         {
                                           "type": "icon",
@@ -4357,21 +4361,19 @@
                                         },
                                         {
                                           "content": "Pipeline",
-                                          "variant": "h2",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "h2"
                                         }
-                                      ],
-                                      "gap": "md"
+                                      ]
                                     },
                                     {
-                                      "label": "Refresh",
                                       "action": "REFRESH",
+                                      "variant": "secondary",
                                       "icon": "refresh-cw",
-                                      "type": "button",
-                                      "variant": "secondary"
+                                      "label": "Refresh",
+                                      "type": "button"
                                     }
-                                  ],
-                                  "justify": "between"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -4380,35 +4382,35 @@
                                   "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "cols": 3.0,
                                       "children": [
                                         {
+                                          "label": "TotalDeals",
                                           "value": "@entity.totalDeals",
-                                          "type": "stat-display",
-                                          "label": "TotalDeals"
+                                          "type": "stat-display"
                                         },
                                         {
                                           "value": "@entity.totalValue",
-                                          "label": "TotalValue",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "TotalValue"
                                         },
                                         {
-                                          "type": "stat-display",
+                                          "label": "WonDeals",
                                           "value": "@entity.wonDeals",
-                                          "label": "WonDeals"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "label": "LostDeals",
+                                          "type": "stat-display",
                                           "value": "@entity.lostDeals",
-                                          "type": "stat-display"
+                                          "label": "LostDeals"
                                         },
                                         {
-                                          "value": "@entity.conversionRate",
+                                          "label": "ConversionRate",
                                           "type": "stat-display",
-                                          "label": "ConversionRate"
+                                          "value": "@entity.conversionRate"
                                         }
-                                      ]
+                                      ],
+                                      "cols": 3.0,
+                                      "type": "simple-grid"
                                     }
                                   ],
                                   "type": "box"
@@ -4417,53 +4419,53 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "grid",
                                   "cols": 2.0,
-                                  "gap": "md",
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
+                                          "content": "Chart View",
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Chart View"
+                                          "variant": "caption"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Graph View",
-                                          "type": "typography"
+                                          "content": "Graph View"
                                         }
                                       ]
                                     }
                                   ],
-                                  "type": "grid"
+                                  "gap": "md"
                                 },
                                 {
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
                                       "date": "Feb",
                                       "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
@@ -4473,6 +4475,7 @@
                                   "type": "line-chart"
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
@@ -4482,24 +4485,13 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
-                                    },
-                                    {
-                                      "source": "b",
-                                      "target": "c"
-                                    }
-                                  ],
                                   "nodes": [
                                     {
-                                      "label": "Start",
-                                      "id": "a"
+                                      "id": "a",
+                                      "label": "Start"
                                     },
                                     {
                                       "label": "Process",
@@ -4510,18 +4502,26 @@
                                       "id": "c"
                                     }
                                   ],
-                                  "height": 200.0,
                                   "width": 400.0,
-                                  "type": "graph-view"
+                                  "type": "graph-view",
+                                  "edges": [
+                                    {
+                                      "target": "b",
+                                      "source": "a"
+                                    },
+                                    {
+                                      "target": "c",
+                                      "source": "b"
+                                    }
+                                  ],
+                                  "height": 200.0
                                 }
                               ]
                             }
                           ],
                           "type": "scaled-diagram"
                         }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "CRM"
+                      ]
                     }
                   ]
                 ]
@@ -4536,8 +4536,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -4545,11 +4545,13 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "CRM",
                       "navItems": [
                         {
                           "label": "Contacts",
-                          "href": "/contacts",
-                          "icon": "users"
+                          "icon": "users",
+                          "href": "/contacts"
                         },
                         {
                           "label": "Deals",
@@ -4557,24 +4559,22 @@
                           "icon": "briefcase"
                         },
                         {
-                          "icon": "bar-chart-2",
+                          "label": "Pipeline",
                           "href": "/pipeline",
-                          "label": "Pipeline"
+                          "icon": "bar-chart-2"
                         },
                         {
-                          "label": "Notes",
+                          "icon": "file-text",
                           "href": "/notes",
-                          "icon": "file-text"
+                          "label": "Notes"
                         }
                       ],
-                      "appName": "CRM",
-                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "type": "scaled-diagram",
                           "children": [
                             {
                               "direction": "vertical",
-                              "type": "stack",
                               "gap": "lg",
                               "children": [
                                 {
@@ -4590,35 +4590,35 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
                                   "children": [
                                     {
+                                      "direction": "horizontal",
+                                      "gap": "md",
+                                      "type": "stack",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "bar-chart-2"
+                                          "name": "bar-chart-2",
+                                          "type": "icon"
                                         },
                                         {
-                                          "type": "typography",
                                           "content": "Pipeline",
+                                          "type": "typography",
                                           "variant": "h2"
                                         }
-                                      ],
-                                      "direction": "horizontal",
-                                      "gap": "md",
-                                      "type": "stack"
+                                      ]
                                     },
                                     {
-                                      "type": "button",
-                                      "label": "Refresh",
-                                      "icon": "refresh-cw",
                                       "variant": "secondary",
-                                      "action": "REFRESH"
+                                      "label": "Refresh",
+                                      "type": "button",
+                                      "action": "REFRESH",
+                                      "icon": "refresh-cw"
                                     }
                                   ],
+                                  "gap": "md",
                                   "justify": "between",
-                                  "gap": "md"
+                                  "direction": "horizontal",
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "divider"
@@ -4628,18 +4628,18 @@
                                   "padding": "md",
                                   "children": [
                                     {
-                                      "cols": 3.0,
                                       "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
+                                          "label": "TotalDeals",
                                           "value": "@entity.totalDeals",
-                                          "type": "stat-display",
-                                          "label": "TotalDeals"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.totalValue",
                                           "label": "TotalValue",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "value": "@entity.totalValue"
                                         },
                                         {
                                           "type": "stat-display",
@@ -4647,13 +4647,13 @@
                                           "label": "WonDeals"
                                         },
                                         {
-                                          "value": "@entity.lostDeals",
                                           "type": "stat-display",
+                                          "value": "@entity.lostDeals",
                                           "label": "LostDeals"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "ConversionRate",
+                                          "type": "stat-display",
                                           "value": "@entity.conversionRate"
                                         }
                                       ]
@@ -4665,18 +4665,17 @@
                                 },
                                 {
                                   "gap": "md",
-                                  "cols": 2.0,
                                   "type": "grid",
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
                                           "variant": "caption",
-                                          "type": "typography",
-                                          "content": "Chart View"
+                                          "content": "Chart View",
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "children": [
@@ -4688,38 +4687,40 @@
                                       ],
                                       "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "cols": 2.0
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
                                       "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
-                                      "value": 25.0,
-                                      "date": "Apr"
+                                      "date": "Apr",
+                                      "value": 25.0
                                     },
                                     {
                                       "date": "May",
                                       "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
@@ -4729,42 +4730,41 @@
                                       "color": "muted",
                                       "label": "Previous"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
-                                  "type": "graph-view",
                                   "height": 200.0,
+                                  "width": 400.0,
                                   "nodes": [
                                     {
-                                      "label": "Start",
-                                      "id": "a"
+                                      "id": "a",
+                                      "label": "Start"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
                                       "id": "c",
                                       "label": "End"
                                     }
                                   ],
-                                  "width": 400.0,
                                   "edges": [
                                     {
-                                      "target": "b",
-                                      "source": "a"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
                                       "target": "c",
                                       "source": "b"
                                     }
-                                  ]
+                                  ],
+                                  "type": "graph-view"
                                 }
-                              ]
+                              ],
+                              "type": "stack"
                             }
-                          ],
-                          "type": "scaled-diagram"
+                          ]
                         }
                       ]
                     }
@@ -4781,8 +4781,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -4790,14 +4790,13 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "CRM",
                       "children": [
                         {
+                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
                               "gap": "lg",
-                              "direction": "vertical",
+                              "type": "stack",
                               "children": [
                                 {
                                   "items": [
@@ -4812,12 +4811,13 @@
                                   "type": "breadcrumb"
                                 },
                                 {
-                                  "gap": "md",
+                                  "type": "stack",
                                   "direction": "horizontal",
                                   "justify": "between",
-                                  "type": "stack",
                                   "children": [
                                     {
+                                      "gap": "md",
+                                      "type": "stack",
                                       "children": [
                                         {
                                           "type": "icon",
@@ -4825,43 +4825,38 @@
                                         },
                                         {
                                           "type": "typography",
-                                          "variant": "h2",
-                                          "content": "Pipeline"
+                                          "content": "Pipeline",
+                                          "variant": "h2"
                                         }
                                       ],
-                                      "type": "stack",
-                                      "direction": "horizontal",
-                                      "gap": "md"
+                                      "direction": "horizontal"
                                     },
                                     {
+                                      "variant": "secondary",
                                       "type": "button",
-                                      "label": "Refresh",
                                       "action": "REFRESH",
-                                      "variant": "secondary",
+                                      "label": "Refresh",
                                       "icon": "refresh-cw"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "padding": "md",
-                                  "type": "box",
                                   "children": [
                                     {
-                                      "cols": 3.0,
-                                      "type": "simple-grid",
                                       "children": [
                                         {
                                           "label": "TotalDeals",
-                                          "type": "stat-display",
-                                          "value": "@entity.totalDeals"
+                                          "value": "@entity.totalDeals",
+                                          "type": "stat-display"
                                         },
                                         {
                                           "label": "TotalValue",
-                                          "value": "@entity.totalValue",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "value": "@entity.totalValue"
                                         },
                                         {
                                           "type": "stat-display",
@@ -4869,18 +4864,22 @@
                                           "value": "@entity.wonDeals"
                                         },
                                         {
+                                          "type": "stat-display",
                                           "label": "LostDeals",
-                                          "value": "@entity.lostDeals",
-                                          "type": "stat-display"
+                                          "value": "@entity.lostDeals"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "ConversionRate",
-                                          "value": "@entity.conversionRate"
+                                          "value": "@entity.conversionRate",
+                                          "type": "stat-display"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid",
+                                      "cols": 3.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
@@ -4888,118 +4887,118 @@
                                 {
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
+                                          "content": "Chart View",
                                           "variant": "caption",
-                                          "content": "Chart View"
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "variant": "caption",
                                           "content": "Graph View",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "caption"
                                         }
                                       ]
                                     }
                                   ],
                                   "cols": 2.0,
-                                  "gap": "md",
-                                  "type": "grid"
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
                                       "date": "Feb",
                                       "value": 19.0
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
                                       "value": 25.0,
                                       "date": "Apr"
                                     },
                                     {
-                                      "value": 22.0,
-                                      "date": "May"
+                                      "date": "May",
+                                      "value": 22.0
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "edges": [
+                                  "nodes": [
                                     {
-                                      "source": "a",
-                                      "target": "b"
+                                      "label": "Start",
+                                      "id": "a"
+                                    },
+                                    {
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
-                                      "source": "b",
-                                      "target": "c"
+                                      "label": "End",
+                                      "id": "c"
                                     }
                                   ],
-                                  "height": 200.0,
                                   "width": 400.0,
+                                  "height": 200.0,
                                   "type": "graph-view",
-                                  "nodes": [
-                                    {
-                                      "id": "a",
-                                      "label": "Start"
-                                    },
+                                  "edges": [
                                     {
-                                      "id": "b",
-                                      "label": "Process"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "source": "b",
+                                      "target": "c"
                                     }
                                   ]
                                 }
-                              ]
+                              ],
+                              "direction": "vertical"
                             }
-                          ],
-                          "type": "scaled-diagram"
+                          ]
                         }
                       ],
                       "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "icon": "users",
                           "label": "Contacts",
+                          "icon": "users",
                           "href": "/contacts"
                         },
                         {
                           "label": "Deals",
-                          "href": "/deals",
-                          "icon": "briefcase"
+                          "icon": "briefcase",
+                          "href": "/deals"
                         },
                         {
                           "href": "/pipeline",
@@ -5008,10 +5007,11 @@
                         },
                         {
                           "label": "Notes",
-                          "href": "/notes",
-                          "icon": "file-text"
+                          "icon": "file-text",
+                          "href": "/notes"
                         }
-                      ]
+                      ],
+                      "appName": "CRM"
                     }
                   ]
                 ]
@@ -5162,22 +5162,22 @@
                     "render-ui",
                     "main",
                     {
-                      "align": "center",
-                      "gap": "md",
-                      "className": "py-12",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
-                          "variant": "caption",
+                          "color": "muted",
                           "content": "Loading…",
-                          "color": "muted"
+                          "variant": "caption",
+                          "type": "typography"
                         }
                       ],
+                      "gap": "md",
+                      "direction": "vertical",
+                      "align": "center",
                       "type": "stack",
-                      "direction": "vertical"
+                      "className": "py-12"
                     }
                   ]
                 ]
@@ -5191,111 +5191,111 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "label": "Contacts",
-                          "href": "/contacts",
-                          "icon": "users"
-                        },
-                        {
-                          "icon": "briefcase",
-                          "href": "/deals",
-                          "label": "Deals"
-                        },
-                        {
-                          "href": "/pipeline",
-                          "icon": "bar-chart-2",
-                          "label": "Pipeline"
-                        },
-                        {
-                          "icon": "file-text",
-                          "href": "/notes",
-                          "label": "Notes"
-                        }
-                      ],
-                      "appName": "CRM",
                       "type": "dashboard-layout",
                       "children": [
                         {
                           "direction": "vertical",
                           "type": "stack",
                           "gap": "lg",
+                          "className": "max-w-5xl mx-auto w-full",
                           "children": [
                             {
-                              "direction": "horizontal",
-                              "type": "stack",
-                              "justify": "between",
                               "align": "center",
                               "children": [
                                 {
-                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "align": "center",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "file-text"
                                     },
                                     {
-                                      "type": "typography",
                                       "variant": "h2",
+                                      "type": "typography",
                                       "content": "Notes"
                                     }
                                   ],
-                                  "gap": "sm",
-                                  "align": "center",
-                                  "type": "stack"
+                                  "type": "stack",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "children": [
                                     {
-                                      "variant": "primary",
                                       "type": "button",
-                                      "icon": "edit",
+                                      "label": "Compose",
+                                      "variant": "primary",
                                       "action": "COMPOSE",
-                                      "label": "Compose"
+                                      "icon": "edit"
                                     }
                                   ],
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 }
                               ],
-                              "gap": "md"
+                              "gap": "md",
+                              "type": "stack",
+                              "direction": "horizontal",
+                              "justify": "between"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "data-list",
-                              "fields": [],
-                              "itemActions": [
-                                {
-                                  "event": "VIEW",
-                                  "variant": "ghost",
-                                  "label": "View"
-                                }
-                              ],
+                              "entity": "@payload.data",
                               "columns": [
                                 {
                                   "name": "subject",
-                                  "icon": "file-text",
-                                  "variant": "h4"
+                                  "variant": "h4",
+                                  "icon": "file-text"
                                 },
                                 {
                                   "variant": "caption",
                                   "name": "author"
                                 },
                                 {
-                                  "variant": "caption",
                                   "format": "date",
-                                  "name": "createdAt"
+                                  "name": "createdAt",
+                                  "variant": "caption"
                                 }
                               ],
-                              "entity": "@payload.data",
                               "variant": "card",
+                              "type": "data-list",
+                              "fields": [],
+                              "itemActions": [
+                                {
+                                  "variant": "ghost",
+                                  "label": "View",
+                                  "event": "VIEW"
+                                }
+                              ],
                               "gap": "sm"
                             }
-                          ],
-                          "className": "max-w-5xl mx-auto w-full"
+                          ]
+                        }
+                      ],
+                      "appName": "CRM",
+                      "navItems": [
+                        {
+                          "icon": "users",
+                          "href": "/contacts",
+                          "label": "Contacts"
+                        },
+                        {
+                          "label": "Deals",
+                          "icon": "briefcase",
+                          "href": "/deals"
+                        },
+                        {
+                          "href": "/pipeline",
+                          "icon": "bar-chart-2",
+                          "label": "Pipeline"
+                        },
+                        {
+                          "label": "Notes",
+                          "icon": "file-text",
+                          "href": "/notes"
                         }
                       ]
                     }
@@ -5311,36 +5311,36 @@
                     "render-ui",
                     "main",
                     {
+                      "className": "py-12",
+                      "direction": "vertical",
                       "gap": "md",
+                      "type": "stack",
                       "align": "center",
                       "children": [
                         {
+                          "type": "icon",
                           "name": "alert-triangle",
-                          "color": "destructive",
-                          "type": "icon"
+                          "color": "destructive"
                         },
                         {
-                          "content": "Failed to load note",
                           "type": "typography",
+                          "content": "Failed to load note",
                           "variant": "h3"
                         },
                         {
                           "content": "@payload.error",
-                          "type": "typography",
                           "color": "muted",
+                          "type": "typography",
                           "variant": "body"
                         },
                         {
-                          "type": "button",
+                          "label": "Retry",
                           "variant": "primary",
+                          "action": "INIT",
                           "icon": "rotate-ccw",
-                          "label": "Retry",
-                          "action": "INIT"
+                          "type": "button"
                         }
-                      ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "className": "py-12"
+                      ]
                     }
                   ]
                 ]
@@ -5511,40 +5511,40 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
-                          "direction": "horizontal",
+                          "type": "stack",
                           "gap": "sm",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "icon",
                               "name": "edit"
                             },
                             {
-                              "content": "New Note",
                               "variant": "h3",
+                              "content": "New Note",
                               "type": "typography"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "mode": "create",
-                          "submitEvent": "SEND",
                           "cancelEvent": "CLOSE",
                           "fields": [
                             "subject",
                             "body",
                             "author"
                           ],
+                          "submitEvent": "SEND",
                           "type": "form-section"
                         }
                       ],
-                      "gap": "md",
-                      "type": "stack",
                       "direction": "vertical"
                     }
                   ]
@@ -5720,59 +5720,59 @@
                     "fetch",
                     "Note",
                     {
-                      "id": "@payload.id",
                       "emit": {
-                        "failure": "NoteLoadFailed",
-                        "success": "NoteLoaded"
-                      }
+                        "success": "NoteLoaded",
+                        "failure": "NoteLoadFailed"
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
                           "type": "stack",
                           "direction": "horizontal",
+                          "gap": "sm",
                           "align": "center",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "eye"
+                              "name": "eye",
+                              "type": "icon"
                             },
                             {
                               "variant": "h3",
-                              "content": "@entity.subject",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.subject"
                             }
-                          ],
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "type": "stack",
+                          "direction": "horizontal",
                           "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
+                              "variant": "caption",
                               "content": "Subject",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.subject",
                               "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.subject"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
                           "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
@@ -5781,66 +5781,66 @@
                             },
                             {
                               "content": "@entity.body",
-                              "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
-                          ]
+                          ],
+                          "gap": "md",
+                          "direction": "horizontal"
                         },
                         {
+                          "direction": "horizontal",
+                          "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "typography",
                               "content": "Author",
+                              "type": "typography",
                               "variant": "caption"
                             },
                             {
-                              "variant": "body",
                               "type": "typography",
+                              "variant": "body",
                               "content": "@entity.author"
                             }
-                          ],
-                          "gap": "md",
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
+                          "gap": "md",
+                          "direction": "horizontal",
                           "type": "stack",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
-                              "content": "Created At"
+                              "content": "Created At",
+                              "variant": "caption"
                             },
                             {
-                              "variant": "body",
                               "type": "typography",
+                              "variant": "body",
                               "content": "@entity.createdAt"
                             }
-                          ],
-                          "direction": "horizontal",
-                          "gap": "md"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "justify": "end",
                           "children": [
                             {
-                              "action": "CLOSE",
-                              "type": "button",
                               "label": "Close",
-                              "variant": "ghost"
+                              "variant": "ghost",
+                              "type": "button",
+                              "action": "CLOSE"
                             }
                           ],
-                          "direction": "horizontal",
                           "type": "stack",
-                          "justify": "end",
+                          "direction": "horizontal",
                           "gap": "sm"
                         }
                       ],
-                      "direction": "vertical",
-                      "type": "stack",
-                      "gap": "md"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -5912,4 +5912,4 @@
       ]
     }
   ]
-}
+}