@almadar/std 6.5.2 → 7.2.0

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

@@ -1,7 +1,7 @@
 {
   "name": "std-lms",
   "version": "1.0.0",
-  "description": "Learning management system organism. Composes molecules via compose: - stdList(Course): CRUD list of courses - stdWizard(Enrollment): multi-step enrollment wizard - stdDisplay(Progress): read-only progress dashboard",
+  "description": "std-lms as a Function",
   "orbitals": [
     {
       "name": "CourseOrbital",
@@ -54,23 +54,91 @@
       "traits": [
         {
           "name": "CourseBrowse",
-          "linkedEntity": "Course",
           "category": "interaction",
+          "linkedEntity": "Course",
+          "emits": [
+            {
+              "event": "ENROLL",
+              "scope": "external",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "CourseLoaded",
+              "description": "Fired when Course finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "title",
+                  "type": "string"
+                },
+                {
+                  "name": "description",
+                  "type": "string"
+                },
+                {
+                  "name": "instructor",
+                  "type": "string"
+                },
+                {
+                  "name": "duration",
+                  "type": "string"
+                },
+                {
+                  "name": "level",
+                  "type": "string"
+                },
+                {
+                  "name": "pendingId",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "CourseLoadFailed",
+              "description": "Fired when Course fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
+            }
+          ],
           "listens": [
             {
               "event": "COURSE_CREATED",
               "triggers": "INIT",
-              "scope": "external"
+              "source": {
+                "kind": "trait",
+                "trait": "CourseCreate"
+              }
             },
             {
               "event": "COURSE_UPDATED",
               "triggers": "INIT",
-              "scope": "external"
+              "source": {
+                "kind": "trait",
+                "trait": "CourseEdit"
+              }
             },
             {
               "event": "COURSE_DELETED",
               "triggers": "INIT",
-              "scope": "external"
+              "source": {
+                "kind": "trait",
+                "trait": "CourseDelete"
+              }
             }
           ],
           "stateMachine": {
@@ -86,12 +154,26 @@
                 "name": "Initialize"
               },
               {
-                "key": "CREATE",
-                "name": "CREATE"
+                "key": "ENROLL",
+                "name": "Enroll"
+              },
+              {
+                "key": "CourseLoaded",
+                "name": "Course loaded"
+              },
+              {
+                "key": "CourseLoadFailed",
+                "name": "Course load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               },
               {
                 "key": "VIEW",
-                "name": "VIEW",
+                "name": "View",
                 "payload": [
                   {
                     "name": "id",
@@ -106,7 +188,7 @@
               },
               {
                 "key": "EDIT",
-                "name": "EDIT",
+                "name": "Edit",
                 "payload": [
                   {
                     "name": "id",
@@ -121,7 +203,7 @@
               },
               {
                 "key": "DELETE",
-                "name": "DELETE",
+                "name": "Delete",
                 "payload": [
                   {
                     "name": "id",
@@ -149,107 +231,62 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
                           "gap": "lg",
-                          "className": "max-w-5xl mx-auto w-full",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "stack",
-                              "direction": "horizontal",
-                              "gap": "md",
                               "justify": "space-between",
                               "align": "center",
+                              "gap": "md",
                               "children": [
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
                                   "align": "center",
                                   "children": [
                                     {
+                                      "size": "lg",
                                       "type": "icon",
-                                      "name": "book-open",
-                                      "size": "lg"
+                                      "name": "book-open"
                                     },
                                     {
                                       "type": "typography",
                                       "content": "Courses",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "sm",
                                   "children": [
                                     {
+                                      "icon": "plus",
+                                      "variant": "primary",
                                       "type": "button",
-                                      "label": "Add Course",
                                       "event": "CREATE",
-                                      "variant": "primary",
-                                      "icon": "plus"
+                                      "label": "Add Course"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal"
                                 }
-                              ]
+                              ],
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "data-grid",
                               "entity": "Course",
-                              "emptyIcon": "inbox",
-                              "emptyTitle": "No courses yet",
-                              "emptyDescription": "Create a course to start teaching.",
-                              "itemActions": [
-                                {
-                                  "label": "View",
-                                  "event": "VIEW",
-                                  "variant": "ghost",
-                                  "size": "sm"
-                                },
-                                {
-                                  "label": "Edit",
-                                  "event": "EDIT",
-                                  "variant": "ghost",
-                                  "size": "sm"
-                                },
-                                {
-                                  "label": "Delete",
-                                  "event": "DELETE",
-                                  "variant": "danger",
-                                  "size": "sm"
-                                }
-                              ],
                               "columns": [
                                 {
-                                  "name": "title",
                                   "variant": "h3",
-                                  "icon": "book-open"
+                                  "icon": "book-open",
+                                  "name": "title"
                                 },
                                 {
                                   "name": "level",
@@ -268,10 +305,55 @@
                                   "variant": "caption"
                                 }
                               ],
-                              "cols": 2,
-                              "gap": "md"
+                              "emptyIcon": "inbox",
+                              "emptyDescription": "Create a course to start teaching.",
+                              "emptyTitle": "No courses yet",
+                              "type": "data-grid",
+                              "cols": 2.0,
+                              "gap": "md",
+                              "itemActions": [
+                                {
+                                  "variant": "ghost",
+                                  "event": "VIEW",
+                                  "label": "View",
+                                  "size": "sm"
+                                },
+                                {
+                                  "event": "EDIT",
+                                  "size": "sm",
+                                  "variant": "ghost",
+                                  "label": "Edit"
+                                },
+                                {
+                                  "event": "DELETE",
+                                  "variant": "danger",
+                                  "size": "sm",
+                                  "label": "Delete"
+                                }
+                              ]
                             }
-                          ]
+                          ],
+                          "direction": "vertical",
+                          "className": "max-w-5xl mx-auto w-full"
+                        }
+                      ],
+                      "appName": "LMS",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Courses",
+                          "href": "/courses",
+                          "icon": "book-open"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/enroll",
+                          "label": "Enroll"
+                        },
+                        {
+                          "label": "Progress",
+                          "href": "/progress",
+                          "icon": "layout-list"
                         }
                       ]
                     }
@@ -280,33 +362,69 @@
               }
             ]
           },
+          "scope": "collection"
+        },
+        {
+          "name": "CourseCreate",
+          "category": "interaction",
+          "linkedEntity": "Course",
           "emits": [
             {
-              "event": "ENROLL",
-              "description": "Enroll in a course",
+              "event": "COURSE_CREATED",
+              "scope": "external",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "CourseLoaded",
+              "description": "Fired when Course finishes loading",
+              "scope": "internal",
               "payload": [
                 {
                   "name": "id",
                   "type": "string",
                   "required": true
+                },
+                {
+                  "name": "title",
+                  "type": "string"
+                },
+                {
+                  "name": "description",
+                  "type": "string"
+                },
+                {
+                  "name": "instructor",
+                  "type": "string"
+                },
+                {
+                  "name": "duration",
+                  "type": "string"
+                },
+                {
+                  "name": "level",
+                  "type": "string"
+                },
+                {
+                  "name": "pendingId",
+                  "type": "string"
                 }
-              ],
-              "scope": "external"
-            }
-          ]
-        },
-        {
-          "name": "CourseCreate",
-          "linkedEntity": "Course",
-          "category": "interaction",
-          "emits": [
-            {
-              "event": "SAVE",
-              "scope": "internal"
+              ]
             },
             {
-              "event": "COURSE_CREATED",
-              "scope": "external"
+              "event": "CourseLoadFailed",
+              "description": "Fired when Course fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
             }
           ],
           "stateMachine": {
@@ -326,7 +444,7 @@
               },
               {
                 "key": "CREATE",
-                "name": "Open"
+                "name": "Create"
               },
               {
                 "key": "CLOSE",
@@ -342,6 +460,24 @@
                     "required": true
                   }
                 ]
+              },
+              {
+                "key": "COURSE_CREATED",
+                "name": "Course Created"
+              },
+              {
+                "key": "CourseLoaded",
+                "name": "Course loaded"
+              },
+              {
+                "key": "CourseLoadFailed",
+                "name": "Course load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -363,15 +499,20 @@
                 "effects": [
                   [
                     "fetch",
-                    "Course"
+                    "Course",
+                    {
+                      "emit": {
+                        "success": "CourseLoaded",
+                        "failure": "CourseLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
-                      "direction": "vertical",
                       "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
                           "type": "stack",
@@ -384,9 +525,9 @@
                               "size": "md"
                             },
                             {
-                              "type": "typography",
                               "content": "New Course",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             }
                           ]
                         },
@@ -396,7 +537,6 @@
                         {
                           "type": "form-section",
                           "entity": "Course",
-                          "mode": "create",
                           "submitEvent": "SAVE",
                           "cancelEvent": "CLOSE",
                           "fields": [
@@ -405,9 +545,11 @@
                             "instructor",
                             "duration",
                             "level"
-                          ]
+                          ],
+                          "mode": "create"
                         }
-                      ]
+                      ],
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -422,6 +564,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "notify",
                     "Cancelled",
