@almadar/std 8.5.1 → 10.0.0

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

@@ -60,7 +60,7 @@
             {
               "event": "ENROLL",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -71,7 +71,7 @@
               "event": "CourseLoaded",
               "description": "Fired when Course finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Course]"
@@ -82,7 +82,7 @@
               "event": "CourseLoadFailed",
               "description": "Fired when Course fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -96,7 +96,7 @@
             {
               "event": "CourseSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -106,7 +106,7 @@
             {
               "event": "CourseSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -120,7 +120,7 @@
             {
               "event": "CourseUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -130,7 +130,7 @@
             {
               "event": "CourseUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -144,7 +144,7 @@
             {
               "event": "CourseDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -154,7 +154,7 @@
             {
               "event": "CourseDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -168,7 +168,7 @@
             {
               "event": "EnrollmentSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -178,7 +178,7 @@
             {
               "event": "EnrollmentSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -231,7 +231,7 @@
               {
                 "key": "CourseLoaded",
                 "name": "Course loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Course]"
@@ -241,7 +241,7 @@
               {
                 "key": "CourseLoadFailed",
                 "name": "Course load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -259,7 +259,7 @@
               {
                 "key": "CourseSaved",
                 "name": "Course saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -269,7 +269,7 @@
               {
                 "key": "CourseSaveFailed",
                 "name": "Course save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -283,7 +283,7 @@
               {
                 "key": "CourseUpdated",
                 "name": "Course updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -293,7 +293,7 @@
               {
                 "key": "CourseUpdateFailed",
                 "name": "Course update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -307,7 +307,7 @@
               {
                 "key": "CourseDeleted",
                 "name": "Course deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -317,7 +317,7 @@
               {
                 "key": "CourseDeleteFailed",
                 "name": "Course delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -331,7 +331,7 @@
               {
                 "key": "EnrollmentSaved",
                 "name": "Enrollment saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -341,7 +341,7 @@
               {
                 "key": "EnrollmentSaveFailed",
                 "name": "Enrollment save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -355,7 +355,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -370,7 +370,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -385,7 +385,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -409,8 +409,8 @@
                     "Course",
                     {
                       "emit": {
-                        "success": "CourseLoaded",
-                        "failure": "CourseLoadFailed"
+                        "failure": "CourseLoadFailed",
+                        "success": "CourseLoaded"
                       }
                     }
                   ],
@@ -418,22 +418,22 @@
                     "render-ui",
                     "main",
                     {
+                      "direction": "vertical",
+                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
-                          "content": "Loading…",
+                          "variant": "caption",
                           "color": "muted",
-                          "variant": "caption"
+                          "type": "typography",
+                          "content": "Loading…"
                         }
                       ],
-                      "gap": "md",
-                      "align": "center",
-                      "direction": "vertical",
                       "className": "py-12",
-                      "type": "stack"
+                      "align": "center"
                     }
                   ]
                 ]
@@ -447,12 +447,13 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "LMS",
                       "type": "dashboard-layout",
                       "navItems": [
                         {
                           "icon": "book-open",
-                          "label": "Courses",
-                          "href": "/courses"
+                          "href": "/courses",
+                          "label": "Courses"
                         },
                         {
                           "icon": "layout-list",
@@ -460,65 +461,71 @@
                           "href": "/enroll"
                         },
                         {
-                          "label": "Progress",
+                          "icon": "layout-list",
                           "href": "/progress",
-                          "icon": "layout-list"
+                          "label": "Progress"
                         }
                       ],
                       "children": [
                         {
+                          "direction": "vertical",
                           "type": "stack",
+                          "className": "max-w-5xl mx-auto w-full",
                           "gap": "lg",
                           "children": [
                             {
                               "type": "stack",
-                              "gap": "md",
+                              "justify": "between",
+                              "direction": "horizontal",
+                              "align": "center",
                               "children": [
                                 {
-                                  "type": "stack",
                                   "gap": "sm",
+                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "book-open"
+                                      "name": "book-open",
+                                      "type": "icon"
                                     },
                                     {
-                                      "content": "Courses",
                                       "type": "typography",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "content": "Courses"
                                     }
-                                  ]
+                                  ],
+                                  "align": "center"
                                 },
                                 {
                                   "type": "stack",
-                                  "gap": "sm",
                                   "direction": "horizontal",
+                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "type": "button",
+                                      "action": "CREATE",
                                       "variant": "primary",
-                                      "icon": "plus",
+                                      "type": "button",
                                       "label": "Add Course",
-                                      "action": "CREATE"
+                                      "icon": "plus"
                                     }
                                   ]
                                 }
                               ],
-                              "direction": "horizontal",
-                              "justify": "between",
-                              "align": "center"
+                              "gap": "md"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "cols": 2.0,
+                              "fields": [],
+                              "gap": "md",
+                              "entity": "@payload.data",
                               "columns": [
                                 {
-                                  "name": "title",
+                                  "icon": "book-open",
                                   "variant": "h3",
-                                  "icon": "book-open"
+                                  "name": "title"
                                 },
                                 {
                                   "name": "level",
@@ -529,22 +536,20 @@
                                   "variant": "body"
                                 },
                                 {
-                                  "name": "duration",
-                                  "variant": "body"
+                                  "variant": "body",
+                                  "name": "duration"
                                 },
                                 {
-                                  "variant": "caption",
-                                  "name": "description"
+                                  "name": "description",
+                                  "variant": "caption"
                                 }
                               ],
-                              "cols": 2.0,
-                              "entity": "@payload.data",
-                              "gap": "md",
+                              "type": "data-grid",
                               "itemActions": [
                                 {
+                                  "variant": "ghost",
                                   "label": "View",
-                                  "event": "VIEW",
-                                  "variant": "ghost"
+                                  "event": "VIEW"
                                 },
                                 {
                                   "label": "Edit",
@@ -553,19 +558,14 @@
                                 },
                                 {
                                   "event": "DELETE",
-                                  "label": "Delete",
-                                  "variant": "danger"
+                                  "variant": "danger",
+                                  "label": "Delete"
                                 }
-                              ],
-                              "fields": [],
-                              "type": "data-grid"
+                              ]
                             }
-                          ],
-                          "direction": "vertical",
-                          "className": "max-w-5xl mx-auto w-full"
+                          ]
                         }
-                      ],
-                      "appName": "LMS"
+                      ]
                     }
                   ]
                 ]
@@ -579,36 +579,36 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
-                      "align": "center",
                       "direction": "vertical",
                       "gap": "md",
-                      "className": "py-12",
                       "children": [
                         {
+                          "name": "alert-triangle",
                           "color": "destructive",
-                          "type": "icon",
-                          "name": "alert-triangle"
+                          "type": "icon"
                         },
                         {
-                          "content": "Failed to load course",
                           "type": "typography",
-                          "variant": "h3"
+                          "variant": "h3",
+                          "content": "Failed to load course"
                         },
                         {
+                          "variant": "body",
                           "content": "@payload.error",
                           "color": "muted",
-                          "variant": "body",
                           "type": "typography"
                         },
                         {
-                          "variant": "primary",
                           "label": "Retry",
+                          "action": "INIT",
                           "icon": "rotate-ccw",
                           "type": "button",
-                          "action": "INIT"
+                          "variant": "primary"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "align": "center",
+                      "className": "py-12"
                     }
                   ]
                 ]
@@ -625,7 +625,7 @@
             {
               "event": "COURSE_CREATED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -636,7 +636,7 @@
               "event": "CourseLoadFailed",
               "description": "Fired when Course fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -651,7 +651,7 @@
               "event": "CourseLoaded",
               "description": "Fired when Course finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Course]"
@@ -661,7 +661,7 @@
             {
               "event": "CourseSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -675,7 +675,7 @@
             {
               "event": "CourseSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -709,7 +709,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -724,7 +724,7 @@
               {
                 "key": "CourseLoadFailed",
                 "name": "Course load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -738,7 +738,7 @@
               {
                 "key": "CourseLoaded",
                 "name": "Course loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Course]"
@@ -748,7 +748,7 @@
               {
                 "key": "CourseSaveFailed",
                 "name": "Course save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -762,7 +762,7 @@
               {
                 "key": "CourseSaved",
                 "name": "Course saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -801,28 +801,32 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
+                      "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "gap": "sm",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "icon",
                               "name": "plus-circle"
                             },
                             {
-                              "content": "New Course",
                               "type": "typography",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "New Course"
                             }
                           ],
-                          "type": "stack"
+                          "direction": "horizontal",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "mode": "create",
+                          "cancelEvent": "CLOSE",
                           "fields": [
                             "title",
                             "description",
@@ -831,13 +835,9 @@
                             "level"
                           ],
                           "type": "form-section",
-                          "cancelEvent": "CLOSE",
                           "submitEvent": "SAVE"
                         }
-                      ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -878,8 +878,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "CourseSaved",
-                        "failure": "CourseSaveFailed"
+                        "failure": "CourseSaveFailed",
+                        "success": "CourseSaved"
                       }
                     }
                   ],
@@ -913,7 +913,7 @@
             {
               "event": "COURSE_UPDATED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -924,7 +924,7 @@
               "event": "CourseLoadFailed",
               "description": "Fired when Course fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -939,7 +939,7 @@
               "event": "CourseLoaded",
               "description": "Fired when Course finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Course]"
@@ -949,7 +949,7 @@
             {
               "event": "CourseUpdateFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -963,7 +963,7 @@
             {
               "event": "CourseUpdated",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -989,7 +989,7 @@
               {
                 "key": "EDIT",
                 "name": "Edit",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1008,7 +1008,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -1023,7 +1023,7 @@
               {
                 "key": "CourseLoadFailed",
                 "name": "Course load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1037,7 +1037,7 @@
               {
                 "key": "CourseLoaded",
                 "name": "Course loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Course]"
@@ -1047,7 +1047,7 @@
               {
                 "key": "CourseUpdateFailed",
                 "name": "Course update failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1061,7 +1061,7 @@
               {
                 "key": "CourseUpdated",
                 "name": "Course updated",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -1090,11 +1090,11 @@
                     "fetch",
                     "Course",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "CourseLoaded",
                         "failure": "CourseLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
@@ -1103,19 +1103,19 @@
                     {
                       "children": [
                         {
-                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "name": "edit",
                               "type": "icon"
                             },
                             {
-                              "content": "Edit Course",
+                              "variant": "h3",
                               "type": "typography",
-                              "variant": "h3"
+                              "content": "Edit Course"
                             }
                           ],
-                          "direction": "horizontal",
+                          "type": "stack",
                           "gap": "sm"
                         },
                         {
@@ -1124,21 +1124,21 @@
                         {
                           "cancelEvent": "CLOSE",
                           "entity": "@payload.row",
+                          "type": "form-section",
+                          "mode": "edit",
+                          "submitEvent": "SAVE",
                           "fields": [
                             "title",
                             "description",
                             "instructor",
                             "duration",
                             "level"
-                          ],
-                          "submitEvent": "SAVE",
-                          "mode": "edit",
-                          "type": "form-section"
+                          ]
                         }
                       ],
                       "type": "stack",
-                      "gap": "md",
-                      "direction": "vertical"
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -1179,8 +1179,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "CourseUpdateFailed",
-                        "success": "CourseUpdated"
+                        "success": "CourseUpdated",
+                        "failure": "CourseUpdateFailed"
                       }
                     }
                   ],
@@ -1215,7 +1215,7 @@
               "event": "CourseLoaded",
               "description": "Fired when Course finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Course]"
@@ -1226,7 +1226,7 @@
               "event": "CourseLoadFailed",
               "description": "Fired when Course fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1256,7 +1256,7 @@
               {
                 "key": "VIEW",
                 "name": "View",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1271,7 +1271,7 @@
               {
                 "key": "SAVE",
                 "name": "Save",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "object",
@@ -1282,7 +1282,7 @@
               {
                 "key": "CourseLoaded",
                 "name": "Course loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Course]"
@@ -1292,7 +1292,7 @@
               {
                 "key": "CourseLoadFailed",
                 "name": "Course load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1327,8 +1327,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "CourseLoaded",
-                        "failure": "CourseLoadFailed"
+                        "failure": "CourseLoadFailed",
+                        "success": "CourseLoaded"
                       }
                     }
                   ],
@@ -1336,51 +1336,53 @@
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
                           "direction": "horizontal",
-                          "gap": "sm",
-                          "type": "stack",
-                          "align": "center",
                           "children": [
                             {
-                              "name": "eye",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "eye"
                             },
                             {
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "@entity.title"
+                              "content": "@entity.title",
+                              "variant": "h3"
                             }
-                          ]
+                          ],
+                          "align": "center",
+                          "type": "stack",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal",
                           "children": [
                             {
+                              "variant": "caption",
                               "content": "Title",
-                              "type": "typography",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.title"
+                              "content": "@entity.title",
+                              "variant": "body"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
-                          "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
                               "variant": "caption",
-                              "type": "typography",
-                              "content": "Description"
+                              "content": "Description",
+                              "type": "typography"
                             },
                             {
                               "content": "@entity.description",
@@ -1388,88 +1390,86 @@
                               "type": "typography"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
                           "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
-                              "content": "Instructor",
                               "variant": "caption",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Instructor"
                             },
                             {
                               "content": "@entity.instructor",
-                              "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal"
                         },
                         {
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Duration",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
+                              "variant": "body",
                               "type": "typography",
-                              "content": "@entity.duration",
-                              "variant": "body"
+                              "content": "@entity.duration"
                             }
                           ],
                           "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md"
+                          "gap": "md",
+                          "direction": "horizontal"
                         },
                         {
-                          "gap": "md",
                           "direction": "horizontal",
-                          "type": "stack",
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Level",
+                              "variant": "caption",
                               "type": "typography"
                             },
                             {
-                              "type": "typography",
+                              "content": "@entity.level",
                               "variant": "body",
-                              "content": "@entity.level"
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "gap": "sm",
+                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
-                              "variant": "primary",
-                              "action": "EDIT",
-                              "icon": "edit",
+                              "type": "button",
                               "label": "Edit",
-                              "type": "button"
+                              "action": "EDIT",
+                              "variant": "primary",
+                              "icon": "edit"
                             },
                             {
-                              "type": "button",
-                              "action": "CLOSE",
+                              "variant": "ghost",
                               "label": "Close",
-                              "variant": "ghost"
+                              "type": "button",
+                              "action": "CLOSE"
                             }
                           ],
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "justify": "end"
+                          "justify": "end",
+                          "gap": "sm"
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -1529,7 +1529,7 @@
             {
               "event": "COURSE_DELETED",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1539,7 +1539,7 @@
             {
               "event": "CourseDeleteFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1553,7 +1553,7 @@
             {
               "event": "CourseDeleted",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1564,7 +1564,7 @@
               "event": "CourseLoadFailed",
               "description": "Fired when Course fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1579,7 +1579,7 @@
               "event": "CourseLoaded",
               "description": "Fired when Course finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Course]"
@@ -1605,7 +1605,7 @@
               {
                 "key": "DELETE",
                 "name": "Delete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string",
@@ -1632,7 +1632,7 @@
               {
                 "key": "CourseDeleteFailed",
                 "name": "Course delete failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1646,7 +1646,7 @@
               {
                 "key": "CourseDeleted",
                 "name": "Course deleted",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -1656,7 +1656,7 @@
               {
                 "key": "CourseLoadFailed",
                 "name": "Course load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -1670,7 +1670,7 @@
               {
                 "key": "CourseLoaded",
                 "name": "Course loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Course]"
@@ -1715,10 +1715,14 @@
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
                       "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
+                          "direction": "horizontal",
+                          "align": "center",
+                          "type": "stack",
                           "gap": "sm",
                           "children": [
                             {
@@ -1730,42 +1734,38 @@
                               "variant": "h3",
                               "type": "typography"
                             }
-                          ],
-                          "align": "center",
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
                           "type": "alert",
+                          "variant": "error",
                           "message": "This action cannot be undone."
                         },
                         {
+                          "justify": "end",
                           "type": "stack",
                           "children": [
                             {
-                              "variant": "ghost",
                               "action": "CANCEL",
                               "type": "button",
+                              "variant": "ghost",
                               "label": "Cancel"
                             },
                             {
+                              "icon": "check",
+                              "variant": "danger",
                               "label": "Delete",
-                              "type": "button",
                               "action": "CONFIRM_DELETE",
-                              "variant": "danger",
-                              "icon": "check"
+                              "type": "button"
                             }
                           ],
-                          "direction": "horizontal",
                           "gap": "sm",
-                          "justify": "end"
+                          "direction": "horizontal"
                         }
-                      ],
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -1782,8 +1782,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "success": "CourseDeleted",
-                        "failure": "CourseDeleteFailed"
+                        "failure": "CourseDeleteFailed",
+                        "success": "CourseDeleted"
                       }
                     }
                   ],
@@ -1926,7 +1926,7 @@
             {
               "event": "COMPLETE_LESSON",
               "scope": "external",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -1937,7 +1937,7 @@
               "event": "EnrollmentLoadFailed",
               "description": "Fired when Enrollment fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1952,7 +1952,7 @@
               "event": "EnrollmentLoaded",
               "description": "Fired when Enrollment finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Enrollment]"
@@ -1962,7 +1962,7 @@
             {
               "event": "EnrollmentSaveFailed",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -1976,7 +1976,7 @@
             {
               "event": "EnrollmentSaved",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "id",
                   "type": "string"
@@ -2025,7 +2025,7 @@
               {
                 "key": "COMPLETE",
                 "name": "Complete",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "string"
@@ -2043,7 +2043,7 @@
               {
                 "key": "EnrollmentLoadFailed",
                 "name": "Enrollment load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2057,7 +2057,7 @@
               {
                 "key": "EnrollmentLoaded",
                 "name": "Enrollment loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Enrollment]"
@@ -2067,7 +2067,7 @@
               {
                 "key": "EnrollmentSaveFailed",
                 "name": "Enrollment save failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -2081,7 +2081,7 @@
               {
                 "key": "EnrollmentSaved",
                 "name": "Enrollment saved",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "id",
                     "type": "string"
@@ -2111,21 +2111,15 @@
                     {
                       "children": [
                         {
-                          "type": "container",
-                          "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
                               "type": "stack",
-                              "gap": "lg",
                               "children": [
                                 {
-                                  "direction": "horizontal",
-                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "name": "user-plus",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "user-plus"
                                     },
                                     {
                                       "variant": "h2",
@@ -2133,73 +2127,79 @@
                                       "content": "Course Enrollment"
                                     }
                                   ],
-                                  "align": "center",
-                                  "type": "stack"
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "type": "stack",
+                                  "align": "center"
                                 },
                                 {
                                   "currentIndex": 0.0,
-                                  "type": "progress-dots",
-                                  "count": 2.0
+                                  "count": 2.0,
+                                  "type": "progress-dots"
                                 },
                                 {
                                   "type": "wizard-progress",
+                                  "currentStep": 0.0,
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
-                                  ],
-                                  "currentStep": 0.0
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "content": "Student Info",
                                   "variant": "h3",
-                                  "type": "typography"
+                                  "type": "typography",
+                                  "content": "Student Info"
                                 },
                                 {
-                                  "cancelEvent": "INIT",
+                                  "submitEvent": "NEXT",
                                   "fields": [
                                     "studentName",
                                     "email"
                                   ],
                                   "type": "form-section",
                                   "mode": "create",
-                                  "submitEvent": "NEXT"
+                                  "cancelEvent": "INIT"
                                 },
                                 {
-                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "justify": "end",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "label": "Next",
                                       "action": "NEXT",
+                                      "variant": "primary",
+                                      "label": "Next",
                                       "icon": "arrow-right",
-                                      "variant": "primary"
+                                      "type": "button"
                                     }
                                   ],
-                                  "type": "stack",
                                   "gap": "sm"
                                 }
                               ],
-                              "direction": "vertical"
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
-                          ]
+                          ],
+                          "type": "container",
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ],
                       "type": "dashboard-layout",
                       "appName": "LMS",
                       "navItems": [
                         {
-                          "icon": "book-open",
                           "href": "/courses",
-                          "label": "Courses"
+                          "label": "Courses",
+                          "icon": "book-open"
                         },
                         {
+                          "icon": "layout-list",
                           "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
+                          "href": "/enroll"
                         },
                         {
                           "label": "Progress",
@@ -2232,49 +2232,46 @@
                     {
                       "navItems": [
                         {
-                          "icon": "book-open",
+                          "label": "Courses",
                           "href": "/courses",
-                          "label": "Courses"
+                          "icon": "book-open"
                         },
                         {
                           "icon": "layout-list",
-                          "href": "/enroll",
-                          "label": "Enroll"
+                          "label": "Enroll",
+                          "href": "/enroll"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/progress",
-                          "label": "Progress"
+                          "label": "Progress",
+                          "icon": "layout-list"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "maxWidth": "lg",
-                          "padding": "lg",
                           "type": "container",
+                          "padding": "lg",
                           "children": [
                             {
-                              "gap": "lg",
-                              "direction": "vertical",
                               "type": "stack",
                               "children": [
                                 {
-                                  "align": "center",
+                                  "type": "stack",
+                                  "gap": "sm",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "user-plus"
                                     },
                                     {
+                                      "content": "Course Enrollment",
                                       "variant": "h2",
-                                      "type": "typography",
-                                      "content": "Course Enrollment"
+                                      "type": "typography"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "gap": "sm",
-                                  "direction": "horizontal"
+                                  "direction": "horizontal",
+                                  "align": "center"
                                 },
                                 {
                                   "count": 2.0,
@@ -2282,58 +2279,61 @@
                                   "type": "progress-dots"
                                 },
                                 {
+                                  "currentStep": 1.0,
+                                  "type": "wizard-progress",
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
-                                  ],
-                                  "type": "wizard-progress",
-                                  "currentStep": 1.0
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "variant": "h3",
                                   "type": "typography",
+                                  "variant": "h3",
                                   "content": "Course Selection"
                                 },
                                 {
-                                  "mode": "create",
+                                  "type": "form-section",
+                                  "cancelEvent": "PREV",
                                   "fields": [
                                     "courseId"
                                   ],
                                   "submitEvent": "NEXT",
-                                  "cancelEvent": "PREV",
-                                  "type": "form-section"
+                                  "mode": "create"
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "gap": "sm",
-                                  "justify": "end",
                                   "children": [
                                     {
+                                      "action": "PREV",
                                       "label": "Back",
-                                      "type": "button",
                                       "icon": "arrow-left",
-                                      "action": "PREV",
-                                      "variant": "ghost"
+                                      "variant": "ghost",
+                                      "type": "button"
                                     },
                                     {
-                                      "label": "Next",
                                       "variant": "primary",
+                                      "type": "button",
+                                      "label": "Next",
                                       "icon": "arrow-right",
-                                      "action": "NEXT",
-                                      "type": "button"
+                                      "action": "NEXT"
                                     }
-                                  ]
+                                  ],
+                                  "justify": "end",
+                                  "type": "stack",
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 }
-                              ]
+                              ],
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
                           ]
                         }
                       ],
-                      "appName": "LMS"
+                      "appName": "LMS",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2348,8 +2348,8 @@
                     "Enrollment",
                     {
                       "emit": {
-                        "failure": "EnrollmentLoadFailed",
-                        "success": "EnrollmentLoaded"
+                        "success": "EnrollmentLoaded",
+                        "failure": "EnrollmentLoadFailed"
                       }
                     }
                   ],
@@ -2357,15 +2357,15 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "LMS",
                       "children": [
                         {
-                          "direction": "vertical",
                           "gap": "lg",
-                          "type": "stack",
+                          "direction": "vertical",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "horizontal",
+                              "type": "stack",
                               "align": "center",
                               "children": [
                                 {
@@ -2373,16 +2373,16 @@
                                   "name": "user-plus"
                                 },
                                 {
-                                  "content": "Course Enrollment",
+                                  "type": "typography",
                                   "variant": "h2",
-                                  "type": "typography"
+                                  "content": "Course Enrollment"
                                 }
                               ],
                               "gap": "sm"
                             },
                             {
-                              "type": "badge",
-                              "label": "Review"
+                              "label": "Review",
+                              "type": "badge"
                             },
                             {
                               "steps": [
@@ -2396,25 +2396,24 @@
                               "type": "divider"
                             },
                             {
-                              "gap": "sm",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "md",
-                                  "justify": "between",
                                   "children": [
                                     {
-                                      "variant": "caption",
                                       "content": "Student Name",
+                                      "variant": "caption",
                                       "type": "typography"
                                     },
                                     {
-                                      "variant": "body",
+                                      "type": "typography",
                                       "content": "@entity.studentName",
-                                      "type": "typography"
+                                      "variant": "body"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "justify": "between"
                                 },
                                 {
                                   "gap": "md",
@@ -2423,58 +2422,60 @@
                                   "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "typography",
+                                      "content": "Email",
                                       "variant": "caption",
-                                      "content": "Email"
+                                      "type": "typography"
                                     },
                                     {
-                                      "content": "@entity.email",
                                       "type": "typography",
+                                      "content": "@entity.email",
                                       "variant": "body"
                                     }
                                   ]
                                 },
                                 {
-                                  "direction": "horizontal",
+                                  "gap": "md",
                                   "type": "stack",
+                                  "justify": "between",
                                   "children": [
                                     {
+                                      "variant": "caption",
                                       "type": "typography",
-                                      "content": "Course Id",
-                                      "variant": "caption"
+                                      "content": "Course Id"
                                     },
                                     {
                                       "content": "@entity.courseId",
-                                      "variant": "body",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "variant": "body"
                                     }
                                   ],
-                                  "justify": "between",
-                                  "gap": "md"
+                                  "direction": "horizontal"
                                 },
                                 {
-                                  "gap": "md",
-                                  "justify": "between",
-                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "typography",
                                       "content": "Enrolled At",
-                                      "variant": "caption"
+                                      "variant": "caption",
+                                      "type": "typography"
                                     },
                                     {
-                                      "type": "typography",
                                       "variant": "body",
+                                      "type": "typography",
                                       "content": "@entity.enrolledAt"
                                     }
                                   ],
-                                  "type": "stack"
+                                  "direction": "horizontal",
+                                  "justify": "between",
+                                  "type": "stack",
+                                  "gap": "md"
                                 },
                                 {
+                                  "justify": "between",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "content": "Status",
                                       "variant": "caption",
+                                      "content": "Status",
                                       "type": "typography"
                                     },
                                     {
@@ -2483,45 +2484,44 @@
                                       "type": "typography"
                                     }
                                   ],
-                                  "justify": "between",
-                                  "type": "stack",
                                   "direction": "horizontal",
                                   "gap": "md"
                                 }
                               ],
                               "type": "stack",
+                              "gap": "sm",
                               "direction": "vertical"
                             },
                             {
-                              "showComplete": true,
+                              "type": "wizard-navigation",
                               "totalSteps": 3.0,
-                              "currentStep": 2.0,
                               "showBack": true,
-                              "type": "wizard-navigation",
+                              "showComplete": true,
+                              "currentStep": 2.0,
                               "showNext": false
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
                       "navItems": [
                         {
-                          "href": "/courses",
                           "label": "Courses",
-                          "icon": "book-open"
+                          "icon": "book-open",
+                          "href": "/courses"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/enroll",
+                          "icon": "layout-list",
                           "label": "Enroll"
                         },
                         {
-                          "href": "/progress",
                           "icon": "layout-list",
-                          "label": "Progress"
+                          "label": "Progress",
+                          "href": "/progress"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2545,35 +2545,21 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "book-open",
-                          "label": "Courses",
-                          "href": "/courses"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/enroll",
-                          "label": "Enroll"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "type": "dashboard-layout",
                       "appName": "LMS",
                       "children": [
                         {
-                          "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
+                              "direction": "vertical",
                               "type": "stack",
                               "gap": "lg",
                               "children": [
                                 {
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "align": "center",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "name": "user-plus",
@@ -2584,37 +2570,33 @@
                                       "content": "Course Enrollment",
                                       "variant": "h2"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center",
-                                  "type": "stack"
+                                  ]
                                 },
                                 {
+                                  "count": 2.0,
                                   "currentIndex": 0.0,
-                                  "type": "progress-dots",
-                                  "count": 2.0
+                                  "type": "progress-dots"
                                 },
                                 {
-                                  "type": "wizard-progress",
-                                  "currentStep": 0.0,
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
-                                  ]
+                                  ],
+                                  "type": "wizard-progress",
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "content": "Student Info",
                                   "type": "typography",
-                                  "variant": "h3",
-                                  "content": "Student Info"
+                                  "variant": "h3"
                                 },
                                 {
-                                  "type": "form-section",
-                                  "submitEvent": "NEXT",
                                   "cancelEvent": "INIT",
+                                  "submitEvent": "NEXT",
+                                  "type": "form-section",
                                   "fields": [
                                     "studentName",
                                     "email"
@@ -2622,25 +2604,43 @@
                                   "mode": "create"
                                 },
                                 {
-                                  "type": "stack",
                                   "justify": "end",
+                                  "direction": "horizontal",
+                                  "type": "stack",
+                                  "gap": "sm",
                                   "children": [
                                     {
                                       "label": "Next",
                                       "variant": "primary",
-                                      "action": "NEXT",
                                       "type": "button",
+                                      "action": "NEXT",
                                       "icon": "arrow-right"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  ]
                                 }
-                              ],
-                              "direction": "vertical"
+                              ]
                             }
                           ],
-                          "type": "container"
+                          "type": "container",
+                          "padding": "lg",
+                          "maxWidth": "lg"
+                        }
+                      ],
+                      "navItems": [
+                        {
+                          "icon": "book-open",
+                          "label": "Courses",
+                          "href": "/courses"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Enroll",
+                          "href": "/enroll"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Progress",
+                          "href": "/progress"
                         }
                       ]
                     }
@@ -2666,17 +2666,17 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "appName": "LMS",
                       "navItems": [
                         {
-                          "icon": "book-open",
                           "label": "Courses",
+                          "icon": "book-open",
                           "href": "/courses"
                         },
                         {
+                          "icon": "layout-list",
                           "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
+                          "href": "/enroll"
                         },
                         {
                           "label": "Progress",
@@ -2684,16 +2684,20 @@
                           "icon": "layout-list"
                         }
                       ],
-                      "appName": "LMS",
+                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "type": "container",
+                          "padding": "lg",
+                          "maxWidth": "lg",
                           "children": [
                             {
+                              "gap": "lg",
+                              "type": "stack",
                               "direction": "vertical",
                               "children": [
                                 {
                                   "direction": "horizontal",
-                                  "align": "center",
                                   "children": [
                                     {
                                       "name": "user-plus",
@@ -2706,7 +2710,8 @@
                                     }
                                   ],
                                   "type": "stack",
-                                  "gap": "sm"
+                                  "gap": "sm",
+                                  "align": "center"
                                 },
                                 {
                                   "currentIndex": 1.0,
@@ -2714,60 +2719,55 @@
                                   "type": "progress-dots"
                                 },
                                 {
+                                  "type": "wizard-progress",
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "currentStep": 1.0,
-                                  "type": "wizard-progress"
+                                  "currentStep": 1.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "typography",
                                   "variant": "h3",
-                                  "content": "Course Selection",
-                                  "type": "typography"
+                                  "content": "Course Selection"
                                 },
                                 {
+                                  "cancelEvent": "PREV",
+                                  "type": "form-section",
                                   "fields": [
                                     "courseId"
                                   ],
-                                  "cancelEvent": "PREV",
                                   "submitEvent": "NEXT",
-                                  "type": "form-section",
                                   "mode": "create"
                                 },
                                 {
+                                  "direction": "horizontal",
+                                  "justify": "end",
                                   "children": [
                                     {
                                       "type": "button",
-                                      "label": "Back",
                                       "variant": "ghost",
-                                      "icon": "arrow-left",
-                                      "action": "PREV"
+                                      "label": "Back",
+                                      "action": "PREV",
+                                      "icon": "arrow-left"
                                     },
                                     {
-                                      "action": "NEXT",
-                                      "variant": "primary",
                                       "icon": "arrow-right",
+                                      "action": "NEXT",
+                                      "label": "Next",
                                       "type": "button",
-                                      "label": "Next"
+                                      "variant": "primary"
                                     }
                                   ],
-                                  "gap": "sm",
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "justify": "end"
+                                  "gap": "sm"
                                 }
-                              ],
-                              "type": "stack",
-                              "gap": "lg"
+                              ]
                             }
-                          ],
-                          "maxWidth": "lg",
-                          "padding": "lg",
-                          "type": "container"
+                          ]
                         }
                       ]
                     }
