@almadar/std 8.5.1 → 9.0.0

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

@@ -61,7 +61,7 @@
             {
               "event": "CONVERT_LEAD",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -72,7 +72,7 @@
               "event": "ContactLoaded",
               "description": "Fired when Contact finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Contact]"
@@ -83,7 +83,7 @@
               "event": "ContactLoadFailed",
               "description": "Fired when Contact fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -97,7 +97,7 @@
             {
               "event": "ContactSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -107,7 +107,7 @@
             {
               "event": "ContactSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -121,7 +121,7 @@
             {
               "event": "ContactUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -131,7 +131,7 @@
             {
               "event": "ContactUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -145,7 +145,7 @@
             {
               "event": "ContactDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -155,7 +155,7 @@
             {
               "event": "ContactDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -169,7 +169,7 @@
             {
               "event": "DealSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -179,7 +179,7 @@
             {
               "event": "DealSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -193,7 +193,7 @@
             {
               "event": "DealUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -203,7 +203,7 @@
             {
               "event": "DealUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -217,7 +217,7 @@
             {
               "event": "DealDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -227,7 +227,7 @@
             {
               "event": "DealDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -241,7 +241,7 @@
             {
               "event": "NoteSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -251,7 +251,7 @@
             {
               "event": "NoteSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -304,7 +304,7 @@
               {
                 "key": "ContactLoaded",
                 "name": "Contact loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Contact]"
@@ -314,7 +314,7 @@
               {
                 "key": "ContactLoadFailed",
                 "name": "Contact load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -332,7 +332,7 @@
               {
                 "key": "ContactSaved",
                 "name": "Contact saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -342,7 +342,7 @@
               {
                 "key": "ContactSaveFailed",
                 "name": "Contact save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -356,7 +356,7 @@
               {
                 "key": "ContactUpdated",
                 "name": "Contact updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -366,7 +366,7 @@
               {
                 "key": "ContactUpdateFailed",
                 "name": "Contact update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -380,7 +380,7 @@
               {
                 "key": "ContactDeleted",
                 "name": "Contact deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -390,7 +390,7 @@
               {
                 "key": "ContactDeleteFailed",
                 "name": "Contact delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -404,7 +404,7 @@
               {
                 "key": "DealSaved",
                 "name": "Deal saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -414,7 +414,7 @@
               {
                 "key": "DealSaveFailed",
                 "name": "Deal save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -428,7 +428,7 @@
               {
                 "key": "DealUpdated",
                 "name": "Deal updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -438,7 +438,7 @@
               {
                 "key": "DealUpdateFailed",
                 "name": "Deal update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -452,7 +452,7 @@
               {
                 "key": "DealDeleted",
                 "name": "Deal deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -462,7 +462,7 @@
               {
                 "key": "DealDeleteFailed",
                 "name": "Deal delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -476,7 +476,7 @@
               {
                 "key": "NoteSaved",
                 "name": "Note saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -486,7 +486,7 @@
               {
                 "key": "NoteSaveFailed",
                 "name": "Note save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -500,7 +500,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -515,7 +515,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -530,7 +530,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -554,8 +554,8 @@
                     "Contact",
                     {
                       "emit": {
-                        "failure": "ContactLoadFailed",
-                        "success": "ContactLoaded"
+                        "success": "ContactLoaded",
+                        "failure": "ContactLoadFailed"
                       }
                     }
                   ],
@@ -563,22 +563,22 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "stack",
                       "direction": "vertical",
                       "gap": "md",
+                      "className": "py-12",
+                      "align": "center",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "content": "Loading…",
-                          "type": "typography",
                           "variant": "caption",
-                          "color": "muted"
+                          "content": "Loading…",
+                          "color": "muted",
+                          "type": "typography"
                         }
-                      ],
-                      "className": "py-12",
-                      "type": "stack",
-                      "align": "center"
+                      ]
                     }
                   ]
                 ]
@@ -592,50 +592,70 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "CRM",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Contacts",
+                          "href": "/contacts",
+                          "icon": "users"
+                        },
+                        {
+                          "href": "/deals",
+                          "icon": "briefcase",
+                          "label": "Deals"
+                        },
+                        {
+                          "icon": "bar-chart-2",
+                          "label": "Pipeline",
+                          "href": "/pipeline"
+                        },
+                        {
+                          "label": "Notes",
+                          "icon": "file-text",
+                          "href": "/notes"
+                        }
+                      ],
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
-                          "className": "max-w-5xl mx-auto w-full",
-                          "gap": "lg",
                           "children": [
                             {
-                              "gap": "md",
                               "type": "stack",
                               "direction": "horizontal",
+                              "gap": "md",
                               "justify": "between",
                               "align": "center",
                               "children": [
                                 {
+                                  "direction": "horizontal",
                                   "gap": "sm",
-                                  "type": "stack",
-                                  "align": "center",
                                   "children": [
                                     {
-                                      "name": "users",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "users"
                                     },
                                     {
+                                      "content": "Contacts",
                                       "type": "typography",
-                                      "variant": "h2",
-                                      "content": "Contacts"
+                                      "variant": "h2"
                                     }
                                   ],
-                                  "direction": "horizontal"
+                                  "align": "center",
+                                  "type": "stack"
                                 },
                                 {
-                                  "gap": "sm",
                                   "type": "stack",
-                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "variant": "primary",
-                                      "type": "button",
                                       "action": "CREATE",
+                                      "variant": "primary",
+                                      "icon": "plus",
                                       "label": "Add Contact",
-                                      "icon": "plus"
+                                      "type": "button"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 }
                               ]
                             },
@@ -644,93 +664,73 @@
                             },
                             {
                               "cols": 1.0,
-                              "type": "simple-grid",
                               "children": [
                                 {
-                                  "label": "Total Contacts",
                                   "type": "stat-display",
+                                  "icon": "users",
                                   "value": "@entity",
-                                  "icon": "users"
+                                  "label": "Total Contacts"
                                 }
-                              ]
+                              ],
+                              "type": "simple-grid"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "entity": "@payload.data",
-                              "type": "data-list",
-                              "itemActions": [
-                                {
-                                  "variant": "ghost",
-                                  "label": "View",
-                                  "event": "VIEW"
-                                },
-                                {
-                                  "event": "EDIT",
-                                  "label": "Edit",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "variant": "danger",
-                                  "event": "DELETE",
-                                  "label": "Delete"
-                                }
-                              ],
                               "columns": [
                                 {
-                                  "name": "name",
+                                  "variant": "h3",
                                   "icon": "user",
-                                  "variant": "h3"
+                                  "name": "name"
                                 },
                                 {
                                   "name": "status",
                                   "variant": "badge"
                                 },
                                 {
-                                  "name": "company",
-                                  "variant": "body"
+                                  "variant": "body",
+                                  "name": "company"
                                 },
                                 {
                                   "name": "email",
                                   "variant": "caption"
                                 },
                                 {
-                                  "variant": "caption",
-                                  "name": "phone"
+                                  "name": "phone",
+                                  "variant": "caption"
                                 }
                               ],
-                              "variant": "card",
                               "gap": "sm",
-                              "fields": []
+                              "entity": "@payload.data",
+                              "fields": [],
+                              "itemActions": [
+                                {
+                                  "variant": "ghost",
+                                  "label": "View",
+                                  "event": "VIEW"
+                                },
+                                {
+                                  "variant": "ghost",
+                                  "label": "Edit",
+                                  "event": "EDIT"
+                                },
+                                {
+                                  "event": "DELETE",
+                                  "label": "Delete",
+                                  "variant": "danger"
+                                }
+                              ],
+                              "variant": "card",
+                              "type": "data-list"
                             }
-                          ]
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Contacts",
-                          "href": "/contacts",
-                          "icon": "users"
-                        },
-                        {
-                          "href": "/deals",
-                          "label": "Deals",
-                          "icon": "briefcase"
-                        },
-                        {
-                          "href": "/pipeline",
-                          "label": "Pipeline",
-                          "icon": "bar-chart-2"
-                        },
-                        {
-                          "icon": "file-text",
-                          "label": "Notes",
-                          "href": "/notes"
+                          ],
+                          "type": "stack",
+                          "gap": "lg",
+                          "className": "max-w-5xl mx-auto w-full",
+                          "direction": "vertical"
                         }
-                      ],
-                      "appName": "CRM"
+                      ]
                     }
                   ]
                 ]
@@ -745,10 +745,10 @@
                     "main",
                     {
                       "gap": "md",
-                      "type": "stack",
-                      "align": "center",
                       "className": "py-12",
                       "direction": "vertical",
+                      "align": "center",
+                      "type": "stack",
                       "children": [
                         {
                           "type": "icon",
@@ -756,22 +756,22 @@
                           "color": "destructive"
                         },
                         {
-                          "type": "typography",
                           "variant": "h3",
+                          "type": "typography",
                           "content": "Failed to load contact"
                         },
                         {
                           "type": "typography",
-                          "content": "@payload.error",
+                          "variant": "body",
                           "color": "muted",
-                          "variant": "body"
+                          "content": "@payload.error"
                         },
                         {
                           "type": "button",
-                          "action": "INIT",
-                          "variant": "primary",
                           "label": "Retry",
-                          "icon": "rotate-ccw"
+                          "variant": "primary",
+                          "icon": "rotate-ccw",
+                          "action": "INIT"
                         }
                       ]
                     }
@@ -790,7 +790,7 @@
             {
               "event": "CONTACT_CREATED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -801,7 +801,7 @@
               "event": "ContactLoadFailed",
               "description": "Fired when Contact fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -816,7 +816,7 @@
               "event": "ContactLoaded",
               "description": "Fired when Contact finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Contact]"
@@ -826,7 +826,7 @@
             {
               "event": "ContactSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -840,7 +840,7 @@
             {
               "event": "ContactSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -874,7 +874,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -889,7 +889,7 @@
               {
                 "key": "ContactLoadFailed",
                 "name": "Contact load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -903,7 +903,7 @@
               {
                 "key": "ContactLoaded",
                 "name": "Contact loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Contact]"
@@ -913,7 +913,7 @@
               {
                 "key": "ContactSaveFailed",
                 "name": "Contact save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -927,7 +927,7 @@
               {
                 "key": "ContactSaved",
                 "name": "Contact saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -968,22 +968,23 @@
                     {
                       "direction": "vertical",
                       "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
                           "gap": "sm",
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "icon",
                               "name": "plus-circle"
                             },
                             {
+                              "content": "New Contact",
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "New Contact"
+                              "variant": "h3"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
                           "type": "divider"
@@ -996,13 +997,12 @@
                             "phone",
                             "status"
                           ],
-                          "submitEvent": "SAVE",
-                          "cancelEvent": "CLOSE",
+                          "mode": "create",
                           "type": "form-section",
-                          "mode": "create"
+                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE"
                         }
-                      ],
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -1078,7 +1078,7 @@
             {
               "event": "CONTACT_UPDATED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1089,7 +1089,7 @@
               "event": "ContactLoadFailed",
               "description": "Fired when Contact fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1104,7 +1104,7 @@
               "event": "ContactLoaded",
               "description": "Fired when Contact finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Contact]"
@@ -1114,7 +1114,7 @@
             {
               "event": "ContactUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1128,7 +1128,7 @@
             {
               "event": "ContactUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1154,7 +1154,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1173,7 +1173,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -1188,7 +1188,7 @@
               {
                 "key": "ContactLoadFailed",
                 "name": "Contact load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1202,7 +1202,7 @@
               {
                 "key": "ContactLoaded",
                 "name": "Contact loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Contact]"
@@ -1212,7 +1212,7 @@
               {
                 "key": "ContactUpdateFailed",
                 "name": "Contact update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1226,7 +1226,7 @@
               {
                 "key": "ContactUpdated",
                 "name": "Contact updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -1255,11 +1255,11 @@
                     "fetch",
                     "Contact",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "ContactLoaded",
                         "failure": "ContactLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
@@ -1270,28 +1270,27 @@
                       "children": [
                         {
                           "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
                               "content": "Edit Contact",
                               "type": "typography",
                               "variant": "h3"
                             }
-                          ],
-                          "type": "stack",
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "cancelEvent": "CLOSE",
                           "mode": "edit",
                           "submitEvent": "SAVE",
-                          "type": "form-section",
-                          "cancelEvent": "CLOSE",
                           "entity": "@payload.row",
                           "fields": [
                             "name",
@@ -1299,7 +1298,8 @@
                             "email",
                             "phone",
                             "status"
-                          ]
+                          ],
+                          "type": "form-section"
                         }
                       ],
                       "gap": "md",
@@ -1380,7 +1380,7 @@
               "event": "ContactLoaded",
               "description": "Fired when Contact finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Contact]"
@@ -1391,7 +1391,7 @@
               "event": "ContactLoadFailed",
               "description": "Fired when Contact fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1421,7 +1421,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1436,7 +1436,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -1447,7 +1447,7 @@
               {
                 "key": "ContactLoaded",
                 "name": "Contact loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Contact]"
@@ -1457,7 +1457,7 @@
               {
                 "key": "ContactLoadFailed",
                 "name": "Contact load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1504,137 +1504,137 @@
                       "gap": "md",
                       "children": [
                         {
-                          "align": "center",
-                          "direction": "horizontal",
-                          "gap": "sm",
-                          "type": "stack",
                           "children": [
                             {
-                              "name": "eye",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "eye"
                             },
                             {
-                              "content": "@entity.name",
+                              "variant": "h3",
                               "type": "typography",
-                              "variant": "h3"
+                              "content": "@entity.name"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "type": "stack",
+                          "align": "center",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "gap": "md",
                           "direction": "horizontal",
                           "children": [
                             {
                               "content": "Name",
-                              "variant": "caption",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
-                              "type": "typography",
+                              "content": "@entity.name",
                               "variant": "body",
-                              "content": "@entity.name"
+                              "type": "typography"
                             }
                           ],
-                          "type": "stack",
-                          "gap": "md"
+                          "type": "stack"
                         },
                         {
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "content": "Company",
+                              "variant": "caption",
                               "type": "typography",
-                              "variant": "caption"
+                              "content": "Company"
                             },
                             {
                               "content": "@entity.company",
-                              "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "md",
-                          "type": "stack"
+                          "gap": "md"
                         },
                         {
+                          "type": "stack",
+                          "direction": "horizontal",
                           "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Email"
+                              "content": "Email",
+                              "type": "typography"
                             },
                             {
+                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.email",
-                              "type": "typography"
+                              "content": "@entity.email"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
-                          "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "content": "Phone",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.phone",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
                           "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
+                              "variant": "caption",
                               "content": "Status",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
+                              "content": "@entity.status",
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.status"
+                              "variant": "body"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "direction": "horizontal",
                           "type": "stack",
-                          "gap": "sm",
                           "justify": "end",
                           "children": [
                             {
-                              "variant": "primary",
+                              "label": "Edit",
                               "action": "EDIT",
-                              "type": "button",
                               "icon": "edit",
-                              "label": "Edit"
+                              "type": "button",
+                              "variant": "primary"
                             },
                             {
-                              "label": "Close",
-                              "variant": "ghost",
                               "type": "button",
-                              "action": "CLOSE"
+                              "action": "CLOSE",
+                              "label": "Close",
+                              "variant": "ghost"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "sm"
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical"
+                      "direction": "vertical",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -1694,7 +1694,7 @@
             {
               "event": "CONTACT_DELETED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1704,7 +1704,7 @@
             {
               "event": "ContactDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1718,7 +1718,7 @@
             {
               "event": "ContactDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1729,7 +1729,7 @@
               "event": "ContactLoadFailed",
               "description": "Fired when Contact fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1744,7 +1744,7 @@
               "event": "ContactLoaded",
               "description": "Fired when Contact finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Contact]"
@@ -1770,7 +1770,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1797,7 +1797,7 @@
               {
                 "key": "ContactDeleteFailed",
                 "name": "Contact delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1811,7 +1811,7 @@
               {
                 "key": "ContactDeleted",
                 "name": "Contact deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -1821,7 +1821,7 @@
               {
                 "key": "ContactLoadFailed",
                 "name": "Contact load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1835,7 +1835,7 @@
               {
                 "key": "ContactLoaded",
                 "name": "Contact loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Contact]"
@@ -1871,8 +1871,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "ContactLoaded",
-                        "failure": "ContactLoadFailed"
+                        "failure": "ContactLoadFailed",
+                        "success": "ContactLoaded"
                       }
                     }
                   ],
@@ -1880,57 +1880,57 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
                       "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
+                          "type": "stack",
                           "direction": "horizontal",
-                          "gap": "sm",
                           "align": "center",
-                          "type": "stack",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "alert-triangle"
+                              "name": "alert-triangle",
+                              "type": "icon"
                             },
                             {
                               "variant": "h3",
                               "type": "typography",
                               "content": "Delete Contact"
                             }
-                          ]
+                          ],
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "message": "This action cannot be undone.",
                           "type": "alert",
-                          "variant": "error",
-                          "message": "This action cannot be undone."
+                          "variant": "error"
                         },
                         {
-                          "direction": "horizontal",
+                          "justify": "end",
                           "type": "stack",
+                          "direction": "horizontal",
                           "gap": "sm",
-                          "justify": "end",
                           "children": [
                             {
-                              "label": "Cancel",
-                              "action": "CANCEL",
                               "variant": "ghost",
+                              "action": "CANCEL",
+                              "label": "Cancel",
                               "type": "button"
                             },
                             {
-                              "icon": "check",
-                              "type": "button",
                               "variant": "danger",
+                              "type": "button",
+                              "action": "CONFIRM_DELETE",
                               "label": "Delete",
-                              "action": "CONFIRM_DELETE"
+                              "icon": "check"
                             }
                           ]
                         }
-                      ],
-                      "direction": "vertical",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -1947,8 +1947,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "ContactDeleteFailed",
-                        "success": "ContactDeleted"
+                        "success": "ContactDeleted",
+                        "failure": "ContactDeleteFailed"
                       }
                     }
                   ],
@@ -2096,7 +2096,7 @@
             {
               "event": "CLOSE_DEAL",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -2107,7 +2107,7 @@
               "event": "DealLoaded",
               "description": "Fired when Deal finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Deal]"
@@ -2118,7 +2118,7 @@
               "event": "DealLoadFailed",
               "description": "Fired when Deal fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2178,7 +2178,7 @@
               {
                 "key": "DealLoaded",
                 "name": "Deal loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Deal]"
@@ -2188,7 +2188,7 @@
               {
                 "key": "DealLoadFailed",
                 "name": "Deal load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2215,8 +2215,8 @@
                     "Deal",
                     {
                       "emit": {
-                        "success": "DealLoaded",
-                        "failure": "DealLoadFailed"
+                        "failure": "DealLoadFailed",
+                        "success": "DealLoaded"
                       }
                     }
                   ],
@@ -2224,22 +2224,22 @@
                     "render-ui",
                     "main",
                     {
+                      "className": "py-12",
+                      "direction": "vertical",
                       "gap": "md",
-                      "align": "center",
-                      "type": "stack",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "variant": "caption",
-                          "type": "typography",
                           "color": "muted",
-                          "content": "Loading…"
+                          "type": "typography",
+                          "content": "Loading…",
+                          "variant": "caption"
                         }
                       ],
-                      "direction": "vertical",
-                      "className": "py-12"
+                      "align": "center",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -2260,119 +2260,119 @@
                           "href": "/contacts"
                         },
                         {
-                          "icon": "briefcase",
+                          "href": "/deals",
                           "label": "Deals",
-                          "href": "/deals"
+                          "icon": "briefcase"
                         },
                         {
-                          "icon": "bar-chart-2",
                           "label": "Pipeline",
-                          "href": "/pipeline"
+                          "href": "/pipeline",
+                          "icon": "bar-chart-2"
                         },
                         {
+                          "label": "Notes",
                           "href": "/notes",
-                          "icon": "file-text",
-                          "label": "Notes"
+                          "icon": "file-text"
                         }
                       ],
-                      "appName": "CRM",
                       "type": "dashboard-layout",
+                      "appName": "CRM",
                       "children": [
                         {
+                          "type": "stack",
+                          "direction": "vertical",
+                          "className": "max-w-5xl mx-auto w-full",
+                          "gap": "lg",
                           "children": [
                             {
-                              "direction": "horizontal",
+                              "gap": "md",
                               "type": "stack",
                               "justify": "between",
-                              "align": "center",
                               "children": [
                                 {
                                   "direction": "horizontal",
-                                  "type": "stack",
-                                  "align": "center",
-                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "name": "briefcase",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "briefcase"
                                     },
                                     {
+                                      "content": "Deals",
                                       "variant": "h2",
-                                      "type": "typography",
-                                      "content": "Deals"
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "gap": "sm",
+                                  "align": "center"
                                 },
                                 {
-                                  "type": "stack",
                                   "gap": "sm",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "label": "New Deal",
-                                      "action": "CREATE",
                                       "type": "button",
                                       "variant": "primary",
+                                      "label": "New Deal",
+                                      "action": "CREATE",
                                       "icon": "plus"
                                     }
                                   ],
-                                  "direction": "horizontal"
+                                  "type": "stack"
                                 }
                               ],
-                              "gap": "md"
+                              "align": "center",
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "cols": 2.0,
+                              "gap": "md",
                               "type": "data-grid",
                               "itemActions": [
                                 {
-                                  "variant": "ghost",
                                   "event": "VIEW",
+                                  "variant": "ghost",
                                   "label": "View"
                                 },
                                 {
-                                  "event": "EDIT",
                                   "variant": "ghost",
+                                  "event": "EDIT",
                                   "label": "Edit"
                                 },
                                 {
-                                  "label": "Delete",
+                                  "variant": "danger",
                                   "event": "DELETE",
-                                  "variant": "danger"
+                                  "label": "Delete"
                                 }
                               ],
+                              "fields": [],
                               "columns": [
                                 {
                                   "icon": "briefcase",
-                                  "variant": "h3",
-                                  "name": "title"
+                                  "name": "title",
+                                  "variant": "h3"
                                 },
                                 {
                                   "variant": "badge",
                                   "name": "stage"
                                 },
                                 {
-                                  "format": "currency",
                                   "name": "value",
-                                  "variant": "h4"
+                                  "variant": "h4",
+                                  "format": "currency"
                                 },
                                 {
-                                  "label": "Contact",
+                                  "name": "contactId",
                                   "variant": "caption",
-                                  "name": "contactId"
+                                  "label": "Contact"
                                 }
                               ],
-                              "gap": "md",
-                              "cols": 2.0,
-                              "entity": "@payload.data",
-                              "fields": []
+                              "entity": "@payload.data"
                             }
-                          ],
-                          "type": "stack",
-                          "className": "max-w-5xl mx-auto w-full",
-                          "direction": "vertical",
-                          "gap": "lg"
+                          ]
                         }
                       ]
                     }
@@ -2388,12 +2388,16 @@
                     "render-ui",
                     "main",
                     {
+                      "gap": "md",
+                      "className": "py-12",
+                      "direction": "vertical",
                       "align": "center",
+                      "type": "stack",
                       "children": [
                         {
+                          "type": "icon",
                           "name": "alert-triangle",
-                          "color": "destructive",
-                          "type": "icon"
+                          "color": "destructive"
                         },
                         {
                           "type": "typography",
@@ -2401,23 +2405,19 @@
                           "content": "Failed to load deal"
                         },
                         {
-                          "type": "typography",
+                          "content": "@payload.error",
                           "color": "muted",
                           "variant": "body",
-                          "content": "@payload.error"
+                          "type": "typography"
                         },
                         {
+                          "type": "button",
                           "action": "INIT",
                           "icon": "rotate-ccw",
-                          "label": "Retry",
                           "variant": "primary",
-                          "type": "button"
+                          "label": "Retry"
                         }
-                      ],
-                      "gap": "md",
-                      "type": "stack",
-                      "className": "py-12",
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -2438,7 +2438,7 @@
               "event": "DealLoadFailed",
               "description": "Fired when Deal fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2453,7 +2453,7 @@
               "event": "DealLoaded",
               "description": "Fired when Deal finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Deal]"
@@ -2463,7 +2463,7 @@
             {
               "event": "DealSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2477,7 +2477,7 @@
             {
               "event": "DealSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -2511,7 +2511,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -2525,7 +2525,7 @@
               {
                 "key": "DealLoadFailed",
                 "name": "Deal load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2539,7 +2539,7 @@
               {
                 "key": "DealLoaded",
                 "name": "Deal loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Deal]"
@@ -2549,7 +2549,7 @@
               {
                 "key": "DealSaveFailed",
                 "name": "Deal save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2563,7 +2563,7 @@
               {
                 "key": "DealSaved",
                 "name": "Deal saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -2593,8 +2593,8 @@
                     "Deal",
                     {
                       "emit": {
-                        "success": "DealLoaded",
-                        "failure": "DealLoadFailed"
+                        "failure": "DealLoadFailed",
+                        "success": "DealLoaded"
                       }
                     }
                   ],
@@ -2602,9 +2602,9 @@
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
-                      "type": "stack",
                       "direction": "vertical",
+                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
                           "children": [
@@ -2614,29 +2614,29 @@
                             },
                             {
                               "variant": "h3",
-                              "type": "typography",
-                              "content": "Create Deal"
+                              "content": "Create Deal",
+                              "type": "typography"
                             }
                           ],
+                          "type": "stack",
                           "direction": "horizontal",
-                          "gap": "sm",
-                          "type": "stack"
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "type": "form-section",
+                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE",
+                          "mode": "create",
                           "fields": [
                             "title",
                             "contactId",
                             "value",
                             "stage",
                             "closedAt"
-                          ],
-                          "mode": "create",
-                          "cancelEvent": "CLOSE",
-                          "submitEvent": "SAVE"
+                          ]
                         }
                       ]
                     }
@@ -2718,7 +2718,7 @@
               "event": "DealLoadFailed",
               "description": "Fired when Deal fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2733,7 +2733,7 @@
               "event": "DealLoaded",
               "description": "Fired when Deal finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Deal]"
@@ -2743,7 +2743,7 @@
             {
               "event": "DealUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -2757,7 +2757,7 @@
             {
               "event": "DealUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -2783,7 +2783,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -2801,7 +2801,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -2815,7 +2815,7 @@
               {
                 "key": "DealLoadFailed",
                 "name": "Deal load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2829,7 +2829,7 @@
               {
                 "key": "DealLoaded",
                 "name": "Deal loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Deal]"
@@ -2839,7 +2839,7 @@
               {
                 "key": "DealUpdateFailed",
                 "name": "Deal update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2853,7 +2853,7 @@
               {
                 "key": "DealUpdated",
                 "name": "Deal updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -2884,8 +2884,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "DealLoaded",
-                        "failure": "DealLoadFailed"
+                        "failure": "DealLoadFailed",
+                        "success": "DealLoaded"
                       }
                     }
                   ],
@@ -2893,30 +2893,28 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
                       "children": [
                         {
-                          "gap": "sm",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "name": "edit",
                               "type": "icon"
                             },
                             {
-                              "variant": "h3",
+                              "type": "typography",
                               "content": "Edit Deal",
-                              "type": "typography"
+                              "variant": "h3"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          "gap": "sm",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "cancelEvent": "CLOSE",
-                          "type": "form-section",
-                          "submitEvent": "SAVE",
                           "fields": [
                             "title",
                             "contactId",
@@ -2925,12 +2923,14 @@
                             "closedAt"
                           ],
                           "entity": "@payload.row",
-                          "mode": "edit"
+                          "submitEvent": "SAVE",
+                          "mode": "edit",
+                          "type": "form-section",
+                          "cancelEvent": "CLOSE"
                         }
                       ],
-                      "direction": "vertical",
                       "gap": "md",
-                      "type": "stack"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -3007,7 +3007,7 @@
               "event": "DealLoaded",
               "description": "Fired when Deal finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Deal]"
@@ -3018,7 +3018,7 @@
               "event": "DealLoadFailed",
               "description": "Fired when Deal fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3048,7 +3048,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -3066,7 +3066,7 @@
               {
                 "key": "DealLoaded",
                 "name": "Deal loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Deal]"
@@ -3076,7 +3076,7 @@
               {
                 "key": "DealLoadFailed",
                 "name": "Deal load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3109,47 +3109,49 @@
                     "fetch",
                     "Deal",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "failure": "DealLoadFailed",
-                        "success": "DealLoaded"
-                      },
-                      "id": "@payload.id"
+                        "success": "DealLoaded",
+                        "failure": "DealLoadFailed"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
+                          "gap": "sm",
+                          "align": "center",
                           "children": [
                             {
-                              "name": "eye",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "eye"
                             },
                             {
-                              "content": "@entity.title",
+                              "variant": "h3",
                               "type": "typography",
-                              "variant": "h3"
+                              "content": "@entity.title"
                             }
                           ],
-                          "gap": "sm",
-                          "align": "center",
-                          "direction": "horizontal",
-                          "type": "stack"
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "direction": "horizontal",
                           "gap": "md",
                           "type": "stack",
-                          "direction": "horizontal",
                           "children": [
                             {
                               "variant": "caption",
-                              "content": "Title",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Title"
                             },
                             {
                               "variant": "body",
@@ -3159,30 +3161,30 @@
                           ]
                         },
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "md",
                           "children": [
                             {
+                              "content": "Contact ID",
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "Contact ID"
+                              "variant": "caption"
                             },
                             {
-                              "variant": "body",
                               "type": "typography",
+                              "variant": "body",
                               "content": "@entity.contactId"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
+                          "type": "stack",
                           "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
-                              "content": "Value",
                               "variant": "caption",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Value"
                             },
                             {
                               "content": "@entity.value",
@@ -3190,50 +3192,50 @@
                               "type": "typography"
                             }
                           ],
-                          "type": "stack"
+                          "gap": "md"
                         },
                         {
+                          "gap": "md",
                           "children": [
                             {
+                              "content": "Stage",
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "Stage"
+                              "variant": "caption"
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.stage",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.stage"
                             }
                           ],
-                          "gap": "md",
                           "direction": "horizontal",
                           "type": "stack"
                         },
                         {
+                          "type": "stack",
                           "direction": "horizontal",
                           "gap": "md",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
-                              "content": "Closed At"
+                              "content": "Closed At",
+                              "variant": "caption"
                             },
                             {
+                              "variant": "body",
                               "content": "@entity.closedAt",
-                              "type": "typography",
-                              "variant": "body"
+                              "type": "typography"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "justify": "end",
                           "gap": "sm",
                           "type": "stack",
                           "direction": "horizontal",
-                          "justify": "end",
                           "children": [
                             {
                               "action": "EDIT",
@@ -3244,16 +3246,14 @@
                             },
                             {
                               "type": "button",
+                              "action": "CLOSE",
                               "label": "Close",
-                              "variant": "ghost",
-                              "action": "CLOSE"
+                              "variant": "ghost"
                             }
                           ]
                         }
                       ],
-                      "direction": "vertical",
-                      "gap": "md",
-                      "type": "stack"
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -3316,7 +3316,7 @@
             {
               "event": "DealDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3330,7 +3330,7 @@
             {
               "event": "DealDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -3341,7 +3341,7 @@
               "event": "DealLoadFailed",
               "description": "Fired when Deal fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3356,7 +3356,7 @@
               "event": "DealLoaded",
               "description": "Fired when Deal finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Deal]"
@@ -3382,7 +3382,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -3408,7 +3408,7 @@
               {
                 "key": "DealDeleteFailed",
                 "name": "Deal delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3422,7 +3422,7 @@
               {
                 "key": "DealDeleted",
                 "name": "Deal deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -3432,7 +3432,7 @@
               {
                 "key": "DealLoadFailed",
                 "name": "Deal load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3446,7 +3446,7 @@
               {
                 "key": "DealLoaded",
                 "name": "Deal loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Deal]"
@@ -3493,19 +3493,19 @@
                     {
                       "children": [
                         {
+                          "gap": "sm",
                           "direction": "horizontal",
-                          "align": "center",
                           "type": "stack",
-                          "gap": "sm",
+                          "align": "center",
                           "children": [
                             {
                               "name": "alert-triangle",
                               "type": "icon"
                             },
                             {
-                              "type": "typography",
+                              "variant": "h3",
                               "content": "Delete Deal",
-                              "variant": "h3"
+                              "type": "typography"
                             }
                           ]
                         },
@@ -3513,35 +3513,35 @@
                           "type": "divider"
                         },
                         {
-                          "type": "alert",
+                          "variant": "error",
                           "message": "This action cannot be undone.",
-                          "variant": "error"
+                          "type": "alert"
                         },
                         {
                           "justify": "end",
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "variant": "ghost",
                               "label": "Cancel",
-                              "action": "CANCEL",
-                              "type": "button"
+                              "type": "button",
+                              "action": "CANCEL"
                             },
                             {
-                              "icon": "check",
                               "variant": "danger",
+                              "action": "CONFIRM_DELETE",
                               "label": "Delete",
-                              "type": "button",
-                              "action": "CONFIRM_DELETE"
+                              "icon": "check",
+                              "type": "button"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "sm"
                         }
                       ],
-                      "gap": "md",
+                      "type": "stack",
                       "direction": "vertical",
-                      "type": "stack"
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -3703,7 +3703,7 @@
               "event": "PipelineLoaded",
               "description": "Fired when Pipeline finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Pipeline]"
@@ -3714,7 +3714,7 @@
               "event": "PipelineLoadFailed",
               "description": "Fired when Pipeline fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3768,7 +3768,7 @@
               {
                 "key": "PipelineLoaded",
                 "name": "Pipeline loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Pipeline]"
@@ -3778,7 +3778,7 @@
               {
                 "key": "PipelineLoadFailed",
                 "name": "Pipeline load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3801,8 +3801,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -3810,70 +3810,91 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "CRM",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Contacts",
+                          "href": "/contacts",
+                          "icon": "users"
+                        },
+                        {
+                          "href": "/deals",
+                          "icon": "briefcase",
+                          "label": "Deals"
+                        },
+                        {
+                          "href": "/pipeline",
+                          "label": "Pipeline",
+                          "icon": "bar-chart-2"
+                        },
+                        {
+                          "label": "Notes",
+                          "href": "/notes",
+                          "icon": "file-text"
+                        }
+                      ],
                       "children": [
                         {
                           "children": [
                             {
-                              "gap": "lg",
-                              "direction": "vertical",
                               "children": [
                                 {
+                                  "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Pipeline"
                                     }
-                                  ],
-                                  "type": "breadcrumb"
+                                  ]
                                 },
                                 {
-                                  "justify": "between",
                                   "children": [
                                     {
-                                      "direction": "horizontal",
                                       "type": "stack",
-                                      "gap": "md",
+                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "type": "icon",
                                           "name": "bar-chart-2"
                                         },
                                         {
-                                          "variant": "h2",
+                                          "type": "typography",
                                           "content": "Pipeline",
-                                          "type": "typography"
+                                          "variant": "h2"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md"
                                     },
                                     {
+                                      "variant": "secondary",
+                                      "type": "button",
                                       "label": "Refresh",
                                       "action": "REFRESH",
-                                      "type": "button",
-                                      "variant": "secondary",
                                       "icon": "refresh-cw"
                                     }
                                   ],
-                                  "direction": "horizontal",
+                                  "gap": "md",
                                   "type": "stack",
-                                  "gap": "md"
+                                  "direction": "horizontal",
+                                  "justify": "between"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "padding": "md",
+                                  "type": "box",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
-                                          "label": "TotalDeals",
                                           "type": "stat-display",
+                                          "label": "TotalDeals",
                                           "value": "@entity.totalDeals"
                                         },
                                         {
@@ -3887,20 +3908,19 @@
                                           "value": "@entity.wonDeals"
                                         },
                                         {
-                                          "value": "@entity.lostDeals",
+                                          "type": "stat-display",
                                           "label": "LostDeals",
-                                          "type": "stat-display"
+                                          "value": "@entity.lostDeals"
                                         },
                                         {
                                           "label": "ConversionRate",
-                                          "value": "@entity.conversionRate",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "value": "@entity.conversionRate"
                                         }
                                       ],
-                                      "cols": 3.0
+                                      "type": "simple-grid"
                                     }
-                                  ],
-                                  "type": "box"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -3908,24 +3928,24 @@
                                 {
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
                                           "variant": "caption",
                                           "content": "Chart View"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
+                                          "content": "Graph View",
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Graph View"
+                                          "variant": "caption"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
                                   ],
                                   "type": "grid",
@@ -3933,7 +3953,6 @@
                                   "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "value": 12.0,
@@ -3948,24 +3967,25 @@
                                       "date": "Mar"
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
                                       "label": "Previous",
@@ -3975,16 +3995,16 @@
                                   "type": "chart-legend"
                                 },
                                 {
+                                  "width": 400.0,
                                   "type": "graph-view",
-                                  "height": 200.0,
                                   "edges": [
                                     {
-                                      "target": "b",
-                                      "source": "a"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
-                                      "target": "c",
-                                      "source": "b"
+                                      "source": "b",
+                                      "target": "c"
                                     }
                                   ],
                                   "nodes": [
@@ -3993,44 +4013,24 @@
                                       "label": "Start"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
                                       "id": "c",
                                       "label": "End"
                                     }
                                   ],
-                                  "width": 400.0
+                                  "height": 200.0
                                 }
                               ],
+                              "gap": "lg",
+                              "direction": "vertical",
                               "type": "stack"
                             }
                           ],
                           "type": "scaled-diagram"
                         }
-                      ],
-                      "navItems": [
-                        {
-                          "icon": "users",
-                          "label": "Contacts",
-                          "href": "/contacts"
-                        },
-                        {
-                          "href": "/deals",
-                          "icon": "briefcase",
-                          "label": "Deals"
-                        },
-                        {
-                          "href": "/pipeline",
-                          "icon": "bar-chart-2",
-                          "label": "Pipeline"
-                        },
-                        {
-                          "href": "/notes",
-                          "icon": "file-text",
-                          "label": "Notes"
-                        }
                       ]
                     }
                   ]
@@ -4062,6 +4062,7 @@
                             {
                               "type": "stack",
                               "direction": "vertical",
+                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -4076,33 +4077,33 @@
                                   ]
                                 },
                                 {
-                                  "gap": "md",
                                   "type": "stack",
                                   "justify": "between",
                                   "direction": "horizontal",
+                                  "gap": "md",
                                   "children": [
                                     {
+                                      "gap": "md",
                                       "children": [
                                         {
-                                          "name": "bar-chart-2",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "bar-chart-2"
                                         },
                                         {
-                                          "content": "Pipeline",
                                           "type": "typography",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "content": "Pipeline"
                                         }
                                       ],
-                                      "direction": "horizontal",
-                                      "gap": "md",
-                                      "type": "stack"
+                                      "type": "stack",
+                                      "direction": "horizontal"
                                     },
                                     {
                                       "label": "Refresh",
-                                      "icon": "refresh-cw",
+                                      "action": "REFRESH",
                                       "type": "button",
                                       "variant": "secondary",
-                                      "action": "REFRESH"
+                                      "icon": "refresh-cw"
                                     }
                                   ]
                                 },
@@ -4110,6 +4111,8 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "box",
+                                  "padding": "md",
                                   "children": [
                                     {
                                       "cols": 3.0,
@@ -4125,31 +4128,30 @@
                                           "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.wonDeals",
                                           "type": "stat-display",
-                                          "label": "WonDeals"
+                                          "label": "WonDeals",
+                                          "value": "@entity.wonDeals"
                                         },
                                         {
                                           "value": "@entity.lostDeals",
-                                          "label": "LostDeals",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "LostDeals"
                                         },
                                         {
-                                          "label": "ConversionRate",
+                                          "value": "@entity.conversionRate",
                                           "type": "stat-display",
-                                          "value": "@entity.conversionRate"
+                                          "label": "ConversionRate"
                                         }
                                       ],
                                       "type": "simple-grid"
                                     }
-                                  ],
-                                  "type": "box",
-                                  "padding": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "cols": 2.0,
                                   "children": [
                                     {
                                       "children": [
@@ -4162,17 +4164,16 @@
                                       "type": "card"
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "type": "typography"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
                                   ],
-                                  "cols": 2.0,
                                   "gap": "md",
                                   "type": "grid"
                                 },
@@ -4183,12 +4184,12 @@
                                       "date": "Jan"
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
                                       "date": "Apr",
@@ -4199,8 +4200,8 @@
                                       "value": 22.0
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
                                   ],
                                   "type": "line-chart"
@@ -4208,8 +4209,8 @@
                                 {
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
                                       "label": "Previous",
@@ -4219,61 +4220,60 @@
                                   "type": "chart-legend"
                                 },
                                 {
-                                  "type": "graph-view",
-                                  "width": 400.0,
-                                  "edges": [
+                                  "nodes": [
                                     {
-                                      "source": "a",
-                                      "target": "b"
+                                      "id": "a",
+                                      "label": "Start"
                                     },
                                     {
-                                      "source": "b",
-                                      "target": "c"
+                                      "id": "b",
+                                      "label": "Process"
+                                    },
+                                    {
+                                      "label": "End",
+                                      "id": "c"
                                     }
                                   ],
                                   "height": 200.0,
-                                  "nodes": [
-                                    {
-                                      "id": "a",
-                                      "label": "Start"
-                                    },
+                                  "edges": [
                                     {
-                                      "id": "b",
-                                      "label": "Process"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "source": "b",
+                                      "target": "c"
                                     }
-                                  ]
+                                  ],
+                                  "type": "graph-view",
+                                  "width": 400.0
                                 }
-                              ],
-                              "gap": "lg"
+                              ]
                             }
                           ]
                         }
                       ],
-                      "appName": "CRM",
                       "type": "dashboard-layout",
+                      "appName": "CRM",
                       "navItems": [
                         {
                           "href": "/contacts",
-                          "label": "Contacts",
-                          "icon": "users"
+                          "icon": "users",
+                          "label": "Contacts"
                         },
                         {
-                          "href": "/deals",
                           "icon": "briefcase",
-                          "label": "Deals"
+                          "label": "Deals",
+                          "href": "/deals"
                         },
                         {
-                          "label": "Pipeline",
                           "href": "/pipeline",
-                          "icon": "bar-chart-2"
+                          "icon": "bar-chart-2",
+                          "label": "Pipeline"
                         },
                         {
-                          "href": "/notes",
                           "icon": "file-text",
+                          "href": "/notes",
                           "label": "Notes"
                         }
                       ]
@@ -4291,8 +4291,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "failure": "PipelineLoadFailed",
-                        "success": "PipelineLoaded"
+                        "success": "PipelineLoaded",
+                        "failure": "PipelineLoadFailed"
                       }
                     }
                   ],
@@ -4301,14 +4301,37 @@
                     "main",
                     {
                       "type": "dashboard-layout",
+                      "appName": "CRM",
+                      "navItems": [
+                        {
+                          "href": "/contacts",
+                          "label": "Contacts",
+                          "icon": "users"
+                        },
+                        {
+                          "href": "/deals",
+                          "icon": "briefcase",
+                          "label": "Deals"
+                        },
+                        {
+                          "label": "Pipeline",
+                          "href": "/pipeline",
+                          "icon": "bar-chart-2"
+                        },
+                        {
+                          "href": "/notes",
+                          "label": "Notes",
+                          "icon": "file-text"
+                        }
+                      ],
                       "children": [
                         {
                           "type": "scaled-diagram",
                           "children": [
                             {
+                              "gap": "lg",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "label": "Home",
@@ -4317,14 +4340,16 @@
                                     {
                                       "label": "Pipeline"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
-                                  "gap": "md",
-                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "justify": "between",
                                   "children": [
                                     {
+                                      "type": "stack",
+                                      "gap": "md",
                                       "direction": "horizontal",
                                       "children": [
                                         {
@@ -4332,30 +4357,29 @@
                                           "name": "bar-chart-2"
                                         },
                                         {
+                                          "type": "typography",
                                           "variant": "h2",
-                                          "content": "Pipeline",
-                                          "type": "typography"
+                                          "content": "Pipeline"
                                         }
-                                      ],
-                                      "gap": "md",
-                                      "type": "stack"
+                                      ]
                                     },
                                     {
+                                      "label": "Refresh",
+                                      "variant": "secondary",
                                       "type": "button",
                                       "action": "REFRESH",
-                                      "label": "Refresh",
-                                      "icon": "refresh-cw",
-                                      "variant": "secondary"
+                                      "icon": "refresh-cw"
                                     }
                                   ],
-                                  "type": "stack"
+                                  "direction": "horizontal",
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
                                   "padding": "md",
+                                  "type": "box",
                                   "children": [
                                     {
                                       "type": "simple-grid",
@@ -4363,28 +4387,28 @@
                                       "children": [
                                         {
                                           "type": "stat-display",
-                                          "value": "@entity.totalDeals",
-                                          "label": "TotalDeals"
+                                          "label": "TotalDeals",
+                                          "value": "@entity.totalDeals"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "TotalValue",
-                                          "value": "@entity.totalValue"
+                                          "value": "@entity.totalValue",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.wonDeals",
+                                          "label": "WonDeals",
                                           "type": "stat-display",
-                                          "label": "WonDeals"
+                                          "value": "@entity.wonDeals"
                                         },
                                         {
-                                          "value": "@entity.lostDeals",
                                           "label": "LostDeals",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "value": "@entity.lostDeals"
                                         },
                                         {
-                                          "label": "ConversionRate",
+                                          "type": "stat-display",
                                           "value": "@entity.conversionRate",
-                                          "type": "stat-display"
+                                          "label": "ConversionRate"
                                         }
                                       ]
                                     }
@@ -4394,9 +4418,6 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "gap": "md",
-                                  "cols": 2.0,
-                                  "type": "grid",
                                   "children": [
                                     {
                                       "children": [
@@ -4418,7 +4439,10 @@
                                       ],
                                       "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "cols": 2.0,
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "line-chart",
@@ -4428,16 +4452,16 @@
                                       "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",
@@ -4453,8 +4477,8 @@
                                   "type": "chart-legend",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
                                       "color": "muted",
@@ -4463,22 +4487,22 @@
                                   ]
                                 },
                                 {
-                                  "width": 400.0,
                                   "type": "graph-view",
                                   "edges": [
                                     {
-                                      "source": "a",
-                                      "target": "b"
+                                      "target": "b",
+                                      "source": "a"
                                     },
                                     {
-                                      "source": "b",
-                                      "target": "c"
+                                      "target": "c",
+                                      "source": "b"
                                     }
                                   ],
+                                  "height": 200.0,
                                   "nodes": [
                                     {
-                                      "label": "Start",
-                                      "id": "a"
+                                      "id": "a",
+                                      "label": "Start"
                                     },
                                     {
                                       "label": "Process",
@@ -4489,39 +4513,15 @@
                                       "label": "End"
                                     }
                                   ],
-                                  "height": 200.0
+                                  "width": 400.0
                                 }
                               ],
-                              "type": "stack",
-                              "gap": "lg",
-                              "direction": "vertical"
+                              "direction": "vertical",
+                              "type": "stack"
                             }
                           ]
                         }
-                      ],
-                      "navItems": [
-                        {
-                          "label": "Contacts",
-                          "icon": "users",
-                          "href": "/contacts"
-                        },
-                        {
-                          "href": "/deals",
-                          "icon": "briefcase",
-                          "label": "Deals"
-                        },
-                        {
-                          "href": "/pipeline",
-                          "icon": "bar-chart-2",
-                          "label": "Pipeline"
-                        },
-                        {
-                          "href": "/notes",
-                          "icon": "file-text",
-                          "label": "Notes"
-                        }
-                      ],
-                      "appName": "CRM"
+                      ]
                     }
                   ]
                 ]
@@ -4536,8 +4536,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -4545,29 +4545,6 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Contacts",
-                          "href": "/contacts",
-                          "icon": "users"
-                        },
-                        {
-                          "label": "Deals",
-                          "href": "/deals",
-                          "icon": "briefcase"
-                        },
-                        {
-                          "icon": "bar-chart-2",
-                          "label": "Pipeline",
-                          "href": "/pipeline"
-                        },
-                        {
-                          "href": "/notes",
-                          "icon": "file-text",
-                          "label": "Notes"
-                        }
-                      ],
                       "appName": "CRM",
                       "children": [
                         {
@@ -4575,14 +4552,13 @@
                           "children": [
                             {
                               "type": "stack",
-                              "direction": "vertical",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Pipeline"
@@ -4590,107 +4566,108 @@
                                   ]
                                 },
                                 {
-                                  "justify": "between",
-                                  "type": "stack",
-                                  "gap": "md",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "direction": "horizontal",
+                                      "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "bar-chart-2"
+                                          "name": "bar-chart-2",
+                                          "type": "icon"
                                         },
                                         {
-                                          "content": "Pipeline",
                                           "type": "typography",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "content": "Pipeline"
                                         }
                                       ],
-                                      "gap": "md"
+                                      "direction": "horizontal",
+                                      "type": "stack"
                                     },
                                     {
-                                      "action": "REFRESH",
                                       "icon": "refresh-cw",
+                                      "action": "REFRESH",
                                       "type": "button",
-                                      "variant": "secondary",
-                                      "label": "Refresh"
+                                      "label": "Refresh",
+                                      "variant": "secondary"
                                     }
                                   ],
-                                  "direction": "horizontal"
+                                  "gap": "md",
+                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "justify": "between"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "padding": "md",
+                                  "type": "box",
                                   "children": [
                                     {
+                                      "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
-                                          "type": "stat-display",
+                                          "value": "@entity.totalDeals",
                                           "label": "TotalDeals",
-                                          "value": "@entity.totalDeals"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
+                                          "value": "@entity.totalValue",
                                           "label": "TotalValue",
-                                          "value": "@entity.totalValue"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.wonDeals",
                                           "label": "WonDeals",
+                                          "value": "@entity.wonDeals",
                                           "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "LostDeals",
+                                          "type": "stat-display",
                                           "value": "@entity.lostDeals"
                                         },
                                         {
-                                          "value": "@entity.conversionRate",
+                                          "type": "stat-display",
                                           "label": "ConversionRate",
-                                          "type": "stat-display"
+                                          "value": "@entity.conversionRate"
                                         }
-                                      ],
-                                      "type": "simple-grid",
-                                      "cols": 3.0
+                                      ]
                                     }
-                                  ],
-                                  "type": "box",
-                                  "padding": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "gap": "md",
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
                                           "variant": "caption",