@@ -445,6 +594,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "emit",
                     "COURSE_CREATED"
@@ -452,20 +608,70 @@
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         },
         {
           "name": "CourseEdit",
-          "linkedEntity": "Course",
           "category": "interaction",
+          "linkedEntity": "Course",
           "emits": [
             {
-              "event": "SAVE",
-              "scope": "internal"
+              "event": "COURSE_UPDATED",
+              "scope": "external",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string"
+                }
+              ]
             },
             {
-              "event": "COURSE_UPDATED",
-              "scope": "external"
+              "event": "CourseLoaded",
+              "description": "Fired when Course finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "title",
+                  "type": "string"
+                },
+                {
+                  "name": "description",
+                  "type": "string"
+                },
+                {
+                  "name": "instructor",
+                  "type": "string"
+                },
+                {
+                  "name": "duration",
+                  "type": "string"
+                },
+                {
+                  "name": "level",
+                  "type": "string"
+                },
+                {
+                  "name": "pendingId",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "CourseLoadFailed",
+              "description": "Fired when Course fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
             }
           ],
           "stateMachine": {
@@ -485,7 +691,7 @@
               },
               {
                 "key": "EDIT",
-                "name": "Open",
+                "name": "Edit",
                 "payload": [
                   {
                     "name": "id",
@@ -508,6 +714,24 @@
                     "required": true
                   }
                 ]
+              },
+              {
+                "key": "COURSE_UPDATED",
+                "name": "Course Updated"
+              },
+              {
+                "key": "CourseLoaded",
+                "name": "Course loaded"
+              },
+              {
+                "key": "CourseLoadFailed",
+                "name": "Course load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -531,7 +755,11 @@
                     "fetch",
                     "Course",
                     {
-                      "id": "@payload.id"
+                      "id": "@payload.id",
+                      "emit": {
+                        "success": "CourseLoaded",
+                        "failure": "CourseLoadFailed"
+                      }
                     }
                   ],
                   [
@@ -539,35 +767,32 @@
                     "modal",
                     {
                       "type": "stack",
-                      "direction": "vertical",
                       "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
                               "name": "edit",
-                              "size": "md"
+                              "size": "md",
+                              "type": "icon"
                             },
                             {
                               "type": "typography",
                               "content": "Edit Course",
                               "variant": "h3"
                             }
-                          ]
-                        },
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "sm"
+                        },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "form-section",
-                          "entity": "Course",
-                          "mode": "edit",
-                          "submitEvent": "SAVE",
                           "cancelEvent": "CLOSE",
+                          "type": "form-section",
                           "fields": [
                             "title",
                             "description",
@@ -575,7 +800,10 @@
                             "duration",
                             "level"
                           ],
-                          "entityId": "@entity.id"
+                          "entityId": "@entity.id",
+                          "submitEvent": "SAVE",
+                          "entity": "Course",
+                          "mode": "edit"
                         }
                       ]
                     }
@@ -592,6 +820,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "notify",
                     "Cancelled",
@@ -615,6 +850,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "emit",
                     "COURSE_UPDATED"
@@ -622,16 +864,60 @@
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         },
         {
           "name": "CourseView",
-          "linkedEntity": "Course",
           "category": "interaction",
+          "linkedEntity": "Course",
           "emits": [
             {
-              "event": "SAVE",
-              "scope": "internal"
+              "event": "CourseLoaded",
+              "description": "Fired when Course finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "title",
+                  "type": "string"
+                },
+                {
+                  "name": "description",
+                  "type": "string"
+                },
+                {
+                  "name": "instructor",
+                  "type": "string"
+                },
+                {
+                  "name": "duration",
+                  "type": "string"
+                },
+                {
+                  "name": "level",
+                  "type": "string"
+                },
+                {
+                  "name": "pendingId",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "CourseLoadFailed",
+              "description": "Fired when Course fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
             }
           ],
           "stateMachine": {
@@ -651,7 +937,7 @@
               },
               {
                 "key": "VIEW",
-                "name": "Open",
+                "name": "View",
                 "payload": [
                   {
                     "name": "id",
@@ -674,6 +960,20 @@
                     "required": true
                   }
                 ]
+              },
+              {
+                "key": "CourseLoaded",
+                "name": "Course loaded"
+              },
+              {
+                "key": "CourseLoadFailed",
+                "name": "Course load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -697,22 +997,26 @@
                     "fetch",
                     "Course",
                     {
-                      "id": "@payload.id"
+                      "id": "@payload.id",
+                      "emit": {
+                        "success": "CourseLoaded",
+                        "failure": "CourseLoadFailed"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
-                      "direction": "vertical",
                       "gap": "md",
+                      "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "sm",
                           "align": "center",
+                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "icon",
@@ -720,8 +1024,8 @@
                               "size": "md"
                             },
                             {
-                              "type": "typography",
                               "variant": "h3",
+                              "type": "typography",
                               "content": "@entity.title"
                             }
                           ]
@@ -731,8 +1035,6 @@
                         },
                         {
                           "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
@@ -740,103 +1042,105 @@
                               "content": "Title"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.title"
+                              "content": "@entity.title",
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
-                          "type": "stack",
                           "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
+                              "content": "Description",
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "Description"
+                              "variant": "caption"
                             },
                             {
-                              "type": "typography",
+                              "content": "@entity.description",
                               "variant": "body",
-                              "content": "@entity.description"
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
                           "type": "stack",
-                          "direction": "horizontal",
                           "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Instructor"
+                              "content": "Instructor",
+                              "type": "typography"
                             },
                             {
+                              "content": "@entity.instructor",
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.instructor"
+                              "variant": "body"
                             }
                           ]
                         },
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Duration"
+                              "content": "Duration",
+                              "type": "typography"
                             },
                             {
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.duration"
+                              "content": "@entity.duration",
+                              "variant": "body"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal"
                         },
                         {
                           "type": "stack",
                           "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Level"
+                              "content": "Level",
+                              "type": "typography"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
+                              "type": "typography",
                               "content": "@entity.level"
                             }
-                          ]
+                          ],
+                          "gap": "md"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "type": "stack",
-                          "direction": "horizontal",
                           "gap": "sm",
-                          "justify": "end",
                           "children": [
                             {
                               "type": "button",
+                              "icon": "edit",
                               "label": "Edit",
-                              "event": "EDIT",
                               "variant": "primary",
-                              "icon": "edit"
+                              "event": "EDIT"
                             },
                             {
-                              "type": "button",
+                              "variant": "ghost",
                               "label": "Close",
                               "event": "CLOSE",
-                              "variant": "ghost"
+                              "type": "button"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "justify": "end"
                         }
                       ]
                     }
@@ -853,6 +1157,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "notify",
                     "Cancelled",
@@ -869,24 +1180,81 @@
                     "render-ui",
                     "modal",
                     null