@@ -2786,8 +2786,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "EnrollmentSaveFailed",
-                        "success": "EnrollmentSaved"
+                        "success": "EnrollmentSaved",
+                        "failure": "EnrollmentSaveFailed"
                       }
                     }
                   ],
@@ -2800,27 +2800,10 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "LMS",
-                      "navItems": [
-                        {
-                          "icon": "book-open",
-                          "href": "/courses",
-                          "label": "Courses"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Enroll",
-                          "href": "/enroll"
-                        },
-                        {
-                          "href": "/progress",
-                          "label": "Progress",
-                          "icon": "layout-list"
-                        }
-                      ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "type": "stack",
+                          "align": "center",
                           "direction": "vertical",
                           "gap": "lg",
                           "children": [
@@ -2830,26 +2813,43 @@
                             },
                             {
                               "type": "typography",
-                              "content": "Enrolled!",
-                              "variant": "h2"
+                              "variant": "h2",
+                              "content": "Enrolled!"
                             },
                             {
+                              "variant": "body",
                               "type": "typography",
-                              "content": "You have been successfully enrolled in the course.",
-                              "variant": "body"
+                              "content": "You have been successfully enrolled in the course."
                             },
                             {
                               "action": "RESTART",
-                              "variant": "primary",
-                              "label": "Start New",
                               "type": "button",
+                              "label": "Start New",
+                              "variant": "primary",
                               "icon": "refresh-cw"
                             }
-                          ],
-                          "align": "center",
-                          "type": "stack"
+                          ]
                         }