-                                          "type": "typography",
-                                          "content": "Chart View"
+                                          "content": "Chart View",
+                                          "type": "typography"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Graph View",
-                                          "type": "typography"
+                                          "content": "Graph View"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     }
                                   ],
-                                  "type": "grid",
-                                  "gap": "md",
-                                  "cols": 2.0
+                                  "cols": 2.0,
+                                  "type": "grid"
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
@@ -4701,8 +4678,8 @@
                                       "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "value": 25.0,
@@ -4713,59 +4690,82 @@
                                       "value": 22.0
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "nodes": [
-                                    {
-                                      "id": "a",
-                                      "label": "Start"
-                                    },
+                                  "width": 400.0,
+                                  "edges": [
                                     {
-                                      "id": "b",
-                                      "label": "Process"
+                                      "target": "b",
+                                      "source": "a"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "source": "b",
+                                      "target": "c"
                                     }
                                   ],
                                   "type": "graph-view",
-                                  "width": 400.0,
                                   "height": 200.0,
-                                  "edges": [
+                                  "nodes": [
                                     {
-                                      "target": "b",
-                                      "source": "a"
+                                      "label": "Start",
+                                      "id": "a"
                                     },
                                     {
-                                      "source": "b",
-                                      "target": "c"
+                                      "label": "Process",
+                                      "id": "b"
+                                    },
+                                    {
+                                      "label": "End",
+                                      "id": "c"
                                     }
                                   ]
                                 }
                               ],