+                  ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
                   ]
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         },
         {
           "name": "CourseDelete",
-          "linkedEntity": "Course",
           "category": "interaction",
+          "linkedEntity": "Course",
           "emits": [
             {
-              "event": "CONFIRM_DELETE",
-              "scope": "internal"
+              "event": "COURSE_DELETED",
+              "scope": "external",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string"
+                }
+              ]
             },
             {
-              "event": "COURSE_DELETED",
-              "scope": "external"
+              "event": "CourseLoaded",
+              "description": "Fired when Course finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "title",
+                  "type": "string"
+                },
+                {
+                  "name": "description",
+                  "type": "string"
+                },
+                {
+                  "name": "instructor",
+                  "type": "string"
+                },
+                {
+                  "name": "duration",
+                  "type": "string"
+                },
+                {
+                  "name": "level",
+                  "type": "string"
+                },
+                {
+                  "name": "pendingId",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "CourseLoadFailed",
+              "description": "Fired when Course fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
             }
           ],
           "stateMachine": {
@@ -906,7 +1274,7 @@
               },
               {
                 "key": "DELETE",
-                "name": "Request Confirmation",
+                "name": "Delete",
                 "payload": [
                   {
                     "name": "id",
@@ -917,7 +1285,7 @@
               },
               {
                 "key": "CONFIRM_DELETE",
-                "name": "Confirm"
+                "name": "Confirm Delete"
               },
               {
                 "key": "CANCEL",
@@ -926,6 +1294,24 @@
               {
                 "key": "CLOSE",
                 "name": "Close"
+              },
+              {
+                "key": "COURSE_DELETED",
+                "name": "Course Deleted"
+              },
+              {
+                "key": "CourseLoaded",
+                "name": "Course loaded"
+              },
+              {
+                "key": "CourseLoadFailed",
+                "name": "Course load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -954,21 +1340,19 @@
                     "fetch",
                     "Course",
                     {
-                      "id": "@payload.id"
+                      "id": "@payload.id",
+                      "emit": {
+                        "failure": "CourseLoadFailed",
+                        "success": "CourseLoaded"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "sm",
                           "align": "center",
                           "children": [
                             {
@@ -981,38 +1365,44 @@
                               "content": "Delete Course",
                               "variant": "h3"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "message": "This action cannot be undone.",
                           "type": "alert",
-                          "variant": "danger",
-                          "message": "This action cannot be undone."
+                          "variant": "danger"
                         },
                         {
-                          "type": "stack",
                           "direction": "horizontal",
-                          "gap": "sm",
-                          "justify": "end",
                           "children": [
                             {
+                              "variant": "ghost",
                               "type": "button",
-                              "label": "Cancel",
                               "event": "CANCEL",
-                              "variant": "ghost"
+                              "label": "Cancel"
                             },
                             {
-                              "type": "button",
-                              "label": "Delete",
-                              "event": "CONFIRM_DELETE",
                               "variant": "danger",
-                              "icon": "check"
+                              "label": "Delete",
+                              "icon": "check",
+                              "type": "button",
+                              "event": "CONFIRM_DELETE"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "justify": "end",
+                          "type": "stack"
                         }
-                      ]
+                      ],
+                      "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -1033,6 +1423,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "ref",
                     "Course"
@@ -1053,6 +1450,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "ref",
                     "Course"
@@ -1069,6 +1473,13 @@
                     "modal",
                     null
                   ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "type": "box"
+                    }
+                  ],
                   [
                     "ref",
                     "Course"
@@ -1076,14 +1487,14 @@
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         }
       ],
       "pages": [
         {
           "name": "CoursesPage",
           "path": "/courses",
-          "isInitial": true,
           "traits": [
             {
               "ref": "CourseBrowse"
@@ -1117,42 +1528,95 @@
           },
           {
             "name": "studentName",
-            "type": "string",
-            "default": ""
+            "type": "string"
           },
           {
             "name": "email",
-            "type": "string",
-            "default": ""
+            "type": "string"
           },
           {
             "name": "courseId",
-            "type": "string",
-            "default": ""
+            "type": "string"
           },
           {
             "name": "enrolledAt",
-            "type": "date",
-            "default": ""
+            "type": "datetime"
           },
           {
             "name": "status",
-            "type": "string",
-            "default": "pending",
-            "values": [
-              "pending",
-              "active",
-              "completed",
-              "dropped"
-            ]
+            "type": "string"
           }
         ]
       },
       "traits": [
         {
           "name": "EnrollmentWizard",
-          "linkedEntity": "Enrollment",
           "category": "interaction",
+          "linkedEntity": "Enrollment",
+          "emits": [
+            {
+              "event": "COMPLETE_LESSON",
+              "scope": "external",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "EnrollmentLoaded",
+              "description": "Fired when Enrollment finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "studentName",
+                  "type": "string"
+                },
+                {
+                  "name": "email",
+                  "type": "string"
+                },
+                {
+                  "name": "courseId",
+                  "type": "string"
+                },
+                {
+                  "name": "enrolledAt",
+                  "type": "datetime"
+                },
+                {
+                  "name": "status",
+                  "type": "string"
+                }
+              ]
+            },
+            {
+              "event": "EnrollmentLoadFailed",
+              "description": "Fired when Enrollment fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
+            }
+          ],
+          "listens": [
+            {
+              "event": "ENROLL",
+              "triggers": "INIT",
+              "source": {
+                "kind": "any"
+              }
+            }
+          ],
           "stateMachine": {
             "states": [
               {
@@ -1176,73 +1640,70 @@
               },
               {
                 "key": "NEXT",
-                "name": "Next Step",
-                "payload": [
-                  {
-                    "name": "data",
-                    "type": "object",
-                    "required": true
-                  }
-                ]
+                "name": "Next"
               },
               {
                 "key": "PREV",
-                "name": "Previous Step"
+                "name": "Prev"
               },
               {
                 "key": "COMPLETE",
-                "name": "Complete Wizard",
+                "name": "Complete",
                 "payload": [
                   {
                     "name": "data",
-                    "type": "object",
-                    "required": true
+                    "type": "string"
                   }
                 ]
               },
               {
                 "key": "RESTART",
-                "name": "Restart Wizard"
-              }
-            ],
-            "transitions": [
+                "name": "Restart"
+              },
               {
-                "from": "step1",
-                "to": "step1",
-                "event": "INIT",
+                "key": "COMPLETE_LESSON",
+                "name": "Complete Lesson"
+              },
+              {
+                "key": "EnrollmentLoaded",
+                "name": "Enrollment loaded"
+              },
+              {
+                "key": "EnrollmentLoadFailed",
+                "name": "Enrollment load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
+              }
+            ],
+            "transitions": [
+              {
+                "from": "step1",
+                "to": "step1",
+                "event": "INIT",
                 "effects": [
                   [
                     "fetch",
-                    "Enrollment"
+                    "Enrollment",
+                    {
+                      "emit": {
+                        "failure": "EnrollmentLoadFailed",
+                        "success": "EnrollmentLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
-                          "type": "container",
-                          "maxWidth": "lg",
                           "padding": "lg",
+                          "maxWidth": "lg",
+                          "type": "container",
                           "children": [
                             {
                               "type": "stack",
@@ -1250,67 +1711,67 @@
                               "gap": "lg",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "sm",
+                                  "type": "stack",
                                   "align": "center",
                                   "children": [
                                     {
                                       "type": "icon",
-                                      "name": "user-plus",
-                                      "size": "lg"
+                                      "size": "lg",
+                                      "name": "user-plus"
                                     },
                                     {
                                       "type": "typography",
-                                      "content": "Course Enrollment",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "content": "Course Enrollment"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal"
                                 },
                                 {
+                                  "currentIndex": 0.0,
                                   "type": "progress-dots",
-                                  "count": 2,
-                                  "currentIndex": 0
+                                  "count": 2.0
                                 },
                                 {
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "currentStep": 0
+                                  "type": "wizard-progress",
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Student Info",
+                                  "type": "typography",
                                   "variant": "h3"
                                 },
                                 {
-                                  "type": "form-section",
-                                  "entity": "Enrollment",
-                                  "mode": "create",
                                   "submitEvent": "NEXT",
                                   "cancelEvent": "INIT",
                                   "fields": [
                                     "studentName",
                                     "email"
-                                  ]
+                                  ],
+                                  "entity": "Enrollment",
+                                  "type": "form-section",
+                                  "mode": "create"
                                 },
                                 {
-                                  "type": "stack",
                                   "direction": "horizontal",
+                                  "type": "stack",
                                   "gap": "sm",
                                   "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "label": "Next",
                                       "event": "NEXT",
+                                      "type": "button",
                                       "variant": "primary",
-                                      "icon": "arrow-right"
+                                      "icon": "arrow-right",
+                                      "label": "Next"
                                     }
                                   ]
                                 }
@@ -1318,7 +1779,26 @@
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "appName": "LMS",
+                      "navItems": [
+                        {
+                          "icon": "book-open",
+                          "href": "/courses",
+                          "label": "Courses"
+                        },
+                        {
+                          "label": "Enroll",
+                          "href": "/enroll",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "href": "/progress",
+                          "label": "Progress",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -1330,72 +1810,55 @@
                 "effects": [
                   [
                     "fetch",
-                    "Enrollment"
+                    "Enrollment",
+                    {
+                      "emit": {
+                        "success": "EnrollmentLoaded",
+                        "failure": "EnrollmentLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
-                          "type": "container",
                           "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center",
                                   "children": [
                                     {
+                                      "size": "lg",
                                       "type": "icon",
-                                      "name": "user-plus",
-                                      "size": "lg"
+                                      "name": "user-plus"
                                     },
                                     {
                                       "type": "typography",
                                       "content": "Course Enrollment",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "align": "center"
                                 },
                                 {
+                                  "currentIndex": 1.0,
                                   "type": "progress-dots",
-                                  "count": 2,
-                                  "currentIndex": 1
+                                  "count": 2.0
                                 },
                                 {
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "currentStep": 1
+                                  "type": "wizard-progress",
+                                  "currentStep": 1.0
                                 },
                                 {
                                   "type": "divider"
@@ -1407,39 +1870,62 @@
                                 },
                                 {
                                   "type": "form-section",
-                                  "entity": "Enrollment",
                                   "mode": "create",
-                                  "submitEvent": "NEXT",
-                                  "cancelEvent": "PREV",
+                                  "entity": "Enrollment",
                                   "fields": [
                                     "courseId"
-                                  ]
+                                  ],
+                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "PREV"
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
                                       "label": "Back",
-                                      "event": "PREV",
                                       "variant": "ghost",
-                                      "icon": "arrow-left"
+                                      "icon": "arrow-left",
+                                      "type": "button",
+                                      "event": "PREV"
                                     },
                                     {
                                       "type": "button",
-                                      "label": "Next",
-                                      "event": "NEXT",
+                                      "icon": "arrow-right",
                                       "variant": "primary",
-                                      "icon": "arrow-right"
+                                      "event": "NEXT",
+                                      "label": "Next"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "justify": "end"
                                 }
-                              ]
+                              ],
+                              "direction": "vertical",
+                              "gap": "lg",
+                              "type": "stack"
                             }
-                          ]
+                          ],
+                          "type": "container",
+                          "padding": "lg"
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/courses",
+                          "label": "Courses",
+                          "icon": "book-open"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Enroll",
+                          "href": "/enroll"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Progress",
+                          "href": "/progress"
                         }
                       ]
                     }
@@ -1453,104 +1939,89 @@
                 "effects": [
                   [
                     "fetch",
-                    "Enrollment"
+                    "Enrollment",
+                    {
+                      "emit": {
+                        "success": "EnrollmentLoaded",
+                        "failure": "EnrollmentLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
                           "gap": "lg",
                           "children": [
                             {
                               "type": "stack",
-                              "direction": "horizontal",
-                              "gap": "sm",
                               "align": "center",
                               "children": [
                                 {
-                                  "type": "icon",
                                   "name": "user-plus",
+                                  "type": "icon",
                                   "size": "lg"
                                 },
                                 {
+                                  "variant": "h2",
                                   "type": "typography",
-                                  "content": "Course Enrollment",
-                                  "variant": "h2"
+                                  "content": "Course Enrollment"
                                 }
-                              ]
+                              ],
+                              "gap": "sm",
+                              "direction": "horizontal"
                             },
                             {
-                              "type": "badge",
-                              "label": "Review"
+                              "label": "Review",
+                              "type": "badge"
                             },
                             {
+                              "currentStep": 2.0,
                               "type": "wizard-progress",
                               "steps": [
                                 "Student Info",
                                 "Course Selection"
-                              ],
-                              "currentStep": 2
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "stack",
                               "direction": "vertical",
+                              "type": "stack",
                               "gap": "sm",
                               "entity": "Enrollment",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "md",
                                   "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "typography",
+                                      "content": "Student Name",
                                       "variant": "caption",
-                                      "content": "Student Name"
+                                      "type": "typography"
                                     },
                                     {
-                                      "type": "typography",
                                       "variant": "body",
-                                      "content": "@entity.studentName"
+                                      "content": "@entity.studentName",
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "md",
                                   "justify": "space-between",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "type": "typography",
                                       "variant": "caption",
-                                      "content": "Email"
+                                      "content": "Email",
+                                      "type": "typography"
                                     },
                                     {
                                       "type": "typography",
@@ -1560,33 +2031,33 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "typography",
                                       "variant": "caption",
-                                      "content": "Course Id"
+                                      "content": "Course Id",
+                                      "type": "typography"
                                     },
                                     {
+                                      "content": "@entity.courseId",
                                       "type": "typography",
-                                      "variant": "body",
-                                      "content": "@entity.courseId"
+                                      "variant": "body"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "type": "stack",
+                                  "gap": "md",
+                                  "justify": "space-between"
                                 },
                                 {
                                   "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "md",
                                   "justify": "space-between",
+                                  "gap": "md",
                                   "children": [
                                     {
+                                      "content": "Enrolled At",
                                       "type": "typography",
-                                      "variant": "caption",
-                                      "content": "Enrolled At"
+                                      "variant": "caption"
                                     },
                                     {
                                       "type": "typography",
@@ -1596,34 +2067,55 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "md",
+                                  "type": "stack",
                                   "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "typography",
+                                      "content": "Status",
                                       "variant": "caption",
-                                      "content": "Status"
+                                      "type": "typography"
                                     },
                                     {
-                                      "type": "typography",
                                       "variant": "body",
-                                      "content": "@entity.status"
+                                      "content": "@entity.status",
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md"
                                 }
                               ]
                             },
                             {
-                              "type": "wizard-navigation",
-                              "currentStep": 2,
-                              "totalSteps": 3,
+                              "totalSteps": 3.0,
                               "showBack": true,
+                              "showNext": false,
                               "showComplete": true,
-                              "showNext": false
+                              "type": "wizard-navigation",
+                              "currentStep": 2.0
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "vertical"
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "LMS",
+                      "navItems": [
+                        {
+                          "href": "/courses",
+                          "label": "Courses",
+                          "icon": "book-open"
+                        },
+                        {
+                          "href": "/enroll",
+                          "icon": "layout-list",
+                          "label": "Enroll"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Progress",
+                          "href": "/progress"
                         }
                       ]
                     }
@@ -1637,14 +2129,18 @@
                 "effects": [
                   [
                     "fetch",
-                    "Enrollment"
+                    "Enrollment",
+                    {
+                      "emit": {
+                        "failure": "EnrollmentLoadFailed",
+                        "success": "EnrollmentLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
                       "navItems": [
                         {
                           "label": "Courses",
@@ -1653,48 +2149,43 @@
                         },
                         {
                           "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/enroll"
                         },
                         {
-                          "label": "Progress",
                           "href": "/progress",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Progress"
                         }
                       ],
+                      "appName": "LMS",
                       "children": [
                         {
-                          "type": "container",
-                          "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
                                       "name": "user-plus",
-                                      "size": "lg"
+                                      "size": "lg",
+                                      "type": "icon"
                                     },
                                     {
                                       "type": "typography",
                                       "content": "Course Enrollment",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "type": "stack",
+                                  "align": "center"
                                 },
                                 {
+                                  "count": 2.0,
                                   "type": "progress-dots",
-                                  "count": 2,
-                                  "currentIndex": 0
+                                  "currentIndex": 0.0
                                 },
                                 {
                                   "type": "wizard-progress",
@@ -1702,47 +2193,54 @@
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "currentStep": 0
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
+                                  "variant": "h3",
                                   "content": "Student Info",
-                                  "variant": "h3"
+                                  "type": "typography"
                                 },
                                 {
-                                  "type": "form-section",
                                   "entity": "Enrollment",
                                   "mode": "create",
-                                  "submitEvent": "NEXT",
-                                  "cancelEvent": "INIT",
                                   "fields": [
                                     "studentName",
                                     "email"
-                                  ]
+                                  ],
+                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "INIT",
+                                  "type": "form-section"
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
                                   "justify": "end",
+                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "label": "Next",
-                                      "event": "NEXT",
                                       "variant": "primary",
+                                      "event": "NEXT",
+                                      "label": "Next",
+                                      "type": "button",
                                       "icon": "arrow-right"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm"
                                 }
-                              ]
+                              ],
+                              "direction": "vertical",
+                              "gap": "lg",
+                              "type": "stack"
                             }
-                          ]
+                          ],
+                          "maxWidth": "lg",
+                          "type": "container",
+                          "padding": "lg"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -1754,14 +2252,19 @@
                 "effects": [
                   [
                     "fetch",
-                    "Enrollment"
+                    "Enrollment",
+                    {
+                      "emit": {
+                        "failure": "EnrollmentLoadFailed",
+                        "success": "EnrollmentLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "appName": "LMS",
                       "navItems": [
                         {
                           "label": "Courses",
@@ -1769,21 +2272,20 @@
                           "icon": "book-open"
                         },
                         {
-                          "label": "Enroll",
                           "href": "/enroll",
+                          "label": "Enroll",
                           "icon": "layout-list"
                         },
                         {
                           "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/progress"
                         }
                       ],
                       "children": [
                         {
-                          "type": "container",
-                          "maxWidth": "lg",
                           "padding": "lg",
+                          "type": "container",
                           "children": [
                             {
                               "type": "stack",
@@ -1791,81 +2293,83 @@
                               "gap": "lg",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "sm",
-                                  "align": "center",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "icon",
                                       "name": "user-plus",
+                                      "type": "icon",
                                       "size": "lg"
                                     },
                                     {
                                       "type": "typography",
-                                      "content": "Course Enrollment",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "content": "Course Enrollment"
                                     }
-                                  ]
+                                  ],
+                                  "align": "center",
+                                  "type": "stack"
                                 },
                                 {
-                                  "type": "progress-dots",
-                                  "count": 2,
-                                  "currentIndex": 1
+                                  "currentIndex": 1.0,
+                                  "count": 2.0,
+                                  "type": "progress-dots"
                                 },
                                 {
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "currentStep": 1
+                                  "currentStep": 1.0,
+                                  "type": "wizard-progress"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Course Selection",
-                                  "variant": "h3"
+                                  "variant": "h3",
+                                  "type": "typography"
                                 },
                                 {
                                   "type": "form-section",
-                                  "entity": "Enrollment",
+                                  "cancelEvent": "PREV",
                                   "mode": "create",
                                   "submitEvent": "NEXT",
-                                  "cancelEvent": "PREV",
+                                  "entity": "Enrollment",
                                   "fields": [
                                     "courseId"
                                   ]
                                 },
                                 {
+                                  "justify": "end",
                                   "type": "stack",
                                   "direction": "horizontal",
                                   "gap": "sm",
-                                  "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "label": "Back",
                                       "event": "PREV",
+                                      "icon": "arrow-left",
                                       "variant": "ghost",
-                                      "icon": "arrow-left"
+                                      "type": "button",
+                                      "label": "Back"
                                     },
                                     {
-                                      "type": "button",
                                       "label": "Next",
-                                      "event": "NEXT",
                                       "variant": "primary",
-                                      "icon": "arrow-right"
+                                      "icon": "arrow-right",
+                                      "type": "button",
+                                      "event": "NEXT"
                                     }
                                   ]
                                 }
                               ]
                             }
-                          ]
+                          ],
+                          "maxWidth": "lg"
                         }
-                      ]
+                      ],
+                      "appName": "LMS"
                     }
                   ]
                 ]
@@ -1890,13 +2394,13 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "LMS",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "label": "Courses",
                           "href": "/courses",
-                          "icon": "book-open"
+                          "icon": "book-open",
+                          "label": "Courses"
                         },
                         {
                           "label": "Enroll",
@@ -1904,41 +2408,41 @@
                           "icon": "layout-list"
                         },
                         {
+                          "icon": "layout-list",
                           "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
+                          "href": "/progress"
                         }
                       ],
                       "children": [
                         {
                           "type": "stack",
-                          "direction": "vertical",
-                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
+                              "size": "lg",
                               "type": "icon",
-                              "name": "check-circle",
-                              "size": "lg"
+                              "name": "check-circle"
                             },
                             {
-                              "type": "typography",
                               "content": "Enrolled!",
-                              "variant": "h2"
+                              "variant": "h2",
+                              "type": "typography"
                             },
                             {
-                              "type": "typography",
                               "content": "You have been successfully enrolled in the course.",
+                              "type": "typography",
                               "variant": "body"
                             },
                             {
-                              "type": "button",
                               "label": "Start New",
                               "event": "RESTART",
+                              "type": "button",
                               "variant": "primary",
                               "icon": "refresh-cw"
                             }
-                          ]
+                          ],
+                          "direction": "vertical",
+                          "gap": "lg"
                         }
                       ]
                     }