-                      ]
+                      ],
+                      "appName": "LMS",
+                      "navItems": [
+                        {
+                          "href": "/courses",
+                          "icon": "book-open",
+                          "label": "Courses"
+                        },
+                        {
+                          "label": "Enroll",
+                          "href": "/enroll",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "label": "Progress",
+                          "href": "/progress",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2864,8 +2864,8 @@
                     "Enrollment",
                     {
                       "emit": {
-                        "success": "EnrollmentLoaded",
-                        "failure": "EnrollmentLoadFailed"
+                        "failure": "EnrollmentLoadFailed",
+                        "success": "EnrollmentLoaded"
                       }
                     }
                   ],
@@ -2874,15 +2874,34 @@
                     "main",
                     {
                       "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/courses",
+                          "icon": "book-open",
+                          "label": "Courses"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/enroll",
+                          "label": "Enroll"
+                        },
+                        {
+                          "label": "Progress",
+                          "icon": "layout-list",
+                          "href": "/progress"
+                        }
+                      ],
+                      "appName": "LMS",
                       "children": [
                         {
-                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
-                              "gap": "lg",
                               "children": [
                                 {
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "align": "center",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "name": "user-plus",
@@ -2893,20 +2912,16 @@
                                       "variant": "h2",
                                       "type": "typography"
                                     }
-                                  ],
-                                  "type": "stack",
-                                  "align": "center",
-                                  "gap": "sm",
-                                  "direction": "horizontal"
+                                  ]
                                 },
                                 {
-                                  "currentIndex": 0.0,
+                                  "type": "progress-dots",
                                   "count": 2.0,
-                                  "type": "progress-dots"
+                                  "currentIndex": 0.0
                                 },
                                 {
-                                  "currentStep": 0.0,
                                   "type": "wizard-progress",
+                                  "currentStep": 0.0,
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
@@ -2916,14 +2931,14 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "typography",
                                   "content": "Student Info",
-                                  "variant": "h3",
-                                  "type": "typography"
+                                  "variant": "h3"
                                 },
                                 {
+                                  "mode": "create",
                                   "type": "form-section",
                                   "cancelEvent": "INIT",
-                                  "mode": "create",
                                   "submitEvent": "NEXT",
                                   "fields": [
                                     "studentName",
@@ -2931,46 +2946,31 @@
                                   ]
                                 },
                                 {
-                                  "justify": "end",
                                   "children": [
                                     {
-                                      "label": "Next",
+                                      "action": "NEXT",
+                                      "variant": "primary",
                                       "icon": "arrow-right",
                                       "type": "button",
-                                      "variant": "primary",
-                                      "action": "NEXT"
+                                      "label": "Next"
                                     }
                                   ],
-                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "sm"
+                                  "gap": "sm",
+                                  "justify": "end",
+                                  "type": "stack"
                                 }
                               ],