-                              "gap": "lg"
+                              "gap": "lg",
+                              "direction": "vertical"
                             }
                           ]
                         }
+                      ],
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/contacts",
+                          "icon": "users",
+                          "label": "Contacts"
+                        },
+                        {
+                          "label": "Deals",
+                          "icon": "briefcase",
+                          "href": "/deals"
+                        },
+                        {
+                          "href": "/pipeline",
+                          "icon": "bar-chart-2",
+                          "label": "Pipeline"
+                        },
+                        {
+                          "label": "Notes",
+                          "href": "/notes",
+                          "icon": "file-text"
+                        }
                       ]
                     }
                   ]
@@ -4781,8 +4781,8 @@
                     "Pipeline",
                     {
                       "emit": {
-                        "success": "PipelineLoaded",
-                        "failure": "PipelineLoadFailed"
+                        "failure": "PipelineLoadFailed",
+                        "success": "PipelineLoaded"
                       }
                     }
                   ],
@@ -4791,15 +4791,37 @@
                     "main",
                     {
                       "appName": "CRM",
+                      "navItems": [
+                        {
+                          "href": "/contacts",
+                          "label": "Contacts",
+                          "icon": "users"
+                        },
+                        {
+                          "icon": "briefcase",
+                          "href": "/deals",
+                          "label": "Deals"
+                        },
+                        {
+                          "icon": "bar-chart-2",
+                          "href": "/pipeline",
+                          "label": "Pipeline"
+                        },
+                        {
+                          "href": "/notes",
+                          "icon": "file-text",
+                          "label": "Notes"
+                        }
+                      ],
+                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
-                              "gap": "lg",
-                              "direction": "vertical",
                               "children": [
                                 {
+                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "label": "Home",
@@ -4808,13 +4830,14 @@
                                     {
                                       "label": "Pipeline"
                                     }
-                                  ],
-                                  "type": "breadcrumb"
+                                  ]
                                 },
                                 {
+                                  "justify": "between",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "direction": "horizontal",
+                                      "gap": "md",
                                       "type": "stack",
                                       "children": [
                                         {
@@ -4822,25 +4845,23 @@
                                           "type": "icon"
                                         },
                                         {
+                                          "type": "typography",
                                           "variant": "h2",
-                                          "content": "Pipeline",
-                                          "type": "typography"
+                                          "content": "Pipeline"
                                         }
                                       ],
-                                      "gap": "md"
+                                      "direction": "horizontal"
                                     },
                                     {
-                                      "type": "button",
-                                      "variant": "secondary",
                                       "label": "Refresh",
+                                      "icon": "refresh-cw",
                                       "action": "REFRESH",
-                                      "icon": "refresh-cw"
+                                      "variant": "secondary",
+                                      "type": "button"
                                     }
                                   ],