@@ -1952,47 +2456,28 @@
                 "effects": [
                   [
                     "fetch",
-                    "Enrollment"
+                    "Enrollment",
+                    {
+                      "emit": {
+                        "success": "EnrollmentLoaded",
+                        "failure": "EnrollmentLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
-                          "type": "container",
-                          "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
+                                  "align": "center",
                                   "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "sm",
-                                  "align": "center",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "type": "icon",
@@ -2000,16 +2485,16 @@
                                       "size": "lg"
                                     },
                                     {
+                                      "variant": "h2",
                                       "type": "typography",
-                                      "content": "Course Enrollment",
-                                      "variant": "h2"
+                                      "content": "Course Enrollment"
                                     }
                                   ]
                                 },
                                 {
+                                  "currentIndex": 0.0,
                                   "type": "progress-dots",
-                                  "count": 2,
-                                  "currentIndex": 0
+                                  "count": 2.0
                                 },
                                 {
                                   "type": "wizard-progress",
@@ -2017,45 +2502,70 @@
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "currentStep": 0
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Student Info",
-                                  "variant": "h3"
+                                  "variant": "h3",
+                                  "type": "typography"
                                 },
                                 {
-                                  "type": "form-section",
-                                  "entity": "Enrollment",
-                                  "mode": "create",
-                                  "submitEvent": "NEXT",
-                                  "cancelEvent": "INIT",
                                   "fields": [
                                     "studentName",
                                     "email"
-                                  ]
+                                  ],
+                                  "entity": "Enrollment",
+                                  "type": "form-section",
+                                  "mode": "create",
+                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "INIT"
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "label": "Next",
-                                      "event": "NEXT",
                                       "variant": "primary",
-                                      "icon": "arrow-right"
+                                      "event": "NEXT",
+                                      "type": "button",
+                                      "icon": "arrow-right",
+                                      "label": "Next"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "justify": "end",
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
-                          ]
+                          ],
+                          "type": "container",
+                          "padding": "lg",
+                          "maxWidth": "lg"
+                        }
+                      ],
+                      "appName": "LMS",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Courses",
+                          "icon": "book-open",
+                          "href": "/courses"
+                        },
+                        {
+                          "href": "/enroll",
+                          "icon": "layout-list",
+                          "label": "Enroll"
+                        },
+                        {
+                          "href": "/progress",
+                          "label": "Progress",
+                          "icon": "layout-list"
                         }
                       ]
                     }