-                              "direction": "vertical"
+                              "type": "stack",
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
                           ],
                           "type": "container",
-                          "maxWidth": "lg"
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/enroll",
-                          "label": "Enroll"
-                        },
-                        {
-                          "label": "Progress",
-                          "icon": "layout-list",
-                          "href": "/progress"
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
-                      ],
-                      "appName": "LMS"
+                      ]
                     }
                   ]
                 ]
@@ -2995,16 +2995,17 @@
                     "main",
                     {
                       "appName": "LMS",
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "padding": "lg",
-                          "type": "container",
                           "maxWidth": "lg",
                           "children": [
                             {
+                              "direction": "vertical",
+                              "gap": "lg",
                               "children": [
                                 {
+                                  "align": "center",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "type": "icon",
@@ -3017,81 +3018,80 @@
                                     }
                                   ],
                                   "direction": "horizontal",
-                                  "gap": "sm",
-                                  "type": "stack",
-                                  "align": "center"
+                                  "gap": "sm"
                                 },
                                 {
-                                  "count": 2.0,
                                   "currentIndex": 0.0,
-                                  "type": "progress-dots"
+                                  "type": "progress-dots",
+                                  "count": 2.0
                                 },
                                 {
-                                  "currentStep": 0.0,
+                                  "type": "wizard-progress",
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "type": "wizard-progress"
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
+                                  "variant": "h3",
                                   "content": "Student Info",
-                                  "variant": "h3"
+                                  "type": "typography"
                                 },
                                 {
                                   "cancelEvent": "INIT",
-                                  "submitEvent": "NEXT",
                                   "fields": [
                                     "studentName",
                                     "email"
                                   ],
                                   "mode": "create",
-                                  "type": "form-section"
+                                  "type": "form-section",
+                                  "submitEvent": "NEXT"
                                 },
                                 {
+                                  "type": "stack",
+                                  "justify": "end",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "icon": "arrow-right",
+                                      "type": "button",
                                       "label": "Next",
                                       "action": "NEXT",
-                                      "variant": "primary",
-                                      "type": "button"
+                                      "icon": "arrow-right",
+                                      "variant": "primary"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "justify": "end",
-                                  "gap": "sm",
-                                  "direction": "horizontal"
+                                  "gap": "sm"
                                 }
                               ],
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg"
+                              "type": "stack"
                             }