-                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "between"
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "divider"
@@ -4850,70 +4871,69 @@
                                     {
                                       "children": [
                                         {
-                                          "type": "stat-display",
+                                          "label": "TotalDeals",
                                           "value": "@entity.totalDeals",
-                                          "label": "TotalDeals"
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "label": "TotalValue",
                                           "type": "stat-display",
-                                          "value": "@entity.totalValue",
-                                          "label": "TotalValue"
+                                          "value": "@entity.totalValue"
                                         },
                                         {
+                                          "value": "@entity.wonDeals",
                                           "type": "stat-display",
-                                          "label": "WonDeals",
-                                          "value": "@entity.wonDeals"
+                                          "label": "WonDeals"
                                         },
                                         {
                                           "label": "LostDeals",
-                                          "type": "stat-display",
-                                          "value": "@entity.lostDeals"
+                                          "value": "@entity.lostDeals",
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "value": "@entity.conversionRate",
                                           "type": "stat-display",
-                                          "label": "ConversionRate",
-                                          "value": "@entity.conversionRate"
+                                          "label": "ConversionRate"
                                         }
                                       ],
                                       "cols": 3.0,
                                       "type": "simple-grid"
                                     }
                                   ],
-                                  "type": "box",
-                                  "padding": "md"
+                                  "padding": "md",
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "grid",
+                                  "gap": "md",
                                   "cols": 2.0,
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Chart View"
+                                          "content": "Chart View",
+                                          "variant": "caption"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "content": "Graph View",
                                           "type": "typography",