@@ -2069,72 +2579,58 @@
                 "effects": [
                   [
                     "fetch",
-                    "Enrollment"
+                    "Enrollment",
+                    {
+                      "emit": {
+                        "success": "EnrollmentLoaded",
+                        "failure": "EnrollmentLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
                           "type": "container",
-                          "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "vertical",
+                              "type": "stack",
                               "gap": "lg",
                               "children": [
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
                                       "name": "user-plus",
-                                      "size": "lg"
+                                      "size": "lg",
+                                      "type": "icon"
                                     },
                                     {
-                                      "type": "typography",
+                                      "variant": "h2",
                                       "content": "Course Enrollment",
-                                      "variant": "h2"
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "align": "center",
+                                  "gap": "sm"
                                 },
                                 {
                                   "type": "progress-dots",
-                                  "count": 2,
-                                  "currentIndex": 0
+                                  "currentIndex": 0.0,
+                                  "count": 2.0
                                 },
                                 {
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Student Info",
                                     "Course Selection"
                                   ],
-                                  "currentStep": 0
+                                  "currentStep": 0.0,
+                                  "type": "wizard-progress"
                                 },
                                 {
                                   "type": "divider"
@@ -2145,68 +2641,68 @@
                                   "variant": "h3"
                                 },
                                 {
+                                  "mode": "create",
                                   "type": "form-section",
                                   "entity": "Enrollment",
-                                  "mode": "create",
-                                  "submitEvent": "NEXT",
                                   "cancelEvent": "INIT",
                                   "fields": [
                                     "studentName",
                                     "email"
-                                  ]
+                                  ],
+                                  "submitEvent": "NEXT"
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
                                   "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
                                       "label": "Next",
+                                      "icon": "arrow-right",
+                                      "type": "button",
                                       "event": "NEXT",
-                                      "variant": "primary",
-                                      "icon": "arrow-right"
+                                      "variant": "primary"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm",
+                                  "direction": "horizontal",
+                                  "type": "stack"
                                 }
                               ]
                             }
-                          ]
+                          ],
+                          "padding": "lg",
+                          "maxWidth": "lg"
                         }
-                      ]
+                      ],
+                      "navItems": [
+                        {
+                          "icon": "book-open",
+                          "label": "Courses",
+                          "href": "/courses"
+                        },
+                        {
+                          "label": "Enroll",
+                          "href": "/enroll",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/progress",
+                          "label": "Progress"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
               }
             ]
           },