-                          ]
+                          ],
+                          "type": "container",
+                          "padding": "lg"
                         }
                       ],
                       "navItems": [
                         {
-                          "icon": "book-open",
+                          "label": "Courses",
                           "href": "/courses",
-                          "label": "Courses"
+                          "icon": "book-open"
                         },
                         {
-                          "href": "/enroll",
                           "label": "Enroll",
+                          "href": "/enroll",
                           "icon": "layout-list"
                         },
                         {
-                          "href": "/progress",
                           "label": "Progress",
+                          "href": "/progress",
                           "icon": "layout-list"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3156,7 +3156,7 @@
               "event": "ProgressLoaded",
               "description": "Fired when Progress finishes loading",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "data",
                   "type": "[Progress]"
@@ -3167,7 +3167,7 @@
               "event": "ProgressLoadFailed",
               "description": "Fired when Progress fails to load",
               "scope": "internal",
-              "payload": [
+              "payloadSchema": [
                 {
                   "name": "error",
                   "type": "string"
@@ -3221,7 +3221,7 @@
               {
                 "key": "ProgressLoaded",
                 "name": "Progress loaded",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "data",
                     "type": "[Progress]"
@@ -3231,7 +3231,7 @@
               {
                 "key": "ProgressLoadFailed",
                 "name": "Progress load failed",
-                "payload": [
+                "payloadSchema": [
                   {
                     "name": "error",
                     "type": "string"
@@ -3264,94 +3264,77 @@
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "icon": "book-open",
-                          "label": "Courses",
-                          "href": "/courses"
-                        },
-                        {
-                          "href": "/enroll",
-                          "icon": "layout-list",
-                          "label": "Enroll"
-                        },
-                        {
-                          "href": "/progress",
-                          "label": "Progress",
-                          "icon": "layout-list"
-                        }
-                      ],
-                      "appName": "LMS",
                       "children": [
                         {
+                          "type": "scaled-diagram",
                           "children": [
                             {
                               "type": "stack",
-                              "gap": "lg",
+                              "direction": "vertical",
                               "children": [
                                 {
+                                  "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Progress"
                                     }
-                                  ],
-                                  "type": "breadcrumb"
+                                  ]
                                 },
                                 {
-                                  "direction": "horizontal",
+                                  "gap": "md",
+                                  "justify": "between",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "gap": "md",
                                       "direction": "horizontal",
+                                      "type": "stack",
                                       "children": [
                                         {
                                           "type": "icon",
                                           "name": "trending-up"
                                         },
                                         {
-                                          "content": "Progress",
+                                          "variant": "h2",
                                           "type": "typography",
-                                          "variant": "h2"
+                                          "content": "Progress"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md"
                                     },
                                     {
+                                      "variant": "secondary",
                                       "label": "Refresh",
                                       "type": "button",
-                                      "variant": "secondary",
                                       "icon": "refresh-cw",
                                       "action": "REFRESH"
                                     }
                                   ],
-                                  "gap": "md",
                                   "type": "stack",
-                                  "justify": "between"
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "box",
+                                  "padding": "md",
                                   "children": [
                                     {
-                                      "cols": 3.0,
+                                      "type": "simple-grid",
                                       "children": [
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
                                               "type": "stack",
-                                              "gap": "sm",
                                               "direction": "vertical",
+                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "variant": "caption",
+                                                  "type": "typography",
                                                   "content": "CourseName"
                                                 },
                                                 {
@@ -3361,7 +3344,8 @@
                                                 }
                                               ]
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
                                           "value": "@entity.lessonsCompleted",
@@ -3369,42 +3353,41 @@
                                           "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "TotalLessons",
-                                          "value": "@entity.totalLessons"
+                                          "value": "@entity.totalLessons",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.percentComplete",
                                           "type": "stat-display",
-                                          "label": "PercentComplete"
+                                          "label": "PercentComplete",
+                                          "value": "@entity.percentComplete"
                                         },
                                         {
+                                          "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
-                                              "gap": "sm",
                                               "direction": "vertical",
+                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "variant": "caption",
                                                   "content": "LastActivity",
-                                                  "type": "typography"
+                                                  "type": "typography",
+                                                  "variant": "caption"
                                                 },
                                                 {
-                                                  "type": "typography",
+                                                  "content": "@entity.lastActivity",
                                                   "variant": "h3",
-                                                  "content": "@entity.lastActivity"
+                                                  "type": "typography"
                                                 }
-                                              ]
+                                              ],
+                                              "type": "stack"
                                             }
-                                          ],
-                                          "type": "card"
+                                          ]
                                         }
                                       ],
-                                      "type": "simple-grid"
+                                      "cols": 3.0
                                     }
-                                  ],
-                                  "padding": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -3412,36 +3395,35 @@
                                 {
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
                                           "content": "Chart View",
                                           "type": "typography",
                                           "variant": "caption"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "content": "Graph View",
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "type": "typography"
+                                          "content": "Graph View"
                                         }
                                       ]
                                     }
                                   ],