+                                          "content": "Graph View",
                                           "variant": "caption"
                                         }
                                       ]
                                     }
-                                  ],
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
@@ -4932,46 +4952,35 @@
                                       "date": "Apr"
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
                                   "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
-                                      "color": "primary"
-                                    },
-                                    {
-                                      "label": "Previous",
-                                      "color": "muted"
-                                    }
-                                  ]
-                                },
-                                {
-                                  "width": 400.0,
-                                  "height": 200.0,
-                                  "type": "graph-view",
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
+                                      "color": "primary"
                                     },
                                     {
-                                      "source": "b",
-                                      "target": "c"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
-                                  ],
+                                  ]
+                                },
+                                {
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
-                                      "id": "a",
-                                      "label": "Start"
+                                      "label": "Start",
+                                      "id": "a"
                                     },
                                     {
                                       "id": "b",
@@ -4981,35 +4990,26 @@
                                       "id": "c",
                                       "label": "End"
                                     }
-                                  ]
+                                  ],
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
+                                  ],
+                                  "width": 400.0,
+                                  "height": 200.0
                                 }
-                              ]
+                              ],
+                              "gap": "lg",
+                              "type": "stack",
+                              "direction": "vertical"
                             }
-                          ],
-                          "type": "scaled-diagram"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "href": "/contacts",
-                          "label": "Contacts",
-                          "icon": "users"
-                        },
-                        {
-                          "href": "/deals",
-                          "icon": "briefcase",
-                          "label": "Deals"
-                        },
-                        {
-                          "href": "/pipeline",
-                          "icon": "bar-chart-2",
-                          "label": "Pipeline"
-                        },
-                        {
-                          "href": "/notes",
-                          "label": "Notes",
-                          "icon": "file-text"
+                          ]
                         }
                       ]
                     }