-          "listens": [
-            {
-              "event": "ENROLL",
-              "triggers": "INIT",
-              "scope": "external"
-            }
-          ],
-          "emits": [
-            {
-              "event": "COMPLETE_LESSON",
-              "description": "Lesson completed, update progress",
-              "payload": [
-                {
-                  "name": "id",
-                  "type": "string",
-                  "required": true
-                }
-              ],
-              "scope": "external"
-            }
-          ]
+          "scope": "collection"
         }
       ],
       "pages": [
         {
-          "name": "EnrollPage",
+          "name": "Enroll",
           "path": "/enroll",
           "traits": [
             {
@@ -2229,36 +2725,85 @@
           },
           {
             "name": "courseName",
-            "type": "string",
-            "default": ""
+            "type": "string"
           },
           {
             "name": "lessonsCompleted",
-            "type": "number",
-            "default": 0
+            "type": "number"
           },
           {
             "name": "totalLessons",
-            "type": "number",
-            "default": 0
+            "type": "number"
           },
           {
             "name": "percentComplete",
-            "type": "number",
-            "default": 0
+            "type": "number"
           },
           {
             "name": "lastActivity",
-            "type": "date",
-            "default": ""
+            "type": "datetime"
           }
         ]
       },
       "traits": [
         {
           "name": "ProgressDisplay",
-          "linkedEntity": "Progress",
           "category": "interaction",
+          "linkedEntity": "Progress",
+          "emits": [
+            {
+              "event": "ProgressLoaded",
+              "description": "Fired when Progress finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "courseName",
+                  "type": "string"
+                },
+                {
+                  "name": "lessonsCompleted",
+                  "type": "number"
+                },
+                {
+                  "name": "totalLessons",
+                  "type": "number"
+                },
+                {
+                  "name": "percentComplete",
+                  "type": "number"
+                },
+                {
+                  "name": "lastActivity",
+                  "type": "datetime"
+                }
+              ]
+            },
+            {
+              "event": "ProgressLoadFailed",
+              "description": "Fired when Progress fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
+            }
+          ],
+          "listens": [
+            {
+              "event": "COMPLETE_LESSON",
+              "triggers": "INIT",
+              "source": {
+                "kind": "any"
+              }
+            }
+          ],
           "stateMachine": {
             "states": [
               {
@@ -2288,6 +2833,20 @@
               {
                 "key": "REFRESHED",
                 "name": "Refreshed"
+              },
+              {
+                "key": "ProgressLoaded",
+                "name": "Progress loaded"
+              },
+              {
+                "key": "ProgressLoadFailed",
+                "name": "Progress load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -2298,46 +2857,33 @@
                 "effects": [
                   [
                     "fetch",
-                    "Progress"
+                    "Progress",
+                    {
+                      "emit": {
+                        "failure": "ProgressLoadFailed",
+                        "success": "ProgressLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
                           "type": "scaled-diagram",
                           "children": [
                             {
+                              "gap": "lg",
                               "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Progress"
@@ -2345,19 +2891,19 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "justify": "space-between",
+                                  "gap": "md",
+                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
                                       "gap": "md",
+                                      "type": "stack",
                                       "children": [
                                         {
-                                          "type": "icon",
                                           "name": "trending-up",
+                                          "type": "icon",
                                           "size": "lg"
                                         },
                                         {
@@ -2368,11 +2914,11 @@
                                       ]
                                     },
                                     {
-                                      "type": "button",
                                       "label": "Refresh",
-                                      "event": "REFRESH",
                                       "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "icon": "refresh-cw",
+                                      "event": "REFRESH",
+                                      "type": "button"
                                     }
                                   ]
                                 },
@@ -2380,25 +2926,23 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
                                       "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
                                           "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
                                               "direction": "vertical",
                                               "gap": "sm",
+                                              "type": "stack",
                                               "children": [
                                                 {
                                                   "type": "typography",
-                                                  "variant": "caption",
-                                                  "content": "CourseName"
+                                                  "content": "CourseName",
+                                                  "variant": "caption"
                                                 },
                                                 {
                                                   "type": "typography",
@@ -2417,8 +2961,6 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "LessonsCompleted",
                                           "value": [
                                             "object/get",
                                             [
@@ -2426,11 +2968,11 @@
                                               "@entity"
                                             ],
                                             "lessonsCompleted"
-                                          ]
+                                          ],
+                                          "label": "LessonsCompleted",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "TotalLessons",
                                           "value": [
                                             "object/get",
                                             [
@@ -2438,11 +2980,13 @@
                                               "@entity"
                                             ],
                                             "totalLessons"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "TotalLessons"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "PercentComplete",
+                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -2456,9 +3000,7 @@
                                           "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
                                               "direction": "vertical",
-                                              "gap": "sm",
                                               "children": [
                                                 {
                                                   "type": "typography",
@@ -2466,8 +3008,8 @@
                                                   "content": "LastActivity"
                                                 },
                                                 {
-                                                  "type": "typography",
                                                   "variant": "h3",
+                                                  "type": "typography",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -2477,128 +3019,151 @@
                                                     "lastActivity"
                                                   ]
                                                 }
-                                              ]
+                                              ],
+                                              "gap": "sm",
+                                              "type": "stack"
                                             }
                                           ]
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "padding": "md",
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "grid",
-                                  "columns": 2,
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Chart View"
+                                          "content": "Chart View",
+                                          "type": "typography"
                                         }
                                       ]
                                     },
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
+                                          "content": "Graph View",
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Graph View"
+                                          "variant": "caption"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "columns": 2.0
                                 },
                                 {
                                   "type": "line-chart",
+                                  "yKey": "value",
+                                  "title": "Trend",
+                                  "xKey": "date",
                                   "data": [
                                     {
                                       "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0
                                     },
                                     {
                                       "date": "May",
-                                      "value": 22
+                                      "value": 22.0
                                     },
                                     {
                                       "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0
                                     }
-                                  ],
-                                  "xKey": "date",
-                                  "yKey": "value",
-                                  "title": "Trend"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
                                       "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "type": "graph-view",
+                                  "width": 400.0,
+                                  "height": 200.0,
                                   "nodes": [
                                     {
+                                      "x": 50.0,
+                                      "y": 100.0,
                                       "id": "a",
-                                      "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "label": "Start"
                                     },
                                     {
                                       "id": "b",
-                                      "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "y": 50.0,
+                                      "x": 200.0,
+                                      "label": "Process"
                                     },
                                     {
-                                      "id": "c",
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
+                                      "x": 350.0,
+                                      "y": 100.0,
+                                      "id": "c"
                                     }
                                   ],
                                   "edges": [
                                     {
-                                      "from": "a",
-                                      "to": "b"
+                                      "to": "b",
+                                      "from": "a"
                                     },
                                     {
                                       "from": "b",
                                       "to": "c"
                                     }
                                   ],
-                                  "width": 400,
-                                  "height": 200
+                                  "type": "graph-view"
                                 }
                               ]
                             }
                           ]
                         }
+                      ],
+                      "appName": "LMS",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/courses",
+                          "label": "Courses",
+                          "icon": "book-open"
+                        },
+                        {
+                          "href": "/enroll",
+                          "icon": "layout-list",
+                          "label": "Enroll"
+                        },
+                        {
+                          "href": "/progress",
+                          "icon": "layout-list",
+                          "label": "Progress"
+                        }
                       ]
                     }
                   ]
@@ -2611,31 +3176,36 @@
                 "effects": [
                   [
                     "fetch",
-                    "Progress"
+                    "Progress",
+                    {
+                      "emit": {
+                        "success": "ProgressLoaded",
+                        "failure": "ProgressLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "LMS",
                       "navItems": [
                         {
-                          "label": "Courses",
                           "href": "/courses",
+                          "label": "Courses",
                           "icon": "book-open"
                         },
                         {
-                          "label": "Enroll",
                           "href": "/enroll",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Enroll"
                         },
                         {
-                          "label": "Progress",
                           "href": "/progress",
+                          "label": "Progress",
                           "icon": "layout-list"
                         }
                       ],
+                      "appName": "LMS",
                       "children": [
                         {
                           "type": "scaled-diagram",
@@ -2643,7 +3213,6 @@
                             {
                               "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -2659,63 +3228,60 @@
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "space-between",
                                   "children": [
                                     {
                                       "type": "stack",
-                                      "direction": "horizontal",
                                       "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
                                           "name": "trending-up",
+                                          "type": "icon",
                                           "size": "lg"
                                         },
                                         {
-                                          "type": "typography",
                                           "content": "Progress",
+                                          "type": "typography",
                                           "variant": "h2"
                                         }
-                                      ]
+                                      ],
+                                      "direction": "horizontal"
                                     },
                                     {
                                       "type": "button",
-                                      "label": "Refresh",
-                                      "event": "REFRESH",
+                                      "icon": "refresh-cw",
                                       "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "label": "Refresh",
+                                      "event": "REFRESH"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "direction": "horizontal",
+                                  "justify": "space-between"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
                                   "padding": "md",
                                   "children": [
                                     {
                                       "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
                                           "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
                                               "direction": "vertical",
-                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "variant": "caption",
+                                                  "type": "typography",
                                                   "content": "CourseName"
                                                 },
                                                 {
-                                                  "type": "typography",
                                                   "variant": "h3",
+                                                  "type": "typography",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -2725,13 +3291,13 @@
                                                     "courseName"
                                                   ]
                                                 }
-                                              ]
+                                              ],
+                                              "gap": "sm",
+                                              "type": "stack"
                                             }
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "LessonsCompleted",
                                           "value": [
                                             "object/get",
                                             [
@@ -2739,11 +3305,13 @@
                                               "@entity"
                                             ],
                                             "lessonsCompleted"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "LessonsCompleted"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "TotalLessons",
+                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -2754,8 +3322,8 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "PercentComplete",
+                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -2766,20 +3334,17 @@
                                           ]
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
                                               "direction": "vertical",
-                                              "gap": "sm",
+                                              "type": "stack",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "variant": "caption",
-                                                  "content": "LastActivity"
+                                                  "content": "LastActivity",
+                                                  "type": "typography"
                                                 },
                                                 {
-                                                  "type": "typography",
                                                   "variant": "h3",
                                                   "content": [
                                                     "object/get",
@@ -2788,31 +3353,33 @@
                                                       "@entity"
                                                     ],
                                                     "lastActivity"
-                                                  ]
+                                                  ],
+                                                  "type": "typography"
                                                 }