+                                  "cols": 2.0,
                                   "type": "grid",
-                                  "gap": "md",
-                                  "cols": 2.0
+                                  "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "value": 12.0,
-                                      "date": "Jan"
+                                      "date": "Jan",
+                                      "value": 12.0
                                     },
                                     {
                                       "value": 19.0,
@@ -3452,8 +3434,8 @@
                                       "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "date": "May",
@@ -3463,55 +3445,73 @@
                                       "date": "Jun",
                                       "value": 30.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
                                       "color": "primary"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
-                                  "width": 400.0,
-                                  "height": 200.0,
                                   "nodes": [
                                     {
-                                      "id": "a",
-                                      "label": "Start"
+                                      "label": "Start",
+                                      "id": "a"
                                     },
                                     {
                                       "id": "b",
                                       "label": "Process"
                                     },
                                     {
-                                      "label": "End",
-                                      "id": "c"
+                                      "id": "c",
+                                      "label": "End"
                                     }
                                   ],
-                                  "type": "graph-view",
                                   "edges": [
                                     {
-                                      "target": "b",
-                                      "source": "a"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
                                       "target": "c",
                                       "source": "b"
                                     }
-                                  ]
+                                  ],
+                                  "type": "graph-view",
+                                  "width": 400.0,
+                                  "height": 200.0
                                 }
                               ],
-                              "direction": "vertical"
+                              "gap": "lg"
                             }
-                          ],
-                          "type": "scaled-diagram"
+                          ]
+                        }
+                      ],
+                      "appName": "LMS",
+                      "navItems": [
+                        {
+                          "href": "/courses",
+                          "icon": "book-open",
+                          "label": "Courses"
+                        },
+                        {
+                          "label": "Enroll",
+                          "href": "/enroll",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Progress",
+                          "href": "/progress"
                         }
                       ]
                     }
@@ -3537,53 +3537,57 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "LMS",
                       "children": [
                         {
                           "children": [
                             {
+                              "gap": "lg",
+                              "direction": "vertical",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
-                                    {
-                                      "href": "/",
-                                      "label": "Home"
+                                    {
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Progress"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
-                                  "justify": "between",
                                   "type": "stack",
+                                  "gap": "md",
                                   "direction": "horizontal",
+                                  "justify": "between",
                                   "children": [
                                     {
-                                      "type": "stack",
+                                      "gap": "md",
+                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "type": "icon",
                                           "name": "trending-up"
                                         },
                                         {
+                                          "type": "typography",
                                           "content": "Progress",
-                                          "variant": "h2",
-                                          "type": "typography"
+                                          "variant": "h2"
                                         }
                                       ],
-                                      "gap": "md",
-                                      "direction": "horizontal"
+                                      "type": "stack"
                                     },
                                     {
-                                      "type": "button",
+                                      "action": "REFRESH",
                                       "variant": "secondary",
                                       "label": "Refresh",
-                                      "icon": "refresh-cw",
-                                      "action": "REFRESH"
+                                      "type": "button",
+                                      "icon": "refresh-cw"
                                     }
-                                  ],
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -3593,17 +3597,17 @@
                                   "type": "box",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "cols": 3.0,
                                       "children": [
                                         {
                                           "type": "card",
                                           "children": [
                                             {
+                                              "direction": "vertical",
+                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "content": "CourseName",
+                                                  "type": "typography",
                                                   "variant": "caption"
                                                 },
                                                 {
@@ -3612,26 +3616,24 @@
                                                   "content": "@entity.courseName"
                                                 }
                                               ],
-                                              "type": "stack",
-                                              "gap": "sm",
-                                              "direction": "vertical"
+                                              "type": "stack"
                                             }
                                           ]
                                         },
                                         {
+                                          "label": "LessonsCompleted",
                                           "value": "@entity.lessonsCompleted",
-                                          "type": "stat-display",
-                                          "label": "LessonsCompleted"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "label": "TotalLessons",
+                                          "value": "@entity.totalLessons",
                                           "type": "stat-display",
-                                          "value": "@entity.totalLessons"
+                                          "label": "TotalLessons"
                                         },
                                         {
+                                          "type": "stat-display",
                                           "value": "@entity.percentComplete",
-                                          "label": "PercentComplete",
-                                          "type": "stat-display"
+                                          "label": "PercentComplete"
                                         },
                                         {
                                           "type": "card",
@@ -3639,14 +3641,14 @@
                                             {
                                               "children": [
                                                 {
-                                                  "content": "LastActivity",
                                                   "type": "typography",
+                                                  "content": "LastActivity",
                                                   "variant": "caption"
                                                 },
                                                 {
+                                                  "type": "typography",
                                                   "variant": "h3",
-                                                  "content": "@entity.lastActivity",
-                                                  "type": "typography"
+                                                  "content": "@entity.lastActivity"
                                                 }
                                               ],
                                               "gap": "sm",
@@ -3655,7 +3657,9 @@
                                             }
                                           ]
                                         }
-                                      ]
+                                      ],
+                                      "cols": 3.0,
+                                      "type": "simple-grid"
                                     }
                                   ]
                                 },
@@ -3663,17 +3667,17 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "grid",
                                   "cols": 2.0,
                                   "gap": "md",