@@ -5072,7 +5072,7 @@
               "event": "NoteLoaded",
               "description": "Fired when Note finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Note]"
@@ -5083,7 +5083,7 @@
               "event": "NoteLoadFailed",
               "description": "Fired when Note fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5120,7 +5120,7 @@
               {
                 "key": "NoteLoaded",
                 "name": "Note loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Note]"
@@ -5130,7 +5130,7 @@
               {
                 "key": "NoteLoadFailed",
                 "name": "Note load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5162,22 +5162,22 @@
                     "render-ui",
                     "main",
                     {
-                      "direction": "vertical",
+                      "gap": "md",
+                      "type": "stack",
                       "align": "center",
                       "className": "py-12",
+                      "direction": "vertical",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
                           "variant": "caption",
+                          "type": "typography",
                           "color": "muted",
                           "content": "Loading…"
                         }
-                      ],
-                      "type": "stack",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -5191,21 +5191,43 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "href": "/contacts",
+                          "icon": "users",
+                          "label": "Contacts"
+                        },
+                        {
+                          "label": "Deals",
+                          "icon": "briefcase",
+                          "href": "/deals"
+                        },
+                        {
+                          "label": "Pipeline",
+                          "href": "/pipeline",
+                          "icon": "bar-chart-2"
+                        },
+                        {
+                          "label": "Notes",
+                          "href": "/notes",
+                          "icon": "file-text"
+                        }
+                      ],
                       "appName": "CRM",
                       "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
                           "gap": "lg",
                           "className": "max-w-5xl mx-auto w-full",
                           "children": [
                             {
                               "align": "center",
-                              "type": "stack",
-                              "gap": "md",
                               "children": [
                                 {
+                                  "gap": "sm",
+                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "align": "center",
                                   "children": [
                                     {
                                       "name": "file-text",
@@ -5216,20 +5238,16 @@
                                       "variant": "h2",
                                       "type": "typography"
                                     }
-                                  ],
-                                  "align": "center",
-                                  "gap": "sm",
-                                  "direction": "horizontal",
-                                  "type": "stack"
+                                  ]
                                 },
                                 {
                                   "children": [
                                     {
+                                      "label": "Compose",
                                       "icon": "edit",
                                       "variant": "primary",
-                                      "type": "button",
                                       "action": "COMPOSE",
-                                      "label": "Compose"
+                                      "type": "button"
                                     }
                                   ],
                                   "type": "stack",
@@ -5237,65 +5255,47 @@
                                   "gap": "sm"
                                 }
                               ],
-                              "direction": "horizontal",
-                              "justify": "between"
+                              "gap": "md",
+                              "justify": "between",
+                              "type": "stack",
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "type": "data-list",
+                              "entity": "@payload.data",
+                              "fields": [],
+                              "variant": "card",
+                              "gap": "sm",
                               "columns": [
                                 {
-                                  "name": "subject",
                                   "variant": "h4",
-                                  "icon": "file-text"
+                                  "icon": "file-text",
+                                  "name": "subject"
                                 },
                                 {
                                   "variant": "caption",
                                   "name": "author"
                                 },
                                 {
-                                  "variant": "caption",
                                   "name": "createdAt",
+                                  "variant": "caption",
                                   "format": "date"
                                 }
                               ],
-                              "type": "data-list",
-                              "gap": "sm",
-                              "variant": "card",
-                              "fields": [],
                               "itemActions": [
                                 {
-                                  "label": "View",
                                   "event": "VIEW",
-                                  "variant": "ghost"
+                                  "variant": "ghost",
+                                  "label": "View"
                                 }
-                              ],
-                              "entity": "@payload.data"
+                              ]
                             }