-                                              ]
+                                              ],
+                                              "gap": "sm"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
-                                  "gap": "md",
+                                  "columns": 2.0,
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Chart View"
+                                          "content": "Chart View",
+                                          "type": "typography"
                                         }
                                       ]
                                     },
@@ -2821,47 +3388,48 @@
                                       "children": [
                                         {
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "variant": "caption"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
+                                  "title": "Trend",
                                   "type": "line-chart",
+                                  "xKey": "date",
+                                  "yKey": "value",
                                   "data": [
                                     {
                                       "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0
                                     },
                                     {
                                       "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0
                                     },
                                     {
                                       "date": "May",
-                                      "value": 22
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ],
-                                  "xKey": "date",
-                                  "yKey": "value",
-                                  "title": "Trend"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
@@ -2871,48 +3439,51 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
                                   "type": "graph-view",
+                                  "height": 200.0,
                                   "nodes": [
                                     {
                                       "id": "a",
                                       "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "y": 100.0,
+                                      "x": 50.0
                                     },
                                     {
+                                      "y": 50.0,
                                       "id": "b",
                                       "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "x": 200.0
                                     },
                                     {
                                       "id": "c",
-                                      "label": "End",
-                                      "x": 350,
-                                      "y": 100
+                                      "x": 350.0,
+                                      "y": 100.0,
+                                      "label": "End"
                                     }
                                   ],
+                                  "width": 400.0,
                                   "edges": [
                                     {
                                       "from": "a",
                                       "to": "b"
                                     },
                                     {
-                                      "from": "b",
-                                      "to": "c"
+                                      "to": "c",
+                                      "from": "b"
                                     }
-                                  ],
-                                  "width": 400,
-                                  "height": 200
+                                  ]
                                 }
-                              ]
+                              ],
+                              "gap": "lg"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2924,14 +3495,19 @@
                 "effects": [
                   [
                     "fetch",
-                    "Progress"
+                    "Progress",
+                    {
+                      "emit": {
+                        "failure": "ProgressLoadFailed",
+                        "success": "ProgressLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "appName": "LMS",
                       "navItems": [
                         {
                           "label": "Courses",
@@ -2940,30 +3516,29 @@
                         },
                         {
                           "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/enroll"
                         },
                         {
                           "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/progress"
                         }
                       ],
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
+                              "gap": "lg",
                               "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Progress"
@@ -2971,64 +3546,60 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
+                                          "size": "lg",
                                           "type": "icon",
-                                          "name": "trending-up",
-                                          "size": "lg"
+                                          "name": "trending-up"
                                         },
                                         {
-                                          "type": "typography",
+                                          "variant": "h2",
                                           "content": "Progress",
-                                          "variant": "h2"
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md",
+                                      "direction": "horizontal",
+                                      "type": "stack"
                                     },
                                     {
                                       "type": "button",
                                       "label": "Refresh",
+                                      "icon": "refresh-cw",
                                       "event": "REFRESH",
-                                      "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "variant": "secondary"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "justify": "space-between",
+                                  "type": "stack",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
                                       "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
-                                              "direction": "vertical",
                                               "gap": "sm",
+                                              "direction": "vertical",
+                                              "type": "stack",
                                               "children": [
                                                 {
                                                   "type": "typography",
-                                                  "variant": "caption",
-                                                  "content": "CourseName"
+                                                  "content": "CourseName",
+                                                  "variant": "caption"
                                                 },
                                                 {
-                                                  "type": "typography",
-                                                  "variant": "h3",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -3036,15 +3607,16 @@
                                                       "@entity"
                                                     ],
                                                     "courseName"
-                                                  ]
+                                                  ],
+                                                  "type": "typography",
+                                                  "variant": "h3"
                                                 }
                                               ]
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "LessonsCompleted",
                                           "value": [
                                             "object/get",
                                             [
@@ -3052,11 +3624,12 @@
                                               "@entity"
                                             ],
                                             "lessonsCompleted"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "LessonsCompleted"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "label": "TotalLessons",
                                           "value": [
                                             "object/get",
                                             [
@@ -3064,10 +3637,10 @@
                                               "@entity"
                                             ],
                                             "totalLessons"
-                                          ]
+                                          ],
+                                          "label": "TotalLessons"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "PercentComplete",
                                           "value": [
                                             "object/get",
@@ -3076,15 +3649,15 @@
                                               "@entity"
                                             ],
                                             "percentComplete"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
                                               "type": "stack",
-                                              "direction": "vertical",
                                               "gap": "sm",
+                                              "direction": "vertical",
                                               "children": [
                                                 {
                                                   "type": "typography",
@@ -3105,19 +3678,18 @@
                                                 }
                                               ]
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
@@ -3139,93 +3711,98 @@
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "type": "grid",
+                                  "columns": 2.0
                                 },
                                 {
                                   "type": "line-chart",
+                                  "yKey": "value",
                                   "data": [
                                     {
                                       "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0
                                     },
                                     {
                                       "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0
                                     },
                                     {
                                       "date": "May",
-                                      "value": 22
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
                                   ],
-                                  "xKey": "date",
-                                  "yKey": "value",
-                                  "title": "Trend"
+                                  "title": "Trend",
+                                  "xKey": "date"
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "type": "graph-view",
+                                  "edges": [
+                                    {
+                                      "from": "a",
+                                      "to": "b"
+                                    },
+                                    {
+                                      "from": "b",
+                                      "to": "c"
+                                    }
+                                  ],
+                                  "height": 200.0,
                                   "nodes": [
                                     {
+                                      "y": 100.0,
                                       "id": "a",
                                       "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "x": 50.0
                                     },
                                     {
-                                      "id": "b",
+                                      "x": 200.0,
                                       "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "y": 50.0,
+                                      "id": "b"
                                     },
                                     {
-                                      "id": "c",
+                                      "x": 350.0,
+                                      "y": 100.0,
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
+                                      "id": "c"
                                     }
                                   ],
-                                  "edges": [
-                                    {
-                                      "from": "a",
-                                      "to": "b"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
-                                    }
-                                  ],
-                                  "width": 400,
-                                  "height": 200
+                                  "type": "graph-view",
+                                  "width": 400.0
                                 }
                               ]
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
-                      ]
+                      ],
+                      "appName": "LMS"
                     }
                   ]
                 ]
@@ -3237,46 +3814,32 @@
                 "effects": [
                   [
                     "fetch",
-                    "Progress"
+                    "Progress",
+                    {
+                      "emit": {
+                        "success": "ProgressLoaded",
+                        "failure": "ProgressLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "appName": "LMS",
-                      "navItems": [
-                        {
-                          "label": "Courses",
-                          "href": "/courses",
-                          "icon": "book-open"
-                        },
-                        {
-                          "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Progress",
-                          "href": "/progress",
-                          "icon": "layout-list"
-                        }
-                      ],
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Progress"
@@ -3285,35 +3848,35 @@
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
                                           "type": "icon",
-                                          "name": "trending-up",
-                                          "size": "lg"
+                                          "size": "lg",
+                                          "name": "trending-up"
                                         },
                                         {
-                                          "type": "typography",
                                           "content": "Progress",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md",
+                                      "type": "stack"
                                     },
                                     {
+                                      "variant": "secondary",
+                                      "event": "REFRESH",
                                       "type": "button",
                                       "label": "Refresh",
-                                      "event": "REFRESH",
-                                      "variant": "secondary",
                                       "icon": "refresh-cw"
                                     }
-                                  ]
+                                  ],
+                                  "justify": "space-between",
+                                  "gap": "md",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
@@ -3324,23 +3887,22 @@
                                   "children": [
                                     {
                                       "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
                                           "type": "card",
                                           "children": [
                                             {
                                               "type": "stack",
-                                              "direction": "vertical",
                                               "gap": "sm",
+                                              "direction": "vertical",
                                               "children": [
                                                 {
+                                                  "content": "CourseName",
                                                   "type": "typography",
-                                                  "variant": "caption",
-                                                  "content": "CourseName"
+                                                  "variant": "caption"
                                                 },
                                                 {
-                                                  "type": "typography",
                                                   "variant": "h3",
                                                   "content": [
                                                     "object/get",
@@ -3349,15 +3911,14 @@
                                                       "@entity"
                                                     ],
                                                     "courseName"
-                                                  ]
+                                                  ],
+                                                  "type": "typography"
                                                 }
                                               ]
                                             }
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "LessonsCompleted",
                                           "value": [
                                             "object/get",
                                             [
@@ -3365,11 +3926,11 @@
                                               "@entity"
                                             ],
                                             "lessonsCompleted"
-                                          ]
+                                          ],
+                                          "label": "LessonsCompleted",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "TotalLessons",
                                           "value": [
                                             "object/get",
                                             [
@@ -3377,11 +3938,11 @@
                                               "@entity"
                                             ],
                                             "totalLessons"
-                                          ]
+                                          ],
+                                          "label": "TotalLessons",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "PercentComplete",
                                           "value": [
                                             "object/get",
                                             [
@@ -3389,15 +3950,14 @@
                                               "@entity"
                                             ],
                                             "percentComplete"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "PercentComplete"
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
                                               "direction": "vertical",
-                                              "gap": "sm",
                                               "children": [
                                                 {
                                                   "type": "typography",
@@ -3406,7 +3966,6 @@
                                                 },
                                                 {
                                                   "type": "typography",
-                                                  "variant": "h3",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -3414,11 +3973,15 @@
                                                       "@entity"
                                                     ],
                                                     "lastActivity"
-                                                  ]
+                                                  ],
+                                                  "variant": "h3"
                                                 }