-                                  "type": "grid",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Chart View",
-                                          "type": "typography"
+                                          "content": "Chart View"
                                         }
                                       ]
                                     },
@@ -3696,8 +3700,8 @@
                                       "value": 12.0
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
                                       "value": 15.0,
@@ -3719,20 +3723,19 @@
                                   "type": "line-chart"
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
-                                  "width": 400.0,
                                   "nodes": [
                                     {
                                       "id": "a",
@@ -3743,11 +3746,10 @@
                                       "label": "Process"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "label": "End",
+                                      "id": "c"
                                     }
                                   ],
-                                  "type": "graph-view",
                                   "edges": [
                                     {
                                       "target": "b",
@@ -3758,23 +3760,22 @@
                                       "source": "b"
                                     }
                                   ],
-                                  "height": 200.0
+                                  "type": "graph-view",
+                                  "height": 200.0,
+                                  "width": 400.0
                                 }
-                              ],
-                              "gap": "lg",
-                              "type": "stack",
-                              "direction": "vertical"
+                              ]
                             }
                           ],
                           "type": "scaled-diagram"
                         }
                       ],
-                      "appName": "LMS",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "label": "Courses",
+                          "icon": "book-open",
                           "href": "/courses",
-                          "icon": "book-open"
+                          "label": "Courses"
                         },
                         {
                           "href": "/enroll",
@@ -3782,12 +3783,11 @@
                           "icon": "layout-list"
                         },
                         {
+                          "icon": "layout-list",
                           "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
+                          "href": "/progress"
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -3818,25 +3818,22 @@
                           "icon": "book-open"
                         },
                         {
-                          "label": "Enroll",
                           "icon": "layout-list",
+                          "label": "Enroll",
                           "href": "/enroll"
                         },
                         {
                           "label": "Progress",
-                          "icon": "layout-list",
-                          "href": "/progress"
+                          "href": "/progress",
+                          "icon": "layout-list"
                         }
                       ],
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "href": "/",
@@ -3845,43 +3842,45 @@
                                     {
                                       "label": "Progress"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "between",
                                   "children": [
                                     {
                                       "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
-                                          "name": "trending-up",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "trending-up"
                                         },
                                         {
+                                          "variant": "h2",
                                           "content": "Progress",
-                                          "type": "typography",
-                                          "variant": "h2"
+                                          "type": "typography"
                                         }
                                       ],
+                                      "gap": "md",
                                       "type": "stack"
                                     },
                                     {
-                                      "variant": "secondary",
                                       "label": "Refresh",
                                       "action": "REFRESH",
-                                      "icon": "refresh-cw",
-                                      "type": "button"
+                                      "type": "button",
+                                      "variant": "secondary",
+                                      "icon": "refresh-cw"
                                     }
-                                  ]
+                                  ],
+                                  "justify": "between",
+                                  "type": "stack",
+                                  "gap": "md",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "box",
                                   "padding": "md",
                                   "children": [
                                     {
@@ -3892,102 +3891,101 @@
                                           "type": "card",
                                           "children": [
                                             {
+                                              "direction": "vertical",
                                               "children": [
                                                 {
-                                                  "content": "CourseName",
                                                   "type": "typography",
-                                                  "variant": "caption"
+                                                  "variant": "caption",
+                                                  "content": "CourseName"
                                                 },
                                                 {
-                                                  "type": "typography",
                                                   "content": "@entity.courseName",
+                                                  "type": "typography",
                                                   "variant": "h3"
                                                 }
                                               ],
-                                              "type": "stack",
                                               "gap": "sm",
-                                              "direction": "vertical"
+                                              "type": "stack"
                                             }
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "value": "@entity.lessonsCompleted",
-                                          "label": "LessonsCompleted"
+                                          "label": "LessonsCompleted",
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "label": "TotalLessons",
                                           "value": "@entity.totalLessons",
-                                          "type": "stat-display",
-                                          "label": "TotalLessons"
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "label": "PercentComplete",
                                           "value": "@entity.percentComplete",
-                                          "type": "stat-display",
-                                          "label": "PercentComplete"
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "type": "card",
                                           "children": [
                                             {
                                               "direction": "vertical",
+                                              "type": "stack",
+                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "variant": "caption",
+                                                  "type": "typography",
                                                   "content": "LastActivity"
                                                 },
                                                 {
                                                   "content": "@entity.lastActivity",
-                                                  "variant": "h3",
-                                                  "type": "typography"
+                                                  "type": "typography",
+                                                  "variant": "h3"
                                                 }
-                                              ],
-                                              "type": "stack",
-                                              "gap": "sm"
+                                              ]
                                             }
-                                          ],
-                                          "type": "card"
+                                          ]
                                         }
                                       ]
                                     }
-                                  ],
-                                  "type": "box"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "cols": 2.0,
+                                  "gap": "md",
+                                  "type": "grid",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
                                           "variant": "caption",
-                                          "content": "Chart View",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "content": "Chart View"
                                         }
                                       ]
                                     },
                                     {
                                       "children": [
                                         {
-                                          "variant": "caption",
+                                          "type": "typography",
                                           "content": "Graph View",
-                                          "type": "typography"
+                                          "variant": "caption"
                                         }
                                       ],
                                       "type": "card"
                                     }
                                   ],
-                                  "type": "grid",
-                                  "gap": "md"
+                                  "cols": 2.0
                                 },
                                 {
                                   "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
                                       "date": "Feb",
@@ -4012,52 +4010,54 @@
                                   ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
                                       "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "nodes": [
-                                    {
-                                      "id": "a",
-                                      "label": "Start"
-                                    },
+                                  "edges": [
                                     {
-                                      "id": "b",
-                                      "label": "Process"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "source": "b",
+                                      "target": "c"
                                     }
                                   ],
                                   "height": 200.0,
-                                  "edges": [
+                                  "nodes": [
                                     {
-                                      "source": "a",
-                                      "target": "b"
+                                      "label": "Start",
+                                      "id": "a"
                                     },
                                     {
-                                      "target": "c",
-                                      "source": "b"
+                                      "label": "Process",
+                                      "id": "b"
+                                    },
+                                    {
+                                      "label": "End",
+                                      "id": "c"
                                     }
                                   ],
                                   "type": "graph-view",
                                   "width": 400.0
                                 }
                               ],
+                              "type": "stack",
                               "gap": "lg",
                               "direction": "vertical"
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
                       ],
                       "appName": "LMS",
@@ -4090,16 +4090,14 @@
                         {
                           "children": [
                             {
-                              "type": "stack",
-                              "gap": "lg",
                               "direction": "vertical",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Progress"
@@ -4107,33 +4105,33 @@
                                   ]
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "justify": "between",
                                   "gap": "md",
+                                  "justify": "between",
+                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "type": "stack",
-                                      "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
-                                          "name": "trending-up",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "trending-up"
                                         },
                                         {
                                           "type": "typography",
-                                          "content": "Progress",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "content": "Progress"
                                         }
-                                      ]
+                                      ],
+                                      "direction": "horizontal",
+                                      "gap": "md"
                                     },
                                     {
-                                      "label": "Refresh",
                                       "icon": "refresh-cw",
-                                      "type": "button",
+                                      "variant": "secondary",
                                       "action": "REFRESH",
-                                      "variant": "secondary"
+                                      "label": "Refresh",
+                                      "type": "button"
                                     }
                                   ]
                                 },