-                          ]
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "label": "Contacts",
-                          "href": "/contacts",
-                          "icon": "users"
-                        },
-                        {
-                          "href": "/deals",
-                          "icon": "briefcase",
-                          "label": "Deals"
-                        },
-                        {
-                          "icon": "bar-chart-2",
-                          "href": "/pipeline",
-                          "label": "Pipeline"
-                        },
-                        {
-                          "href": "/notes",
-                          "label": "Notes",
-                          "icon": "file-text"
+                          ],
+                          "direction": "vertical",
+                          "type": "stack"
                         }
                       ]
                     }
@@ -5311,36 +5311,36 @@
                     "render-ui",
                     "main",
                     {
-                      "direction": "vertical",
                       "children": [
                         {
                           "type": "icon",
-                          "color": "destructive",
-                          "name": "alert-triangle"
+                          "name": "alert-triangle",
+                          "color": "destructive"
                         },
                         {
                           "content": "Failed to load note",
-                          "type": "typography",
-                          "variant": "h3"
+                          "variant": "h3",
+                          "type": "typography"
                         },
                         {
-                          "color": "muted",
                           "type": "typography",
                           "variant": "body",
+                          "color": "muted",
                           "content": "@payload.error"
                         },
                         {
+                          "label": "Retry",
                           "icon": "rotate-ccw",
                           "variant": "primary",
                           "type": "button",
-                          "label": "Retry",
                           "action": "INIT"
                         }
                       ],
-                      "align": "center",
+                      "type": "stack",
                       "gap": "md",
+                      "align": "center",
                       "className": "py-12",
-                      "type": "stack"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -5361,7 +5361,7 @@
               "event": "NoteLoadFailed",
               "description": "Fired when Note fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5376,7 +5376,7 @@
               "event": "NoteLoaded",
               "description": "Fired when Note finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Note]"
@@ -5386,7 +5386,7 @@
             {
               "event": "NoteSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5400,7 +5400,7 @@
             {
               "event": "NoteSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -5434,7 +5434,7 @@
               {
                 "key": "SEND",
                 "name": "Send",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -5444,7 +5444,7 @@
               {
                 "key": "NoteLoadFailed",
                 "name": "Note load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5458,7 +5458,7 @@
               {
                 "key": "NoteLoaded",
                 "name": "Note loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Note]"
@@ -5468,7 +5468,7 @@
               {
                 "key": "NoteSaveFailed",
                 "name": "Note save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5482,7 +5482,7 @@
               {
                 "key": "NoteSaved",
                 "name": "Note saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -5512,10 +5512,9 @@
                     "modal",
                     {
                       "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "sm",
                           "children": [
                             {
@@ -5523,29 +5522,30 @@
                               "type": "icon"
                             },
                             {
-                              "variant": "h3",
                               "type": "typography",
-                              "content": "New Note"
+                              "content": "New Note",
+                              "variant": "h3"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "mode": "create",
+                          "cancelEvent": "CLOSE",
+                          "submitEvent": "SEND",
+                          "type": "form-section",
                           "fields": [
                             "subject",
                             "body",
                             "author"
-                          ],
-                          "type": "form-section",
-                          "submitEvent": "SEND",
-                          "cancelEvent": "CLOSE"
+                          ]
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -5618,7 +5618,7 @@
               "event": "NoteLoaded",
               "description": "Fired when Note finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Note]"
@@ -5629,7 +5629,7 @@
               "event": "NoteLoadFailed",
               "description": "Fired when Note fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -5659,7 +5659,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -5677,7 +5677,7 @@
               {
                 "key": "NoteLoaded",
                 "name": "Note loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Note]"
@@ -5687,7 +5687,7 @@
               {
                 "key": "NoteLoadFailed",
                 "name": "Note load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -5722,8 +5722,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "failure": "NoteLoadFailed",
-                        "success": "NoteLoaded"
+                        "success": "NoteLoaded",
+                        "failure": "NoteLoadFailed"
                       }
                     }
                   ],
@@ -5731,70 +5731,69 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "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"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "sm",
+                          "align": "center",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "Subject"
+                              "content": "Subject",
+                              "variant": "caption"
                             },
                             {
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.subject"
+                              "content": "@entity.subject",
+                              "variant": "body"
                             }
                           ],
-                          "type": "stack"
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
+                          "type": "stack",
+                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "content": "Body",
                               "variant": "caption",
+                              "content": "Body",
                               "type": "typography"
                             },
                             {
-                              "content": "@entity.body",
+                              "type": "typography",
                               "variant": "body",
-                              "type": "typography"
+                              "content": "@entity.body"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md"
+                          ]
                         },
                         {
-                          "direction": "horizontal",
                           "gap": "md",
                           "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "Author"
                             },
                             {
@@ -5805,40 +5804,41 @@
                           ]
                         },
                         {
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Created At"
+                              "content": "Created At",
+                              "type": "typography"
                             },
                             {
                               "variant": "body",
-                              "content": "@entity.createdAt",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.createdAt"
                             }
-                          ],
-                          "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "gap": "sm",
-                          "direction": "horizontal",
                           "type": "stack",
                           "justify": "end",
+                          "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
-                              "action": "CLOSE",
-                              "label": "Close",
+                              "type": "button",
                               "variant": "ghost",
-                              "type": "button"
+                              "label": "Close",
+                              "action": "CLOSE"
                             }
                           ]
                         }
                       ],
+                      "direction": "vertical",
                       "gap": "md",
                       "type": "stack"
                     }
@@ -5912,4 +5912,4 @@
       ]
     }
   ]
-}
+}