-                                              ]
+                                              ],
+                                              "type": "stack",
+                                              "gap": "sm"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         }
                                       ]
                                     }
@@ -3428,9 +3991,8 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "columns": 2.0,
                                   "type": "grid",
-                                  "columns": 2,
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
@@ -3452,75 +4014,77 @@
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md"
                                 },
                                 {
+                                  "title": "Trend",
                                   "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
                                       "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0
                                     },
                                     {
                                       "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0
                                     },
                                     {
                                       "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0
                                     },
                                     {
                                       "date": "May",
-                                      "value": 22
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
                                   ],
-                                  "xKey": "date",
                                   "yKey": "value",
-                                  "title": "Trend"
+                                  "xKey": "date"
                                 },
                                 {
                                   "type": "chart-legend",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
                                   ]
                                 },
                                 {
-                                  "type": "graph-view",
                                   "nodes": [
                                     {
                                       "id": "a",
+                                      "y": 100.0,
                                       "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "x": 50.0
                                     },
                                     {
                                       "id": "b",
                                       "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "x": 200.0,
+                                      "y": 50.0
                                     },
                                     {
-                                      "id": "c",
+                                      "x": 350.0,
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
+                                      "y": 100.0,
+                                      "id": "c"
                                     }
                                   ],
+                                  "type": "graph-view",
+                                  "width": 400.0,
                                   "edges": [
                                     {
                                       "from": "a",
@@ -3531,12 +4095,31 @@
                                       "to": "c"
                                     }
                                   ],
-                                  "width": 400,
-                                  "height": 200
+                                  "height": 200.0
                                 }
-                              ]
+                              ],
+                              "gap": "lg",
+                              "type": "stack"
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
+                        }
+                      ],
+                      "navItems": [
+                        {
+                          "label": "Courses",
+                          "href": "/courses",
+                          "icon": "book-open"
+                        },
+                        {
+                          "href": "/enroll",
+                          "label": "Enroll",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/progress",
+                          "label": "Progress"
                         }
                       ]
                     }
@@ -3550,14 +4133,19 @@
                 "effects": [
                   [
                     "fetch",
-                    "Progress"
+                    "Progress",
+                    {
+                      "emit": {
+                        "success": "ProgressLoaded",
+                        "failure": "ProgressLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "appName": "LMS",
                       "navItems": [
                         {
                           "label": "Courses",
@@ -3565,14 +4153,14 @@
                           "icon": "book-open"
                         },
                         {
+                          "icon": "layout-list",
                           "label": "Enroll",
-                          "href": "/enroll",
-                          "icon": "layout-list"
+                          "href": "/enroll"
                         },
                         {
-                          "label": "Progress",
+                          "icon": "layout-list",
                           "href": "/progress",
-                          "icon": "layout-list"
+                          "label": "Progress"
                         }
                       ],
                       "children": [
@@ -3580,16 +4168,16 @@
                           "type": "scaled-diagram",
                           "children": [
                             {
+                              "gap": "lg",
                               "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Progress"
@@ -3598,63 +4186,61 @@
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "md",
                                   "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
+                                          "size": "lg",
                                           "type": "icon",
-                                          "name": "trending-up",
-                                          "size": "lg"
+                                          "name": "trending-up"
                                         },
                                         {
                                           "type": "typography",
                                           "content": "Progress",
                                           "variant": "h2"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md",
+                                      "direction": "horizontal",
+                                      "type": "stack"
                                     },
                                     {
-                                      "type": "button",
+                                      "icon": "refresh-cw",
+                                      "variant": "secondary",
                                       "label": "Refresh",
                                       "event": "REFRESH",
-                                      "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "type": "button"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
                                   "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
                                           "type": "card",
                                           "children": [
                                             {
                                               "type": "stack",
-                                              "direction": "vertical",
                                               "gap": "sm",
+                                              "direction": "vertical",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "variant": "caption",
+                                                  "type": "typography",
                                                   "content": "CourseName"
                                                 },
                                                 {
-                                                  "type": "typography",
                                                   "variant": "h3",
+                                                  "type": "typography",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -3669,7 +4255,6 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "LessonsCompleted",
                                           "value": [
                                             "object/get",
@@ -3678,11 +4263,10 @@
                                               "@entity"
                                             ],
                                             "lessonsCompleted"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "TotalLessons",
                                           "value": [
                                             "object/get",
                                             [
@@ -3690,11 +4274,13 @@
                                               "@entity"
                                             ],
                                             "totalLessons"
-                                          ]
+                                          ],
+                                          "label": "TotalLessons",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "PercentComplete",
+                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -3708,18 +4294,14 @@
                                           "type": "card",
                                           "children": [
                                             {
-                                              "type": "stack",
-                                              "direction": "vertical",
-                                              "gap": "sm",
                                               "children": [
                                                 {
                                                   "type": "typography",
-                                                  "variant": "caption",
-                                                  "content": "LastActivity"
+                                                  "content": "LastActivity",
+                                                  "variant": "caption"
                                                 },
                                                 {
                                                   "type": "typography",
-                                                  "variant": "h3",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -3727,30 +4309,35 @@
                                                       "@entity"
                                                     ],
                                                     "lastActivity"
-                                                  ]
+                                                  ],
+                                                  "variant": "h3"
                                                 }
-                                              ]
+                                              ],
+                                              "direction": "vertical",
+                                              "gap": "sm",
+                                              "type": "stack"
                                             }
                                           ]
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
                                   "gap": "md",
+                                  "type": "grid",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
+                                          "type": "typography",
                                           "content": "Chart View"
                                         }
                                       ]
@@ -3759,45 +4346,46 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "type": "typography"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "columns": 2.0
                                 },
                                 {
+                                  "title": "Trend",
                                   "type": "line-chart",
+                                  "xKey": "date",
+                                  "yKey": "value",
                                   "data": [
                                     {
                                       "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "date": "May",
-                                      "value": 22
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ],
-                                  "xKey": "date",
-                                  "yKey": "value",
-                                  "title": "Trend"
+                                  ]
                                 },
                                 {
                                   "type": "chart-legend",
@@ -3813,63 +4401,58 @@
                                   ]
                                 },
                                 {
+                                  "width": 400.0,
+                                  "height": 200.0,
                                   "type": "graph-view",
+                                  "edges": [
+                                    {
+                                      "from": "a",
+                                      "to": "b"
+                                    },
+                                    {
+                                      "from": "b",
+                                      "to": "c"
+                                    }
+                                  ],
                                   "nodes": [
                                     {
-                                      "id": "a",
                                       "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "x": 50.0,
+                                      "y": 100.0,
+                                      "id": "a"
                                     },
                                     {
-                                      "id": "b",
+                                      "x": 200.0,
                                       "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "id": "b",
+                                      "y": 50.0
                                     },
                                     {
+                                      "y": 100.0,
                                       "id": "c",
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
-                                    }
-                                  ],
-                                  "edges": [
-                                    {
-                                      "from": "a",
-                                      "to": "b"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
+                                      "x": 350.0
                                     }
-                                  ],
-                                  "width": 400,
-                                  "height": 200
+                                  ]
                                 }
                               ]
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "appName": "LMS"
                     }
                   ]
                 ]
               }
             ]
           },
-          "listens": [
-            {
-              "event": "COMPLETE_LESSON",
-              "triggers": "INIT",
-              "scope": "external"
-            }
-          ]
+          "scope": "collection"
         }
       ],
       "pages": [
         {
-          "name": "ProgressPage",
+          "name": "Progress",
           "path": "/progress",
           "traits": [
             {
@@ -3880,4 +4463,4 @@
       ]
     }
   ]
-}
+}