@@ -4141,66 +4139,65 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
                                   "children": [
                                     {
                                       "cols": 3.0,
                                       "children": [
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
                                               "direction": "vertical",
                                               "gap": "sm",
                                               "children": [
                                                 {
-                                                  "content": "CourseName",
                                                   "type": "typography",
-                                                  "variant": "caption"
+                                                  "variant": "caption",
+                                                  "content": "CourseName"
                                                 },
                                                 {
-                                                  "variant": "h3",
                                                   "content": "@entity.courseName",
+                                                  "variant": "h3",
                                                   "type": "typography"
                                                 }
-                                              ]
+                                              ],
+                                              "type": "stack"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "label": "LessonsCompleted",
-                                          "value": "@entity.lessonsCompleted"
+                                          "value": "@entity.lessonsCompleted",
+                                          "label": "LessonsCompleted"
                                         },
                                         {
+                                          "value": "@entity.totalLessons",
                                           "type": "stat-display",
-                                          "label": "TotalLessons",
-                                          "value": "@entity.totalLessons"
+                                          "label": "TotalLessons"
                                         },
                                         {
-                                          "value": "@entity.percentComplete",
                                           "type": "stat-display",
-                                          "label": "PercentComplete"
+                                          "label": "PercentComplete",
+                                          "value": "@entity.percentComplete"
                                         },
                                         {
                                           "children": [
                                             {
-                                              "type": "stack",
                                               "direction": "vertical",
-                                              "gap": "sm",
+                                              "type": "stack",
                                               "children": [
                                                 {
-                                                  "content": "LastActivity",
                                                   "variant": "caption",
+                                                  "content": "LastActivity",
                                                   "type": "typography"
                                                 },
                                                 {
+                                                  "variant": "h3",
                                                   "content": "@entity.lastActivity",
-                                                  "type": "typography",
-                                                  "variant": "h3"
+                                                  "type": "typography"
                                                 }
-                                              ]
+                                              ],
+                                              "gap": "sm"
                                             }
                                           ],
                                           "type": "card"
@@ -4209,23 +4206,24 @@
                                       "type": "simple-grid"
                                     }
                                   ],
+                                  "type": "box",
                                   "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
+                                  "cols": 2.0,
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
                                           "content": "Chart View",
                                           "variant": "caption"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
                                       "type": "card",
@@ -4238,23 +4236,22 @@
                                       ]
                                     }
                                   ],
-                                  "cols": 2.0,
+                                  "type": "grid",
                                   "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
                                       "value": 12.0
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
@@ -4268,13 +4265,14 @@
                                       "value": 30.0,
                                       "date": "Jun"
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
                                       "label": "Previous",
@@ -4284,6 +4282,17 @@
                                   "type": "chart-legend"
                                 },
                                 {
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "target": "c",
+                                      "source": "b"
+                                    }
+                                  ],
+                                  "type": "graph-view",
                                   "width": 400.0,
                                   "height": 200.0,
                                   "nodes": [
@@ -4292,33 +4301,23 @@
                                       "label": "Start"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
-                                    },
-                                    {
-                                      "label": "End",
-                                      "id": "c"
-                                    }
-                                  ],
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
-                                      "target": "c",
-                                      "source": "b"
+                                      "id": "c",
+                                      "label": "End"
                                     }
-                                  ],
-                                  "type": "graph-view"
+                                  ]
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "gap": "lg"
                             }
                           ],
                           "type": "scaled-diagram"
                         }
                       ],
-                      "appName": "LMS",
                       "navItems": [
                         {
                           "label": "Courses",
@@ -4327,15 +4326,16 @@
                         },
                         {
                           "label": "Enroll",
-                          "icon": "layout-list",
-                          "href": "/enroll"
+                          "href": "/enroll",
+                          "icon": "layout-list"
                         },
                         {
                           "label": "Progress",
-                          "icon": "layout-list",
-                          "href": "/progress"
+                          "href": "/progress",
+                          "icon": "layout-list"
                         }
-                      ]
+                      ],
+                      "appName": "LMS"
                     }
                   ]
                 ]
@@ -4350,8 +4350,8 @@
                     "Progress",
                     {
                       "emit": {
-                        "failure": "ProgressLoadFailed",
-                        "success": "ProgressLoaded"
+                        "success": "ProgressLoaded",
+                        "failure": "ProgressLoadFailed"
                       }
                     }
                   ],
@@ -4359,8 +4359,6 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "LMS",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "href": "/courses",
@@ -4369,8 +4367,8 @@
                         },
                         {
                           "label": "Enroll",
-                          "icon": "layout-list",
-                          "href": "/enroll"
+                          "href": "/enroll",
+                          "icon": "layout-list"
                         },
                         {
                           "label": "Progress",
@@ -4383,16 +4381,13 @@
                           "type": "scaled-diagram",
                           "children": [
                             {
-                              "direction": "vertical",
-                              "type": "stack",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Progress"
@@ -4402,12 +4397,11 @@
                                 {
                                   "type": "stack",
                                   "gap": "md",
-                                  "direction": "horizontal",
                                   "justify": "between",
                                   "children": [
                                     {
                                       "gap": "md",
-                                      "type": "stack",
+                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "type": "icon",
@@ -4415,38 +4409,37 @@
                                         },
                                         {
                                           "content": "Progress",
-                                          "type": "typography",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "type": "typography"
                                         }
                                       ],
-                                      "direction": "horizontal"
+                                      "type": "stack"
                                     },
                                     {
+                                      "variant": "secondary",
                                       "icon": "refresh-cw",
+                                      "label": "Refresh",
                                       "type": "button",
-                                      "action": "REFRESH",
-                                      "variant": "secondary",
-                                      "label": "Refresh"
+                                      "action": "REFRESH"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "padding": "md",
+                                  "type": "box",
                                   "children": [
                                     {
-                                      "cols": 3.0,
                                       "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
                                               "type": "stack",
-                                              "direction": "vertical",
-                                              "gap": "sm",
                                               "children": [
                                                 {
                                                   "variant": "caption",
@@ -4455,44 +4448,47 @@
                                                 },
                                                 {
                                                   "type": "typography",
-                                                  "variant": "h3",
-                                                  "content": "@entity.courseName"
+                                                  "content": "@entity.courseName",
+                                                  "variant": "h3"
                                                 }
-                                              ]
+                                              ],
+                                              "direction": "vertical",
+                                              "gap": "sm"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "value": "@entity.lessonsCompleted",
-                                          "label": "LessonsCompleted"
+                                          "label": "LessonsCompleted",
+                                          "value": "@entity.lessonsCompleted"
                                         },
                                         {
-                                          "value": "@entity.totalLessons",
                                           "type": "stat-display",
+                                          "value": "@entity.totalLessons",
                                           "label": "TotalLessons"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "value": "@entity.percentComplete",
-                                          "label": "PercentComplete"
+                                          "label": "PercentComplete",
+                                          "value": "@entity.percentComplete"
                                         },
                                         {
                                           "children": [
                                             {
-                                              "direction": "vertical",
-                                              "type": "stack",
                                               "gap": "sm",
+                                              "type": "stack",
+                                              "direction": "vertical",
                                               "children": [
                                                 {
+                                                  "variant": "caption",
                                                   "content": "LastActivity",
-                                                  "type": "typography",
-                                                  "variant": "caption"
+                                                  "type": "typography"
                                                 },
                                                 {
+                                                  "content": "@entity.lastActivity",
                                                   "variant": "h3",
-                                                  "type": "typography",
-                                                  "content": "@entity.lastActivity"
+                                                  "type": "typography"
                                                 }
                                               ]
                                             }
@@ -4501,44 +4497,44 @@
                                         }
                                       ]
                                     }
-                                  ],
-                                  "type": "box"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "grid",
+                                  "cols": 2.0,
+                                  "gap": "md",
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
+                                          "variant": "caption",
                                           "content": "Chart View",
-                                          "variant": "caption"
+                                          "type": "typography"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "content": "Graph View",
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "type": "typography"
+                                          "content": "Graph View"
                                         }
                                       ]
                                     }
-                                  ],
-                                  "gap": "md",
-                                  "cols": 2.0
+                                  ]
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
                                       "date": "Feb",
@@ -4549,46 +4545,47 @@
                                       "value": 15.0
                                     },
                                     {
-                                      "value": 25.0,
-                                      "date": "Apr"
+                                      "date": "Apr",
+                                      "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
                                       "value": 30.0
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
                                       "color": "primary"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
+                                  "type": "graph-view",
+                                  "width": 400.0,
                                   "nodes": [
                                     {
-                                      "label": "Start",
-                                      "id": "a"
+                                      "id": "a",
+                                      "label": "Start"
                                     },
                                     {
                                       "label": "Process",
                                       "id": "b"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "label": "End",
+                                      "id": "c"
                                     }
                                   ],
                                   "edges": [
@@ -4597,19 +4594,22 @@
                                       "source": "a"
                                     },
                                     {
-                                      "source": "b",
-                                      "target": "c"
+                                      "target": "c",
+                                      "source": "b"
                                     }
                                   ],
-                                  "width": 400.0,
-                                  "type": "graph-view",
                                   "height": 200.0
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "appName": "LMS",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -4632,4 +4632,4 @@
       ]
     }
   ]
-}
+}