@almadar/std 14.3.0 → 14.4.0

package/dist/behaviors/registry/app/organisms/std-booking-system.orb

@@ -5,6 +5,12 @@
   "orbitals": [
     {
       "name": "ProviderOrbital",
+      "uses": [
+        {
+          "from": "std/behaviors/std-app-layout",
+          "as": "AppShell"
+        }
+      ],
       "entity": {
         "name": "Provider",
         "collection": "providers",
@@ -51,6 +57,43 @@
         ]
       },
       "traits": [
+        {
+          "ref": "AppShell.traits.AppLayout",
+          "name": "BookingProviderAppLayout",
+          "config": {
+            "notificationClickEvent": "BOOKING_NOTIFICATIONS_OPEN",
+            "appName": "BookingSystemApp",
+            "contentTrait": "@trait.ProviderBrowse",
+            "navItems": [
+              {
+                "href": "/providers",
+                "icon": "user-check",
+                "label": "Providers"
+              },
+              {
+                "label": "Book",
+                "href": "/book",
+                "icon": "calendar-plus"
+              },
+              {
+                "label": "Appointments",
+                "href": "/appointments",
+                "icon": "calendar"
+              },
+              {
+                "label": "Schedule",
+                "href": "/schedule",
+                "icon": "clock"
+              }
+            ],
+            "notifications": [],
+            "searchEvent": "BOOKING_SEARCH"
+          },
+          "events": {
+            "SEARCH": "BOOKING_SEARCH",
+            "NOTIFY_CLICK": "BOOKING_NOTIFICATIONS_OPEN"
+          }
+        },
         {
           "name": "ProviderBrowse",
           "category": "interaction",
@@ -423,6 +466,22 @@
                 "kind": "trait",
                 "trait": "ProviderDelete"
               }
+            },
+            {
+              "event": "BOOKING_SEARCH",
+              "triggers": "BOOKING_SEARCH",
+              "source": {
+                "kind": "trait",
+                "trait": "BookingProviderAppLayout"
+              }
+            },
+            {
+              "event": "BOOKING_NOTIFICATIONS_OPEN",
+              "triggers": "BOOKING_NOTIFICATIONS_OPEN",
+              "source": {
+                "kind": "trait",
+                "trait": "BookingProviderAppLayout"
+              }
             }
           ],
           "stateMachine": {
@@ -437,6 +496,26 @@
                 "key": "INIT",
                 "name": "Initialize"
               },
+              {
+                "key": "BOOKING_SEARCH",
+                "name": "Booking Search",
+                "payloadSchema": [
+                  {
+                    "name": "value",
+                    "type": "string"
+                  }
+                ]
+              },
+              {
+                "key": "BOOKING_NOTIFICATIONS_OPEN",
+                "name": "Booking Notifications Open",
+                "payloadSchema": [
+                  {
+                    "name": "id",
+                    "type": "string"
+                  }
+                ]
+              },
               {
                 "key": "ProviderLoaded",
                 "name": "Provider loaded",
@@ -705,6 +784,7 @@
                     {
                       "align": "center",
                       "type": "stack",
+                      "direction": "vertical",
                       "gap": "md",
                       "className": "py-12",
                       "children": [
@@ -712,10 +792,48 @@
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
                           "color": "muted",
+                          "variant": "caption",
                           "content": "Loading…",
-                          "variant": "caption"
+                          "type": "typography"
+                        }
+                      ]
+                    }
+                  ]
+                ]
+              },
+              {
+                "from": "browsing",
+                "to": "browsing",
+                "event": "BOOKING_SEARCH",
+                "effects": [
+                  [
+                    "fetch",
+                    "Provider",
+                    {
+                      "emit": {
+                        "failure": "ProviderLoadFailed",
+                        "success": "ProviderLoaded"
+                      }
+                    }
+                  ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "gap": "md",
+                      "align": "center",
+                      "className": "py-12",
+                      "type": "stack",
+                      "children": [
+                        {
+                          "type": "spinner"
+                        },
+                        {
+                          "color": "muted",
+                          "variant": "caption",
+                          "type": "typography",
+                          "content": "Searching…"
                         }
                       ],
                       "direction": "vertical"
@@ -723,6 +841,47 @@
                   ]
                 ]
               },
+              {
+                "from": "browsing",
+                "to": "browsing",
+                "event": "BOOKING_NOTIFICATIONS_OPEN",
+                "effects": [
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "children": [
+                        {
+                          "type": "icon",
+                          "name": "bell"
+                        },
+                        {
+                          "type": "typography",
+                          "variant": "h3",
+                          "content": "No notifications"
+                        },
+                        {
+                          "variant": "caption",
+                          "content": "You're all caught up.",
+                          "type": "typography",
+                          "color": "muted"
+                        },
+                        {
+                          "type": "button",
+                          "variant": "ghost",
+                          "label": "Back to providers",
+                          "action": "INIT"
+                        }
+                      ],
+                      "type": "stack",
+                      "align": "center",
+                      "direction": "vertical",
+                      "gap": "md",
+                      "className": "py-8"
+                    }
+                  ]
+                ]
+              },
               {
                 "from": "browsing",
                 "to": "browsing",
@@ -734,128 +893,99 @@
                     {
                       "children": [
                         {
-                          "direction": "vertical",
-                          "className": "max-w-5xl mx-auto w-full",
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "justify": "between",
+                          "align": "center",
                           "children": [
                             {
-                              "gap": "md",
-                              "justify": "between",
+                              "type": "stack",
+                              "direction": "horizontal",
                               "align": "center",
+                              "gap": "sm",
                               "children": [
                                 {
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center",
-                                  "children": [
-                                    {
-                                      "name": "briefcase",
-                                      "type": "icon"
-                                    },
-                                    {
-                                      "variant": "h2",
-                                      "type": "typography",
-                                      "content": "Providers"
-                                    }
-                                  ],
-                                  "type": "stack"
+                                  "name": "briefcase",
+                                  "type": "icon"
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "gap": "sm",
-                                  "children": [
-                                    {
-                                      "icon": "plus",
-                                      "label": "Create Provider",
-                                      "type": "button",
-                                      "action": "CREATE",
-                                      "variant": "primary"
-                                    }
-                                  ]
+                                  "variant": "h2",
+                                  "content": "Providers",
+                                  "type": "typography"
                                 }
-                              ],
-                              "type": "stack",
-                              "direction": "horizontal"
-                            },
-                            {
-                              "type": "divider"
+                              ]
                             },
                             {
-                              "itemActions": [
-                                {
-                                  "variant": "ghost",
-                                  "label": "View",
-                                  "event": "VIEW"
-                                },
-                                {
-                                  "event": "EDIT",
-                                  "label": "Edit",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "event": "DELETE",
-                                  "label": "Delete",
-                                  "variant": "danger"
-                                }
-                              ],
-                              "type": "data-grid",
-                              "entity": "@payload.data",
-                              "fields": [
-                                {
-                                  "variant": "h3",
-                                  "icon": "briefcase",
-                                  "name": "name"
-                                },
-                                {
-                                  "name": "specialty",
-                                  "variant": "badge"
-                                },
-                                {
-                                  "name": "rating",
-                                  "format": "number",
-                                  "variant": "body"
-                                },
-                                {
-                                  "variant": "body",
-                                  "name": "location"
-                                },
+                              "type": "stack",
+                              "direction": "horizontal",
+                              "children": [
                                 {
-                                  "name": "phone",
-                                  "variant": "caption"
+                                  "variant": "primary",
+                                  "label": "Create Provider",
+                                  "action": "CREATE",
+                                  "type": "button",
+                                  "icon": "plus"
                                 }
                               ],
-                              "cols": 2.0,
-                              "gap": "md"
+                              "gap": "sm"
                             }
-                          ],
-                          "type": "stack",
-                          "gap": "lg"
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "icon": "user-check",
-                          "label": "Providers",
-                          "href": "/providers"
-                        },
-                        {
-                          "label": "Book",
-                          "icon": "calendar-plus",
-                          "href": "/book"
+                          ]
                         },
                         {
-                          "icon": "calendar",
-                          "href": "/appointments",
-                          "label": "Appointments"
+                          "type": "divider"
                         },
                         {
-                          "label": "Schedule",
-                          "href": "/schedule",
-                          "icon": "clock"
+                          "type": "data-grid",
+                          "cols": 2.0,
+                          "gap": "md",
+                          "entity": "@payload.data",
+                          "fields": [
+                            {
+                              "variant": "h3",
+                              "name": "name",
+                              "icon": "briefcase"
+                            },
+                            {
+                              "variant": "badge",
+                              "name": "specialty"
+                            },
+                            {
+                              "variant": "body",
+                              "name": "rating",
+                              "format": "number"
+                            },
+                            {
+                              "name": "location",
+                              "variant": "body"
+                            },
+                            {
+                              "name": "phone",
+                              "variant": "caption"
+                            }
+                          ],
+                          "itemActions": [
+                            {
+                              "event": "VIEW",
+                              "variant": "ghost",
+                              "label": "View"
+                            },
+                            {
+                              "event": "EDIT",
+                              "variant": "ghost",
+                              "label": "Edit"
+                            },
+                            {
+                              "label": "Delete",
+                              "event": "DELETE",
+                              "variant": "danger"
+                            }
+                          ]
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "BookingSystemApp"
+                      "direction": "vertical",
+                      "gap": "lg",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -869,9 +999,7 @@
                     "render-ui",
                     "main",
                     {
-                      "align": "center",
                       "gap": "md",
-                      "direction": "vertical",
                       "className": "py-12",
                       "type": "stack",
                       "children": [
@@ -882,23 +1010,25 @@
                         },
                         {
                           "variant": "h3",
-                          "type": "typography",
-                          "content": "Failed to load provider"
+                          "content": "Failed to load provider",
+                          "type": "typography"
                         },
                         {
                           "type": "typography",
                           "variant": "body",
-                          "color": "muted",
-                          "content": "@payload.error"
+                          "content": "@payload.error",
+                          "color": "muted"
                         },
                         {
-                          "action": "INIT",
-                          "variant": "primary",
                           "type": "button",
                           "label": "Retry",
-                          "icon": "rotate-ccw"
+                          "variant": "primary",
+                          "icon": "rotate-ccw",
+                          "action": "INIT"
                         }
-                      ]
+                      ],
+                      "align": "center",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -1081,8 +1211,8 @@
                     "Provider",
                     {
                       "emit": {
-                        "success": "ProviderLoaded",
-                        "failure": "ProviderLoadFailed"
+                        "failure": "ProviderLoadFailed",
+                        "success": "ProviderLoaded"
                       }
                     }
                   ]
@@ -1107,30 +1237,28 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
                       "children": [
                         {
-                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "icon",
                               "name": "plus-circle"
                             },
                             {
+                              "content": "Create Provider",
                               "variant": "h3",
-                              "type": "typography",
-                              "content": "Create Provider"
+                              "type": "typography"
                             }
                           ],
-                          "gap": "sm",
-                          "type": "stack"
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "submitEvent": "SAVE",
-                          "cancelEvent": "CLOSE",
-                          "type": "form-section",
                           "fields": [
                             "name",
                             "specialty",
@@ -1139,12 +1267,14 @@
                             "rating",
                             "available"
                           ],
-                          "mode": "create"
+                          "cancelEvent": "CLOSE",
+                          "mode": "create",
+                          "submitEvent": "SAVE",
+                          "type": "form-section"
                         }
                       ],
-                      "type": "stack",
-                      "gap": "md",
-                      "direction": "vertical"
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -1405,8 +1535,8 @@
                     "Provider",
                     {
                       "emit": {
-                        "success": "ProviderLoaded",
-                        "failure": "ProviderLoadFailed"
+                        "failure": "ProviderLoadFailed",
+                        "success": "ProviderLoaded"
                       }
                     }
                   ]
@@ -1421,46 +1551,43 @@
                     "fetch",
                     "Provider",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "failure": "ProviderLoadFailed",
-                        "success": "ProviderLoaded"
-                      },
-                      "id": "@payload.id"
+                        "success": "ProviderLoaded",
+                        "failure": "ProviderLoadFailed"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
                       "type": "stack",
-                      "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
                           "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
                               "name": "edit",
                               "type": "icon"
                             },
                             {
+                              "content": "Edit Provider",
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "Edit Provider"
+                              "variant": "h3"
                             }
                           ],
-                          "gap": "sm"
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "entity": "@payload.row",
+                          "mode": "edit",
                           "submitEvent": "SAVE",
-                          "cancelEvent": "CLOSE",
                           "type": "form-section",
-                          "mode": "edit",
                           "fields": [
                             "name",
                             "specialty",
@@ -1468,9 +1595,12 @@
                             "phone",
                             "rating",
                             "available"
-                          ]
+                          ],
+                          "cancelEvent": "CLOSE",
+                          "entity": "@payload.row"
                         }
-                      ]
+                      ],
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -1511,8 +1641,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "ProviderUpdateFailed",
-                        "success": "ProviderUpdated"
+                        "success": "ProviderUpdated",
+                        "failure": "ProviderUpdateFailed"
                       }
                     }
                   ],
@@ -1716,58 +1846,61 @@
                     "fetch",
                     "Provider",
                     {
-                      "id": "@payload.id",
                       "emit": {
-                        "success": "ProviderLoaded",
-                        "failure": "ProviderLoadFailed"
-                      }
+                        "failure": "ProviderLoadFailed",
+                        "success": "ProviderLoaded"
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
                       "gap": "md",
+                      "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
                           "type": "stack",
-                          "align": "center",
+                          "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "eye"
+                              "name": "eye",
+                              "type": "icon"
                             },
                             {
-                              "type": "typography",
                               "variant": "h3",
-                              "content": "@entity.name"
+                              "content": "@entity.name",
+                              "type": "typography"
                             }
                           ],
                           "direction": "horizontal",
-                          "gap": "sm"
+                          "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "direction": "horizontal",
                           "gap": "md",
+                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "typography",
+                              "variant": "caption",
                               "content": "Name",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
                               "content": "@entity.name",
-                              "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         },
                         {
+                          "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
                               "content": "Specialty",
@@ -1775,39 +1908,38 @@
                               "variant": "caption"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.specialty",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "md",
                           "type": "stack"
                         },
                         {
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Location",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
+                              "content": "@entity.location",
                               "type": "typography",
-                              "variant": "body",
-                              "content": "@entity.location"
+                              "variant": "body"
                             }
                           ],
                           "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md"
+                          "gap": "md",
+                          "direction": "horizontal"
                         },
                         {
                           "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
                               "content": "Phone",
-                              "type": "typography",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "type": "typography"
                             },
                             {
                               "content": "@entity.phone",
@@ -1815,30 +1947,27 @@
                               "variant": "body"
                             }
                           ],
-                          "gap": "md",
                           "type": "stack"
                         },
                         {
-                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
+                              "variant": "caption",
                               "content": "Rating",
-                              "type": "typography",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
                               "variant": "body",
-                              "type": "typography",
-                              "content": "@entity.rating"
+                              "content": "@entity.rating",
+                              "type": "typography"
                             }
                           ],
-                          "type": "stack",
+                          "direction": "horizontal",
                           "gap": "md"
                         },
                         {
-                          "type": "stack",
                           "gap": "md",
-                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "typography",
@@ -1846,38 +1975,39 @@
                               "content": "Available"
                             },
                             {
-                              "content": "@entity.available",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.available"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
-                              "variant": "primary",
                               "label": "Edit",
                               "action": "EDIT",
+                              "variant": "primary",
                               "type": "button",
                               "icon": "edit"
                             },
                             {
-                              "action": "CLOSE",
-                              "variant": "ghost",
+                              "label": "Close",
                               "type": "button",
-                              "label": "Close"
+                              "variant": "ghost",
+                              "action": "CLOSE"
                             }
                           ],
-                          "type": "stack",
                           "justify": "end",
-                          "gap": "sm"
+                          "direction": "horizontal"
                         }
-                      ],
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -2107,8 +2237,8 @@
                     "Provider",
                     {
                       "emit": {
-                        "failure": "ProviderLoadFailed",
-                        "success": "ProviderLoaded"
+                        "success": "ProviderLoaded",
+                        "failure": "ProviderLoadFailed"
                       }
                     }
                   ]
@@ -2130,8 +2260,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "failure": "ProviderLoadFailed",
-                        "success": "ProviderLoaded"
+                        "success": "ProviderLoaded",
+                        "failure": "ProviderLoadFailed"
                       }
                     }
                   ],
@@ -2139,13 +2269,14 @@
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
+                      "direction": "vertical",
                       "type": "stack",
                       "children": [
                         {
                           "direction": "horizontal",
-                          "align": "center",
-                          "type": "stack",
                           "gap": "sm",
+                          "align": "center",
                           "children": [
                             {
                               "type": "icon",
@@ -2156,40 +2287,39 @@
                               "content": "Delete Provider",
                               "variant": "h3"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
                           "message": "This action cannot be undone.",
-                          "type": "alert"
+                          "type": "alert",
+                          "variant": "error"
                         },
                         {
-                          "justify": "end",
-                          "gap": "sm",
-                          "type": "stack",
                           "children": [
                             {
-                              "variant": "ghost",
-                              "action": "CANCEL",
+                              "label": "Cancel",
                               "type": "button",
-                              "label": "Cancel"
+                              "action": "CANCEL",
+                              "variant": "ghost"
                             },
                             {
+                              "action": "CONFIRM_DELETE",
+                              "label": "Delete",
                               "variant": "danger",
                               "type": "button",
-                              "label": "Delete",
-                              "action": "CONFIRM_DELETE",
                               "icon": "check"
                             }
                           ],
-                          "direction": "horizontal"
+                          "gap": "sm",
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "justify": "end"
                         }
-                      ],
-                      "direction": "vertical",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -2206,8 +2336,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "ProviderDeleteFailed",
-                        "success": "ProviderDeleted"
+                        "success": "ProviderDeleted",
+                        "failure": "ProviderDeleteFailed"
                       }
                     }
                   ],
@@ -2261,8 +2391,8 @@
                     "Provider",
                     {
                       "emit": {
-                        "failure": "ProviderLoadFailed",
-                        "success": "ProviderLoaded"
+                        "success": "ProviderLoaded",
+                        "failure": "ProviderLoadFailed"
                       }
                     }
                   ]
@@ -2290,8 +2420,8 @@
                     "Provider",
                     {
                       "emit": {
-                        "success": "ProviderLoaded",
-                        "failure": "ProviderLoadFailed"
+                        "failure": "ProviderLoadFailed",
+                        "success": "ProviderLoaded"
                       }
                     }
                   ]
@@ -2307,6 +2437,9 @@
           "name": "ProvidersPage",
           "path": "/providers",
           "traits": [
+            {
+              "ref": "BookingProviderAppLayout"
+            },
             {
               "ref": "ProviderBrowse"
             },
@@ -2581,30 +2714,6 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "BookingSystemApp",
-                      "navItems": [
-                        {
-                          "icon": "user-check",
-                          "label": "Providers",
-                          "href": "/providers"
-                        },
-                        {
-                          "label": "Book",
-                          "icon": "calendar-plus",
-                          "href": "/book"
-                        },
-                        {
-                          "icon": "calendar",
-                          "href": "/appointments",
-                          "label": "Appointments"
-                        },
-                        {
-                          "label": "Schedule",
-                          "href": "/schedule",
-                          "icon": "clock"
-                        }
-                      ],
                       "children": [
                         {
                           "type": "container",
@@ -2612,16 +2721,13 @@
                           "maxWidth": "lg",
                           "children": [
                             {
-                              "direction": "vertical",
-                              "type": "stack",
                               "children": [
                                 {
-                                  "align": "center",
-                                  "type": "stack",
+                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "calendar"
+                                      "name": "calendar",
+                                      "type": "icon"
                                     },
                                     {
                                       "content": "Book Appointment",
@@ -2629,22 +2735,23 @@
                                       "variant": "h2"
                                     }
                                   ],
-                                  "gap": "sm",
+                                  "align": "center",
+                                  "type": "stack",
                                   "direction": "horizontal"
                                 },
                                 {
-                                  "currentIndex": 0.0,
                                   "type": "progress-dots",
-                                  "count": 3.0
+                                  "count": 3.0,
+                                  "currentIndex": 0.0
                                 },
                                 {
+                                  "type": "wizard-progress",
                                   "steps": [
                                     "Provider Selection",
                                     "Your Details",
                                     "Date and Time"
                                   ],
-                                  "currentStep": 0.0,
-                                  "type": "wizard-progress"
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
@@ -2656,36 +2763,62 @@
                                 },
                                 {
                                   "type": "form-section",
-                                  "mode": "create",
-                                  "submitEvent": "NEXT",
                                   "cancelEvent": "INIT",
                                   "fields": [
                                     "providerName"
-                                  ]
+                                  ],
+                                  "submitEvent": "NEXT",
+                                  "mode": "create"
                                 },
                                 {
                                   "justify": "end",
-                                  "type": "stack",
                                   "gap": "sm",
+                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "button",
                                       "variant": "primary",
-                                      "icon": "arrow-right",
                                       "action": "NEXT",
-                                      "label": "Next"
+                                      "label": "Next",
+                                      "type": "button",
+                                      "icon": "arrow-right"
                                     }
-                                  ],
-                                  "direction": "horizontal"
+                                  ]
                                 }
                               ],
+                              "type": "stack",
+                              "direction": "vertical",
                               "gap": "lg"
                             }
                           ]
                         }
-                      ]
-                    }
-                  ]
+                      ],
+                      "navItems": [
+                        {
+                          "label": "Providers",
+                          "href": "/providers",
+                          "icon": "user-check"
+                        },
+                        {
+                          "icon": "calendar-plus",
+                          "href": "/book",
+                          "label": "Book"
+                        },
+                        {
+                          "href": "/appointments",
+                          "icon": "calendar",
+                          "label": "Appointments"
+                        },
+                        {
+                          "href": "/schedule",
+                          "label": "Schedule",
+                          "icon": "clock"
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "BookingSystemApp"
+                    }
+                  ]
                 ]
               },
               {
@@ -2698,8 +2831,8 @@
                     "Booking",
                     {
                       "emit": {
-                        "failure": "BookingLoadFailed",
-                        "success": "BookingLoaded"
+                        "success": "BookingLoaded",
+                        "failure": "BookingLoadFailed"
                       }
                     }
                   ],
@@ -2707,70 +2840,68 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "BookingSystemApp",
                       "navItems": [
                         {
                           "label": "Providers",
-                          "href": "/providers",
-                          "icon": "user-check"
+                          "icon": "user-check",
+                          "href": "/providers"
                         },
                         {
-                          "icon": "calendar-plus",
                           "href": "/book",
-                          "label": "Book"
+                          "label": "Book",
+                          "icon": "calendar-plus"
                         },
                         {
+                          "icon": "calendar",
                           "label": "Appointments",
-                          "href": "/appointments",
-                          "icon": "calendar"
+                          "href": "/appointments"
                         },
                         {
-                          "href": "/schedule",
                           "label": "Schedule",
+                          "href": "/schedule",
                           "icon": "clock"
                         }
                       ],
+                      "type": "dashboard-layout",
+                      "appName": "BookingSystemApp",
                       "children": [
                         {
-                          "type": "container",
-                          "padding": "lg",
                           "maxWidth": "lg",
+                          "type": "container",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
                               "gap": "lg",
                               "children": [
                                 {
-                                  "direction": "horizontal",
-                                  "type": "stack",
                                   "gap": "sm",
+                                  "type": "stack",
+                                  "align": "center",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "calendar"
                                     },
                                     {
-                                      "variant": "h2",
                                       "type": "typography",
-                                      "content": "Book Appointment"
+                                      "content": "Book Appointment",
+                                      "variant": "h2"
                                     }
                                   ],
-                                  "align": "center"
+                                  "direction": "horizontal"
                                 },
                                 {
-                                  "currentIndex": 1.0,
                                   "type": "progress-dots",
-                                  "count": 3.0
+                                  "count": 3.0,
+                                  "currentIndex": 1.0
                                 },
                                 {
+                                  "currentStep": 1.0,
                                   "type": "wizard-progress",
                                   "steps": [
                                     "Provider Selection",
                                     "Your Details",
                                     "Date and Time"
-                                  ],
-                                  "currentStep": 1.0
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -2781,43 +2912,45 @@
                                   "type": "typography"
                                 },
                                 {
-                                  "type": "form-section",
-                                  "submitEvent": "NEXT",
-                                  "mode": "create",
-                                  "cancelEvent": "PREV",
                                   "fields": [
                                     "customerName",
                                     "customerEmail"
-                                  ]
+                                  ],
+                                  "mode": "create",
+                                  "submitEvent": "NEXT",
+                                  "type": "form-section",
+                                  "cancelEvent": "PREV"
                                 },
                                 {
+                                  "type": "stack",
                                   "direction": "horizontal",
+                                  "justify": "end",
                                   "gap": "sm",
                                   "children": [
                                     {
+                                      "icon": "arrow-left",
                                       "label": "Back",
-                                      "variant": "ghost",
                                       "action": "PREV",
-                                      "icon": "arrow-left",
-                                      "type": "button"
+                                      "type": "button",
+                                      "variant": "ghost"
                                     },
                                     {
-                                      "label": "Next",
-                                      "icon": "arrow-right",
                                       "variant": "primary",
                                       "action": "NEXT",
-                                      "type": "button"
+                                      "icon": "arrow-right",
+                                      "type": "button",
+                                      "label": "Next"
                                     }
-                                  ],
-                                  "justify": "end",
-                                  "type": "stack"
+                                  ]
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "direction": "vertical"
                             }
-                          ]
+                          ],
+                          "padding": "lg"
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -2832,8 +2965,8 @@
                     "Booking",
                     {
                       "emit": {
-                        "failure": "BookingLoadFailed",
-                        "success": "BookingLoaded"
+                        "success": "BookingLoaded",
+                        "failure": "BookingLoadFailed"
                       }
                     }
                   ],
@@ -2841,58 +2974,36 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Providers",
-                          "href": "/providers",
-                          "icon": "user-check"
-                        },
-                        {
-                          "label": "Book",
-                          "href": "/book",
-                          "icon": "calendar-plus"
-                        },
-                        {
-                          "href": "/appointments",
-                          "icon": "calendar",
-                          "label": "Appointments"
-                        },
-                        {
-                          "icon": "clock",
-                          "label": "Schedule",
-                          "href": "/schedule"
-                        }
-                      ],
                       "children": [
                         {
-                          "padding": "lg",
-                          "type": "container",
                           "maxWidth": "lg",
+                          "padding": "lg",
                           "children": [
                             {
                               "type": "stack",
+                              "gap": "lg",
+                              "direction": "vertical",
                               "children": [
                                 {
+                                  "direction": "horizontal",
                                   "type": "stack",
+                                  "gap": "sm",
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "name": "calendar",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "calendar"
                                     },
                                     {
+                                      "variant": "h2",
                                       "type": "typography",
-                                      "content": "Book Appointment",
-                                      "variant": "h2"
+                                      "content": "Book Appointment"
                                     }
-                                  ],
-                                  "align": "center",
-                                  "gap": "sm",
-                                  "direction": "horizontal"
+                                  ]
                                 },
                                 {
-                                  "currentIndex": 2.0,
                                   "type": "progress-dots",
+                                  "currentIndex": 2.0,
                                   "count": 3.0
                                 },
                                 {
@@ -2901,55 +3012,77 @@
                                     "Your Details",
                                     "Date and Time"
                                   ],
-                                  "currentStep": 2.0,
-                                  "type": "wizard-progress"
+                                  "type": "wizard-progress",
+                                  "currentStep": 2.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "variant": "h3",
                                   "type": "typography",
+                                  "variant": "h3",
                                   "content": "Date and Time"
                                 },
                                 {
+                                  "type": "form-section",
                                   "fields": [
                                     "date",
                                     "time",
                                     "notes"
                                   ],
                                   "submitEvent": "NEXT",
-                                  "type": "form-section",
                                   "mode": "create",
                                   "cancelEvent": "PREV"
                                 },
                                 {
-                                  "type": "stack",
-                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "icon": "arrow-left",
-                                      "action": "PREV",
                                       "type": "button",
+                                      "action": "PREV",
                                       "variant": "ghost",
-                                      "label": "Back"
+                                      "label": "Back",
+                                      "icon": "arrow-left"
                                     },
                                     {
-                                      "action": "NEXT",
-                                      "label": "Next",
-                                      "variant": "primary",
                                       "icon": "arrow-right",
+                                      "variant": "primary",
+                                      "label": "Next",
+                                      "action": "NEXT",
                                       "type": "button"
                                     }
                                   ],
                                   "justify": "end",
+                                  "type": "stack",
+                                  "gap": "sm",
                                   "direction": "horizontal"
                                 }
-                              ],
-                              "gap": "lg",
-                              "direction": "vertical"
+                              ]
                             }
-                          ]
+                          ],
+                          "type": "container"
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/providers",
+                          "label": "Providers",
+                          "icon": "user-check"
+                        },
+                        {
+                          "href": "/book",
+                          "label": "Book",
+                          "icon": "calendar-plus"
+                        },
+                        {
+                          "label": "Appointments",
+                          "icon": "calendar",
+                          "href": "/appointments"
+                        },
+                        {
+                          "icon": "clock",
+                          "label": "Schedule",
+                          "href": "/schedule"
                         }
                       ],
                       "appName": "BookingSystemApp"
@@ -2976,11 +3109,33 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/providers",
+                          "icon": "user-check",
+                          "label": "Providers"
+                        },
+                        {
+                          "icon": "calendar-plus",
+                          "href": "/book",
+                          "label": "Book"
+                        },
+                        {
+                          "label": "Appointments",
+                          "icon": "calendar",
+                          "href": "/appointments"
+                        },
+                        {
+                          "label": "Schedule",
+                          "href": "/schedule",
+                          "icon": "clock"
+                        }
+                      ],
+                      "appName": "BookingSystemApp",
                       "children": [
                         {
-                          "padding": "lg",
                           "type": "container",
+                          "maxWidth": "lg",
                           "children": [
                             {
                               "type": "stack",
@@ -2990,8 +3145,6 @@
                                 {
                                   "type": "stack",
                                   "direction": "horizontal",
-                                  "align": "center",
-                                  "gap": "sm",
                                   "children": [
                                     {
                                       "name": "calendar",
@@ -2999,24 +3152,26 @@
                                     },
                                     {
                                       "type": "typography",
-                                      "variant": "h2",
-                                      "content": "Book Appointment"
+                                      "content": "Book Appointment",
+                                      "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "align": "center",
+                                  "gap": "sm"
                                 },
                                 {
-                                  "type": "progress-dots",
+                                  "currentIndex": 0.0,
                                   "count": 3.0,
-                                  "currentIndex": 0.0
+                                  "type": "progress-dots"
                                 },
                                 {
                                   "currentStep": 0.0,
+                                  "type": "wizard-progress",
                                   "steps": [
                                     "Provider Selection",
                                     "Your Details",
                                     "Date and Time"
-                                  ],
-                                  "type": "wizard-progress"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -3027,10 +3182,10 @@
                                   "content": "Provider Selection"
                                 },
                                 {
+                                  "mode": "create",
+                                  "type": "form-section",
                                   "cancelEvent": "INIT",
                                   "submitEvent": "NEXT",
-                                  "type": "form-section",
-                                  "mode": "create",
                                   "fields": [
                                     "providerName"
                                   ]
@@ -3039,10 +3194,10 @@
                                   "justify": "end",
                                   "children": [
                                     {
-                                      "variant": "primary",
-                                      "label": "Next",
                                       "type": "button",
+                                      "label": "Next",
                                       "action": "NEXT",
+                                      "variant": "primary",
                                       "icon": "arrow-right"
                                     }
                                   ],
@@ -3053,32 +3208,10 @@
                               ]
                             }
                           ],
-                          "maxWidth": "lg"
+                          "padding": "lg"
                         }
                       ],
-                      "appName": "BookingSystemApp",
-                      "navItems": [
-                        {
-                          "label": "Providers",
-                          "icon": "user-check",
-                          "href": "/providers"
-                        },
-                        {
-                          "href": "/book",
-                          "label": "Book",
-                          "icon": "calendar-plus"
-                        },
-                        {
-                          "label": "Appointments",
-                          "icon": "calendar",
-                          "href": "/appointments"
-                        },
-                        {
-                          "label": "Schedule",
-                          "href": "/schedule",
-                          "icon": "clock"
-                        }
-                      ]
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3105,14 +3238,14 @@
                       "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "icon": "user-check",
                           "label": "Providers",
-                          "href": "/providers",
-                          "icon": "user-check"
+                          "href": "/providers"
                         },
                         {
-                          "href": "/book",
+                          "label": "Book",
                           "icon": "calendar-plus",
-                          "label": "Book"
+                          "href": "/book"
                         },
                         {
                           "label": "Appointments",
@@ -3120,98 +3253,98 @@
                           "icon": "calendar"
                         },
                         {
-                          "label": "Schedule",
                           "href": "/schedule",
-                          "icon": "clock"
+                          "icon": "clock",
+                          "label": "Schedule"
                         }
                       ],
                       "appName": "BookingSystemApp",
                       "children": [
                         {
-                          "type": "stack",
                           "children": [
                             {
-                              "direction": "horizontal",
                               "align": "center",
                               "type": "stack",
-                              "gap": "sm",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "calendar"
+                                  "name": "calendar",
+                                  "type": "icon"
                                 },
                                 {
                                   "variant": "h2",
                                   "type": "typography",
                                   "content": "Book Appointment"
                                 }
-                              ]
+                              ],
+                              "gap": "sm"
                             },
                             {
-                              "label": "Review",
-                              "type": "badge"
+                              "type": "badge",
+                              "label": "Review"
                             },
                             {
-                              "type": "wizard-progress",
-                              "currentStep": 3.0,
                               "steps": [
                                 "Provider Selection",
                                 "Your Details",
                                 "Date and Time"
-                              ]
+                              ],
+                              "type": "wizard-progress",
+                              "currentStep": 3.0
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "gap": "sm",
                               "children": [
                                 {
-                                  "justify": "between",
-                                  "gap": "md",
-                                  "type": "stack",
                                   "children": [
                                     {
                                       "variant": "caption",
-                                      "type": "typography",
-                                      "content": "Provider Name"
+                                      "content": "Provider Name",
+                                      "type": "typography"
                                     },
                                     {
                                       "type": "typography",
-                                      "variant": "body",
-                                      "content": "@entity.providerName"
+                                      "content": "@entity.providerName",
+                                      "variant": "body"
                                     }
                                   ],
-                                  "direction": "horizontal"
-                                },
-                                {
                                   "type": "stack",
-                                  "gap": "md",
                                   "justify": "between",
                                   "direction": "horizontal",
+                                  "gap": "md"
+                                },
+                                {
+                                  "gap": "md",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "content": "Customer Name",
+                                      "variant": "caption",
                                       "type": "typography",
-                                      "variant": "caption"
+                                      "content": "Customer Name"
                                     },
                                     {
+                                      "type": "typography",
                                       "variant": "body",
-                                      "content": "@entity.customerName",
-                                      "type": "typography"
+                                      "content": "@entity.customerName"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "justify": "between"
                                 },
                                 {
                                   "children": [
                                     {
-                                      "type": "typography",
                                       "content": "Customer Email",
-                                      "variant": "caption"
+                                      "variant": "caption",
+                                      "type": "typography"
                                     },
                                     {
+                                      "content": "@entity.customerEmail",
                                       "type": "typography",
-                                      "variant": "body",
-                                      "content": "@entity.customerEmail"
+                                      "variant": "body"
                                     }
                                   ],
                                   "gap": "md",
@@ -3223,42 +3356,42 @@
                                   "justify": "between",
                                   "direction": "horizontal",
                                   "type": "stack",
-                                  "gap": "md",
                                   "children": [
                                     {
-                                      "variant": "caption",
                                       "content": "Date",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "variant": "caption"
                                     },
                                     {
                                       "type": "typography",
-                                      "content": "@entity.date",
-                                      "variant": "body"
+                                      "variant": "body",
+                                      "content": "@entity.date"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md"
                                 },
                                 {
                                   "direction": "horizontal",
                                   "type": "stack",
-                                  "gap": "md",
-                                  "justify": "between",
                                   "children": [
                                     {
                                       "variant": "caption",
-                                      "type": "typography",
-                                      "content": "Time"
+                                      "content": "Time",
+                                      "type": "typography"
                                     },
                                     {
-                                      "content": "@entity.time",
                                       "type": "typography",
+                                      "content": "@entity.time",
                                       "variant": "body"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "justify": "between"
                                 },
                                 {
+                                  "justify": "between",
                                   "gap": "md",
                                   "type": "stack",
-                                  "justify": "between",
                                   "children": [
                                     {
                                       "variant": "caption",
@@ -3274,21 +3407,21 @@
                                   "direction": "horizontal"
                                 }
                               ],
-                              "type": "stack",
                               "direction": "vertical",
-                              "gap": "sm"
-                            },
-                            {
-                              "currentStep": 3.0,
-                              "showNext": false,
-                              "showComplete": true,
+                              "type": "stack"
+                            },
+                            {
                               "totalSteps": 4.0,
                               "showBack": true,
+                              "showComplete": true,
+                              "showNext": false,
+                              "currentStep": 3.0,
                               "type": "wizard-navigation"
                             }
                           ],
+                          "direction": "vertical",
                           "gap": "lg",
-                          "direction": "vertical"
+                          "type": "stack"
                         }
                       ]
                     }
@@ -3314,115 +3447,115 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
                       "appName": "BookingSystemApp",
                       "navItems": [
                         {
-                          "href": "/providers",
                           "icon": "user-check",
-                          "label": "Providers"
+                          "label": "Providers",
+                          "href": "/providers"
                         },
                         {
-                          "icon": "calendar-plus",
+                          "label": "Book",
                           "href": "/book",
-                          "label": "Book"
+                          "icon": "calendar-plus"
                         },
                         {
+                          "label": "Appointments",
                           "href": "/appointments",
-                          "icon": "calendar",
-                          "label": "Appointments"
+                          "icon": "calendar"
                         },
                         {
                           "href": "/schedule",
-                          "label": "Schedule",
-                          "icon": "clock"
+                          "icon": "clock",
+                          "label": "Schedule"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "padding": "lg",
                           "type": "container",
+                          "maxWidth": "lg",
+                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
+                              "gap": "lg",
                               "direction": "vertical",
                               "children": [
                                 {
-                                  "gap": "sm",
                                   "type": "stack",
                                   "direction": "horizontal",
-                                  "align": "center",
                                   "children": [
                                     {
-                                      "name": "calendar",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "calendar"
                                     },
                                     {
+                                      "type": "typography",
                                       "content": "Book Appointment",
-                                      "variant": "h2",
-                                      "type": "typography"
+                                      "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "align": "center",
+                                  "gap": "sm"
                                 },
                                 {
-                                  "type": "progress-dots",
                                   "count": 3.0,
-                                  "currentIndex": 1.0
+                                  "currentIndex": 1.0,
+                                  "type": "progress-dots"
                                 },
                                 {
+                                  "currentStep": 1.0,
                                   "type": "wizard-progress",
                                   "steps": [
                                     "Provider Selection",
                                     "Your Details",
                                     "Date and Time"
-                                  ],
-                                  "currentStep": 1.0
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "h3",
+                                  "type": "typography",
                                   "content": "Your Details"
                                 },
                                 {
-                                  "mode": "create",
                                   "submitEvent": "NEXT",
+                                  "type": "form-section",
+                                  "mode": "create",
                                   "fields": [
                                     "customerName",
                                     "customerEmail"
                                   ],
-                                  "type": "form-section",
                                   "cancelEvent": "PREV"
                                 },
                                 {
-                                  "gap": "sm",
                                   "direction": "horizontal",
-                                  "type": "stack",
+                                  "gap": "sm",
                                   "justify": "end",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "label": "Back",
-                                      "action": "PREV",
-                                      "type": "button",
                                       "variant": "ghost",
-                                      "icon": "arrow-left"
+                                      "type": "button",
+                                      "label": "Back",
+                                      "icon": "arrow-left",
+                                      "action": "PREV"
                                     },
                                     {
-                                      "action": "NEXT",
-                                      "label": "Next",
                                       "type": "button",
-                                      "variant": "primary",
-                                      "icon": "arrow-right"
+                                      "label": "Next",
+                                      "action": "NEXT",
+                                      "icon": "arrow-right",
+                                      "variant": "primary"
                                     }
                                   ]
                                 }
                               ],
-                              "gap": "lg"
+                              "type": "stack"
                             }
-                          ],
-                          "maxWidth": "lg"
+                          ]
                         }
                       ]
                     }
@@ -3450,18 +3583,18 @@
                     {
                       "navItems": [
                         {
-                          "icon": "user-check",
                           "label": "Providers",
-                          "href": "/providers"
+                          "href": "/providers",
+                          "icon": "user-check"
                         },
                         {
-                          "href": "/book",
                           "icon": "calendar-plus",
-                          "label": "Book"
+                          "label": "Book",
+                          "href": "/book"
                         },
                         {
-                          "label": "Appointments",
                           "icon": "calendar",
+                          "label": "Appointments",
                           "href": "/appointments"
                         },
                         {
@@ -3470,17 +3603,13 @@
                           "href": "/schedule"
                         }
                       ],
-                      "appName": "BookingSystemApp",
-                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "maxWidth": "lg",
                           "type": "container",
                           "padding": "lg",
                           "children": [
                             {
-                              "direction": "vertical",
-                              "type": "stack",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "children": [
@@ -3495,9 +3624,9 @@
                                     }
                                   ],
                                   "gap": "sm",
-                                  "align": "center",
                                   "direction": "horizontal",
-                                  "type": "stack"
+                                  "type": "stack",
+                                  "align": "center"
                                 },
                                 {
                                   "count": 3.0,
@@ -3505,13 +3634,13 @@
                                   "type": "progress-dots"
                                 },
                                 {
+                                  "currentStep": 2.0,
                                   "type": "wizard-progress",
                                   "steps": [
                                     "Provider Selection",
                                     "Your Details",
                                     "Date and Time"
-                                  ],
-                                  "currentStep": 2.0
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -3522,44 +3651,48 @@
                                   "type": "typography"
                                 },
                                 {
-                                  "type": "form-section",
                                   "mode": "create",
-                                  "cancelEvent": "PREV",
                                   "submitEvent": "NEXT",
                                   "fields": [
                                     "date",
                                     "time",
                                     "notes"
-                                  ]
+                                  ],
+                                  "cancelEvent": "PREV",
+                                  "type": "form-section"
                                 },
                                 {
                                   "gap": "sm",
-                                  "direction": "horizontal",
                                   "type": "stack",
+                                  "direction": "horizontal",
                                   "justify": "end",
                                   "children": [
                                     {
-                                      "action": "PREV",
-                                      "variant": "ghost",
                                       "type": "button",
+                                      "variant": "ghost",
+                                      "action": "PREV",
                                       "label": "Back",
                                       "icon": "arrow-left"
                                     },
                                     {
-                                      "action": "NEXT",
-                                      "icon": "arrow-right",
                                       "variant": "primary",
+                                      "action": "NEXT",
+                                      "label": "Next",
                                       "type": "button",
-                                      "label": "Next"
+                                      "icon": "arrow-right"
                                     }
                                   ]
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "gap": "lg",
+                              "direction": "vertical"
                             }
-                          ],
-                          "maxWidth": "lg"
+                          ]
                         }
-                      ]
+                      ],
+                      "appName": "BookingSystemApp",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3590,21 +3723,21 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "BookingSystemApp",
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "stack",
+                          "direction": "vertical",
                           "align": "center",
+                          "gap": "lg",
                           "children": [
                             {
-                              "name": "check-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "check-circle"
                             },
                             {
-                              "content": "Booking Confirmed",
+                              "type": "typography",
                               "variant": "h2",
-                              "type": "typography"
+                              "content": "Booking Confirmed"
                             },
                             {
                               "content": "Your appointment has been booked successfully.",
@@ -3612,36 +3745,36 @@
                               "variant": "body"
                             },
                             {
-                              "variant": "primary",
+                              "type": "button",
+                              "label": "Start New",
                               "action": "RESTART",
                               "icon": "refresh-cw",
-                              "label": "Start New",
-                              "type": "button"
+                              "variant": "primary"
                             }
-                          ],
-                          "direction": "vertical",
-                          "gap": "lg"
+                          ]
                         }
                       ],
+                      "appName": "BookingSystemApp",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "icon": "user-check",
-                          "href": "/providers",
-                          "label": "Providers"
+                          "label": "Providers",
+                          "href": "/providers"
                         },
                         {
-                          "icon": "calendar-plus",
                           "label": "Book",
-                          "href": "/book"
+                          "href": "/book",
+                          "icon": "calendar-plus"
                         },
                         {
-                          "icon": "calendar",
                           "href": "/appointments",
+                          "icon": "calendar",
                           "label": "Appointments"
                         },
                         {
-                          "label": "Schedule",
                           "icon": "clock",
+                          "label": "Schedule",
                           "href": "/schedule"
                         }
                       ]
@@ -3659,8 +3792,8 @@
                     "Booking",
                     {
                       "emit": {
-                        "failure": "BookingLoadFailed",
-                        "success": "BookingLoaded"
+                        "success": "BookingLoaded",
+                        "failure": "BookingLoadFailed"
                       }
                     }
                   ],
@@ -3668,6 +3801,8 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "BookingSystemApp",
                       "navItems": [
                         {
                           "label": "Providers",
@@ -3680,50 +3815,45 @@
                           "icon": "calendar-plus"
                         },
                         {
-                          "href": "/appointments",
                           "label": "Appointments",
+                          "href": "/appointments",
                           "icon": "calendar"
                         },
                         {
-                          "label": "Schedule",
                           "icon": "clock",
-                          "href": "/schedule"
+                          "href": "/schedule",
+                          "label": "Schedule"
                         }
                       ],
-                      "appName": "BookingSystemApp",
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "container",
-                          "padding": "lg",
-                          "maxWidth": "lg",
                           "children": [
                             {
                               "type": "stack",
                               "gap": "lg",
-                              "direction": "vertical",
                               "children": [
                                 {
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "calendar"
+                                      "name": "calendar",
+                                      "type": "icon"
                                     },
                                     {
+                                      "variant": "h2",
                                       "type": "typography",
-                                      "content": "Book Appointment",
-                                      "variant": "h2"
+                                      "content": "Book Appointment"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "align": "center",
                                   "gap": "sm",
+                                  "direction": "horizontal",
                                   "type": "stack"
                                 },
                                 {
+                                  "currentIndex": 0.0,
                                   "type": "progress-dots",
-                                  "count": 3.0,
-                                  "currentIndex": 0.0
+                                  "count": 3.0
                                 },
                                 {
                                   "currentStep": 0.0,
@@ -3738,37 +3868,40 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "h3",
-                                  "content": "Provider Selection"
+                                  "content": "Provider Selection",
+                                  "type": "typography"
                                 },
                                 {
-                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "INIT",
                                   "mode": "create",
+                                  "submitEvent": "NEXT",
                                   "type": "form-section",
-                                  "cancelEvent": "INIT",
                                   "fields": [
                                     "providerName"
                                   ]
                                 },
                                 {
-                                  "justify": "end",
                                   "type": "stack",
+                                  "direction": "horizontal",
                                   "gap": "sm",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "icon": "arrow-right",
-                                      "label": "Next",
                                       "action": "NEXT",
-                                      "variant": "primary"
+                                      "label": "Next",
+                                      "icon": "arrow-right",
+                                      "variant": "primary",
+                                      "type": "button"
                                     }
-                                  ],
-                                  "direction": "horizontal"
+                                  ]
                                 }
-                              ]
+                              ],
+                              "direction": "vertical"
                             }
-                          ]
+                          ],
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ]
                     }
@@ -3794,109 +3927,109 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "BookingSystemApp",
+                      "navItems": [
+                        {
+                          "icon": "user-check",
+                          "label": "Providers",
+                          "href": "/providers"
+                        },
+                        {
+                          "icon": "calendar-plus",
+                          "label": "Book",
+                          "href": "/book"
+                        },
+                        {
+                          "icon": "calendar",
+                          "href": "/appointments",
+                          "label": "Appointments"
+                        },
+                        {
+                          "href": "/schedule",
+                          "icon": "clock",
+                          "label": "Schedule"
+                        }
+                      ],
                       "children": [
                         {
-                          "padding": "lg",
                           "maxWidth": "lg",
-                          "type": "container",
+                          "padding": "lg",
                           "children": [
                             {
+                              "direction": "vertical",
+                              "gap": "lg",
                               "children": [
                                 {
-                                  "gap": "sm",
+                                  "type": "stack",
+                                  "align": "center",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "calendar"
                                     },
                                     {
-                                      "variant": "h2",
                                       "content": "Book Appointment",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "variant": "h2"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "align": "center"
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 },
                                 {
-                                  "currentIndex": 0.0,
+                                  "count": 3.0,
                                   "type": "progress-dots",
-                                  "count": 3.0
+                                  "currentIndex": 0.0
                                 },
                                 {
                                   "currentStep": 0.0,
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Provider Selection",
                                     "Your Details",
                                     "Date and Time"
-                                  ]
+                                  ],
+                                  "type": "wizard-progress"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Provider Selection",
-                                  "variant": "h3"
+                                  "variant": "h3",
+                                  "type": "typography"
                                 },
                                 {
-                                  "type": "form-section",
+                                  "submitEvent": "NEXT",
                                   "cancelEvent": "INIT",
                                   "fields": [
                                     "providerName"
                                   ],
-                                  "submitEvent": "NEXT",
+                                  "type": "form-section",
                                   "mode": "create"
                                 },
                                 {
-                                  "gap": "sm",
+                                  "type": "stack",
                                   "direction": "horizontal",
+                                  "gap": "sm",
                                   "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "action": "NEXT",
                                       "variant": "primary",
+                                      "type": "button",
                                       "label": "Next",
+                                      "action": "NEXT",
                                       "icon": "arrow-right"
                                     }
-                                  ],
-                                  "type": "stack"
+                                  ]
                                 }
                               ],
-                              "type": "stack",
-                              "gap": "lg",
-                              "direction": "vertical"
+                              "type": "stack"
                             }
-                          ]
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Providers",
-                          "href": "/providers",
-                          "icon": "user-check"
-                        },
-                        {
-                          "label": "Book",
-                          "href": "/book",
-                          "icon": "calendar-plus"
-                        },
-                        {
-                          "icon": "calendar",
-                          "href": "/appointments",
-                          "label": "Appointments"
-                        },
-                        {
-                          "label": "Schedule",
-                          "icon": "clock",
-                          "href": "/schedule"
+                          ],
+                          "type": "container"
                         }
                       ],
-                      "appName": "BookingSystemApp"
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -4242,21 +4375,21 @@
                     "main",
                     {
                       "className": "py-12",
+                      "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical",
+                      "align": "center",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
+                          "color": "muted",
                           "variant": "caption",
-                          "content": "Loading…",
-                          "color": "muted"
+                          "type": "typography",
+                          "content": "Loading…"
                         }
-                      ],
-                      "direction": "vertical",
-                      "gap": "md",
-                      "align": "center",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -4270,94 +4403,71 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/providers",
-                          "icon": "user-check",
-                          "label": "Providers"
-                        },
-                        {
-                          "label": "Book",
-                          "href": "/book",
-                          "icon": "calendar-plus"
-                        },
-                        {
-                          "href": "/appointments",
-                          "icon": "calendar",
-                          "label": "Appointments"
-                        },
-                        {
-                          "label": "Schedule",
-                          "href": "/schedule",
-                          "icon": "clock"
-                        }
-                      ],
                       "children": [
                         {
-                          "className": "max-w-5xl mx-auto w-full",
                           "direction": "vertical",
                           "gap": "lg",
-                          "type": "stack",
                           "children": [
                             {
-                              "type": "stack",
+                              "gap": "md",
+                              "justify": "between",
+                              "align": "center",
                               "children": [
                                 {
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "clock"
                                     },
                                     {
-                                      "content": "Appointments",
                                       "type": "typography",
+                                      "content": "Appointments",
                                       "variant": "h2"
                                     }
                                   ],
-                                  "gap": "sm",
                                   "align": "center",
-                                  "type": "stack",
+                                  "gap": "sm",
                                   "direction": "horizontal"
                                 },
                                 {
+                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "action": "CREATE",
                                       "type": "button",
-                                      "label": "Create Appointment",
                                       "variant": "primary",
-                                      "icon": "plus"
+                                      "icon": "plus",
+                                      "label": "Create Appointment",
+                                      "action": "CREATE"
                                     }
-                                  ],
-                                  "type": "stack",
-                                  "gap": "sm",
-                                  "direction": "horizontal"
+                                  ]
                                 }
                               ],
-                              "justify": "between",
-                              "gap": "md",
-                              "align": "center",
-                              "direction": "horizontal"
+                              "direction": "horizontal",
+                              "type": "stack"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "type": "data-list",
                               "fields": [
                                 {
-                                  "icon": "clock",
-                                  "variant": "h3",
+                                  "name": "customerName",
                                   "label": "Customer",
-                                  "name": "customerName"
+                                  "variant": "h3",
+                                  "icon": "clock"
                                 },
                                 {
                                   "name": "status",
                                   "variant": "badge"
                                 },
                                 {
-                                  "label": "Provider",
                                   "variant": "body",
-                                  "name": "providerName"
+                                  "name": "providerName",
+                                  "label": "Provider"
                                 },
                                 {
                                   "name": "date",
@@ -4365,10 +4475,11 @@
                                   "variant": "body"
                                 },
                                 {
-                                  "name": "time",
-                                  "variant": "caption"
+                                  "variant": "caption",
+                                  "name": "time"
                                 }
                               ],
+                              "gap": "sm",
                               "itemActions": [
                                 {
                                   "variant": "ghost",
@@ -4376,26 +4487,48 @@
                                   "event": "VIEW"
                                 },
                                 {
+                                  "event": "EDIT",
                                   "variant": "ghost",
-                                  "label": "Edit",
-                                  "event": "EDIT"
+                                  "label": "Edit"
                                 },
                                 {
+                                  "label": "Delete",
                                   "event": "DELETE",
-                                  "variant": "danger",
-                                  "label": "Delete"
+                                  "variant": "danger"
                                 }
                               ],
                               "variant": "card",
-                              "gap": "sm",
-                              "entity": "@payload.data",
-                              "type": "data-list"
+                              "entity": "@payload.data"
                             }
-                          ]
+                          ],
+                          "className": "max-w-5xl mx-auto w-full",
+                          "type": "stack"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "appName": "BookingSystemApp",
-                      "type": "dashboard-layout"
+                      "navItems": [
+                        {
+                          "icon": "user-check",
+                          "label": "Providers",
+                          "href": "/providers"
+                        },
+                        {
+                          "label": "Book",
+                          "href": "/book",
+                          "icon": "calendar-plus"
+                        },
+                        {
+                          "label": "Appointments",
+                          "href": "/appointments",
+                          "icon": "calendar"
+                        },
+                        {
+                          "label": "Schedule",
+                          "href": "/schedule",
+                          "icon": "clock"
+                        }
+                      ]
                     }
                   ]
                 ]
@@ -4409,36 +4542,36 @@
                     "render-ui",
                     "main",
                     {
+                      "direction": "vertical",
                       "children": [
                         {
-                          "name": "alert-triangle",
                           "type": "icon",
+                          "name": "alert-triangle",
                           "color": "destructive"
                         },
                         {
                           "content": "Failed to load appointment",
-                          "variant": "h3",
-                          "type": "typography"
+                          "type": "typography",
+                          "variant": "h3"
                         },
                         {
+                          "color": "muted",
                           "content": "@payload.error",
                           "type": "typography",
-                          "color": "muted",
                           "variant": "body"
                         },
                         {
+                          "icon": "rotate-ccw",
+                          "label": "Retry",
                           "type": "button",
-                          "action": "INIT",
                           "variant": "primary",
-                          "label": "Retry",
-                          "icon": "rotate-ccw"
+                          "action": "INIT"
                         }
                       ],
-                      "align": "center",
-                      "className": "py-12",
                       "gap": "md",
+                      "align": "center",
                       "type": "stack",
-                      "direction": "vertical"
+                      "className": "py-12"
                     }
                   ]
                 ]
@@ -4639,12 +4772,14 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
                       "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
-                          "direction": "horizontal",
                           "gap": "sm",
+                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "icon",
@@ -4652,20 +4787,19 @@
                             },
                             {
                               "type": "typography",
-                              "content": "Create Appointment",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "Create Appointment"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "submitEvent": "SAVE",
-                          "type": "form-section",
                           "mode": "create",
                           "cancelEvent": "CLOSE",
+                          "type": "form-section",
                           "fields": [
                             "providerName",
                             "customerName",
@@ -4675,8 +4809,7 @@
                             "notes"
                           ]
                         }
-                      ],
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -4955,31 +5088,30 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
+                          "gap": "sm",
                           "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
                               "type": "icon",
                               "name": "edit"
                             },
                             {
-                              "type": "typography",
                               "variant": "h3",
-                              "content": "Edit Appointment"
+                              "content": "Edit Appointment",
+                              "type": "typography"
                             }
-                          ],
-                          "type": "stack",
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "submitEvent": "SAVE",
-                          "entity": "@payload.row",
-                          "cancelEvent": "CLOSE",
-                          "type": "form-section",
+                          "mode": "edit",
                           "fields": [
                             "providerName",
                             "customerName",
@@ -4988,12 +5120,13 @@
                             "status",
                             "notes"
                           ],
-                          "mode": "edit"
+                          "entity": "@payload.row",
+                          "type": "form-section",
+                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE"
                         }
                       ],
-                      "direction": "vertical",
-                      "type": "stack",
-                      "gap": "md"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -5034,8 +5167,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "AppointmentUpdated",
-                        "failure": "AppointmentUpdateFailed"
+                        "failure": "AppointmentUpdateFailed",
+                        "success": "AppointmentUpdated"
                       }
                     }
                   ],
@@ -5233,8 +5366,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "AppointmentLoaded",
-                        "failure": "AppointmentLoadFailed"
+                        "failure": "AppointmentLoadFailed",
+                        "success": "AppointmentLoaded"
                       }
                     }
                   ],
@@ -5242,53 +5375,53 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
+                      "type": "stack",
                       "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "align": "center",
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm",
                           "children": [
                             {
-                              "name": "eye",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "eye"
                             },
                             {
-                              "type": "typography",
                               "variant": "h3",
-                              "content": "@entity.providerName"
+                              "content": "@entity.providerName",
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "align": "center",
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "gap": "md",
-                          "type": "stack",
-                          "direction": "horizontal",
                           "children": [
                             {
+                              "content": "Provider Name",
                               "type": "typography",
-                              "variant": "caption",
-                              "content": "Provider Name"
+                              "variant": "caption"
                             },
                             {
-                              "content": "@entity.providerName",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.providerName"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
-                          "type": "stack",
                           "children": [
                             {
                               "type": "typography",
-                              "content": "Customer Name",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "content": "Customer Name"
                             },
                             {
                               "type": "typography",
@@ -5296,29 +5429,31 @@
                               "content": "@entity.customerName"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "md"
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "stack",
-                          "direction": "horizontal",
                           "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
+                              "type": "typography",
                               "content": "Date",
-                              "variant": "caption",
-                              "type": "typography"
+                              "variant": "caption"
                             },
                             {
-                              "type": "typography",
+                              "variant": "body",
                               "content": "@entity.date",
-                              "variant": "body"
+                              "type": "typography"
                             }
                           ]
                         },
                         {
                           "gap": "md",
                           "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "variant": "caption",
@@ -5326,46 +5461,45 @@
                               "type": "typography"
                             },
                             {
-                              "content": "@entity.time",
                               "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.time"
                             }
-                          ],
-                          "direction": "horizontal"
+                          ]
                         },
                         {
-                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
+                              "type": "typography",
                               "content": "Status"
                             },
                             {
+                              "variant": "body",
                               "content": "@entity.status",
-                              "type": "typography",
-                              "variant": "body"
+                              "type": "typography"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          "gap": "md",
+                          "type": "stack"
                         },
                         {
-                          "gap": "md",
                           "type": "stack",
                           "children": [
                             {
-                              "type": "typography",
+                              "content": "Notes",
                               "variant": "caption",
-                              "content": "Notes"
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.notes",
                               "type": "typography",
+                              "content": "@entity.notes",
                               "variant": "body"
                             }
                           ],
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
                           "type": "divider"
@@ -5377,22 +5511,21 @@
                           "justify": "end",
                           "children": [
                             {
+                              "type": "button",
+                              "icon": "edit",
                               "action": "EDIT",
                               "label": "Edit",
-                              "icon": "edit",
-                              "variant": "primary",
-                              "type": "button"
+                              "variant": "primary"
                             },
                             {
-                              "label": "Close",
+                              "variant": "ghost",
                               "type": "button",
-                              "action": "CLOSE",
-                              "variant": "ghost"
+                              "label": "Close",
+                              "action": "CLOSE"
                             }
                           ]
                         }
-                      ],
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -5614,8 +5747,8 @@
                     "Appointment",
                     {
                       "emit": {
-                        "failure": "AppointmentLoadFailed",
-                        "success": "AppointmentLoaded"
+                        "success": "AppointmentLoaded",
+                        "failure": "AppointmentLoadFailed"
                       }
                     }
                   ]
@@ -5635,68 +5768,68 @@
                     "fetch",
                     "Appointment",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "failure": "AppointmentLoadFailed",
                         "success": "AppointmentLoaded"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
+                      "direction": "vertical",
                       "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
-                          "align": "center",
+                          "type": "stack",
                           "children": [
                             {
                               "name": "alert-triangle",
                               "type": "icon"
                             },
                             {
-                              "type": "typography",
                               "content": "Delete Appointment",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             }
                           ],
+                          "align": "center",
                           "direction": "horizontal",
-                          "type": "stack",
                           "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
                           "message": "This action cannot be undone.",
-                          "type": "alert"
+                          "type": "alert",
+                          "variant": "error"
                         },
                         {
                           "justify": "end",
-                          "direction": "horizontal",
+                          "gap": "sm",
                           "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "ghost",
                               "action": "CANCEL",
                               "type": "button",
+                              "variant": "ghost",
                               "label": "Cancel"
                             },
                             {
+                              "icon": "check",
                               "variant": "danger",
-                              "type": "button",
                               "action": "CONFIRM_DELETE",
-                              "icon": "check",
+                              "type": "button",
                               "label": "Delete"
                             }
-                          ],
-                          "gap": "sm"
+                          ]
                         }
-                      ],
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -5735,8 +5868,8 @@
                     "Appointment",
                     {
                       "emit": {
-                        "success": "AppointmentLoaded",
-                        "failure": "AppointmentLoadFailed"
+                        "failure": "AppointmentLoadFailed",
+                        "success": "AppointmentLoaded"
                       }
                     }
                   ],
@@ -5981,8 +6114,8 @@
                     "Schedule",
                     {
                       "emit": {
-                        "success": "ScheduleLoaded",
-                        "failure": "ScheduleLoadFailed"
+                        "failure": "ScheduleLoadFailed",
+                        "success": "ScheduleLoaded"
                       }
                     }
                   ],
@@ -5990,38 +6123,10 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "label": "Providers",
-                          "href": "/providers",
-                          "icon": "user-check"
-                        },
-                        {
-                          "icon": "calendar-plus",
-                          "label": "Book",
-                          "href": "/book"
-                        },
-                        {
-                          "label": "Appointments",
-                          "href": "/appointments",
-                          "icon": "calendar"
-                        },
-                        {
-                          "icon": "clock",
-                          "href": "/schedule",
-                          "label": "Schedule"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "BookingSystemApp",
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -6037,40 +6142,39 @@
                                 },
                                 {
                                   "type": "stack",
+                                  "gap": "md",
                                   "justify": "between",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
+                                      "type": "stack",
                                       "direction": "horizontal",
+                                      "gap": "md",
                                       "children": [
                                         {
                                           "type": "icon",
                                           "name": "bar-chart-2"
                                         },
                                         {
-                                          "content": "Schedule Overview",
                                           "type": "typography",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "content": "Schedule Overview"
                                         }
-                                      ],
-                                      "gap": "md",
-                                      "type": "stack"
+                                      ]
                                     },
                                     {
+                                      "action": "REFRESH",
                                       "label": "Refresh",
-                                      "variant": "secondary",
                                       "type": "button",
-                                      "icon": "refresh-cw",
-                                      "action": "REFRESH"
+                                      "variant": "secondary",
+                                      "icon": "refresh-cw"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
                                   "padding": "md",
                                   "children": [
                                     {
@@ -6078,35 +6182,34 @@
                                       "cols": 4.0,
                                       "children": [
                                         {
-                                          "type": "stat-display",
+                                          "value": "@entity.totalBookings",
                                           "label": "TotalBookings",
-                                          "value": "@entity.totalBookings"
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "label": "ConfirmedToday",
                                           "value": "@entity.confirmedToday",
-                                          "type": "stat-display",
-                                          "label": "ConfirmedToday"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "PendingBookings",
-                                          "value": "@entity.pendingBookings"
+                                          "value": "@entity.pendingBookings",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "AvailableSlots",
+                                          "type": "stat-display",
                                           "value": "@entity.availableSlots"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "cols": 2.0,
-                                  "type": "grid",
                                   "children": [
                                     {
                                       "type": "card",
@@ -6119,31 +6222,34 @@
                                       ]
                                     },
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "content": "Graph View",
+                                          "type": "typography",
                                           "variant": "caption"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     }
                                   ],
+                                  "cols": 2.0,
+                                  "type": "grid",
                                   "gap": "md"
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "value": 12.0,
                                       "date": "Jan"
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
@@ -6154,11 +6260,10 @@
                                       "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
                                   "items": [
@@ -6174,22 +6279,10 @@
                                   "type": "chart-legend"
                                 },
                                 {
-                                  "edges": [
-                                    {
-                                      "target": "b",
-                                      "source": "a"
-                                    },
-                                    {
-                                      "target": "c",
-                                      "source": "b"
-                                    }
-                                  ],
-                                  "height": 200.0,
-                                  "type": "graph-view",
                                   "nodes": [
                                     {
-                                      "id": "a",
-                                      "label": "Start"
+                                      "label": "Start",
+                                      "id": "a"
                                     },
                                     {
                                       "id": "b",
@@ -6200,13 +6293,53 @@
                                       "label": "End"
                                     }
                                   ],
-                                  "width": 400.0
+                                  "width": 400.0,
+                                  "height": 200.0,
+                                  "type": "graph-view",
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "target": "c",
+                                      "source": "b"
+                                    }
+                                  ]
                                 }
-                              ]
+                              ],
+                              "gap": "lg",
+                              "type": "stack",
+                              "direction": "vertical"
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "icon": "user-check",
+                          "label": "Providers",
+                          "href": "/providers"
+                        },
+                        {
+                          "label": "Book",
+                          "icon": "calendar-plus",
+                          "href": "/book"
+                        },
+                        {
+                          "href": "/appointments",
+                          "label": "Appointments",
+                          "icon": "calendar"
+                        },
+                        {
+                          "label": "Schedule",
+                          "href": "/schedule",
+                          "icon": "clock"
+                        }
+                      ],
+                      "appName": "BookingSystemApp"
                     }
                   ]
                 ]
@@ -6221,8 +6354,8 @@
                     "Schedule",
                     {
                       "emit": {
-                        "failure": "ScheduleLoadFailed",
-                        "success": "ScheduleLoaded"
+                        "success": "ScheduleLoaded",
+                        "failure": "ScheduleLoadFailed"
                       }
                     }
                   ],
@@ -6230,42 +6363,41 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "icon": "user-check",
                           "label": "Providers",
-                          "href": "/providers"
+                          "href": "/providers",
+                          "icon": "user-check"
                         },
                         {
-                          "label": "Book",
-                          "href": "/book",
-                          "icon": "calendar-plus"
+                          "label": "Book",
+                          "icon": "calendar-plus",
+                          "href": "/book"
                         },
                         {
+                          "label": "Appointments",
                           "icon": "calendar",
-                          "href": "/appointments",
-                          "label": "Appointments"
+                          "href": "/appointments"
                         },
                         {
                           "label": "Schedule",
-                          "href": "/schedule",
-                          "icon": "clock"
+                          "icon": "clock",
+                          "href": "/schedule"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "children": [
                             {
-                              "gap": "lg",
-                              "type": "stack",
                               "direction": "vertical",
+                              "type": "stack",
                               "children": [
                                 {
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Schedule Overview"
@@ -6274,43 +6406,44 @@
                                   "type": "breadcrumb"
                                 },
                                 {
-                                  "type": "stack",
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "stack",
                                       "children": [
                                         {
-                                          "name": "bar-chart-2",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "bar-chart-2"
                                         },
                                         {
+                                          "content": "Schedule Overview",
                                           "variant": "h2",
-                                          "type": "typography",
-                                          "content": "Schedule Overview"
+                                          "type": "typography"
                                         }
                                       ],
-                                      "gap": "md",
-                                      "direction": "horizontal"
+                                      "direction": "horizontal",
+                                      "gap": "md"
                                     },
                                     {
-                                      "label": "Refresh",
-                                      "icon": "refresh-cw",
-                                      "type": "button",
                                       "variant": "secondary",
+                                      "type": "button",
+                                      "icon": "refresh-cw",
+                                      "label": "Refresh",
                                       "action": "REFRESH"
                                     }
                                   ],
                                   "direction": "horizontal",
-                                  "justify": "between"
+                                  "gap": "md",
+                                  "justify": "between",
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "padding": "md",
+                                  "type": "box",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
                                       "cols": 4.0,
                                       "children": [
                                         {
@@ -6324,20 +6457,19 @@
                                           "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
+                                          "value": "@entity.pendingBookings",
                                           "label": "PendingBookings",
-                                          "value": "@entity.pendingBookings"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.availableSlots",
+                                          "type": "stat-display",
                                           "label": "AvailableSlots",
-                                          "type": "stat-display"
+                                          "value": "@entity.availableSlots"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
-                                  ],
-                                  "type": "box",
-                                  "padding": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -6348,36 +6480,37 @@
                                   "gap": "md",
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "content": "Chart View",
                                           "variant": "caption",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "content": "Chart View"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "content": "Graph View",
+                                          "variant": "caption",
                                           "type": "typography",
-                                          "variant": "caption"
+                                          "content": "Graph View"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
                                   ]
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "value": 12.0,
-                                      "date": "Jan"
+                                      "date": "Jan",
+                                      "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "date": "Mar",
@@ -6392,18 +6525,17 @@
                                       "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
                                   "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
                                       "label": "Previous",
@@ -6412,16 +6544,7 @@
                                   ]
                                 },
                                 {
-                                  "edges": [
-                                    {
-                                      "target": "b",
-                                      "source": "a"
-                                    },
-                                    {
-                                      "source": "b",
-                                      "target": "c"
-                                    }
-                                  ],
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
                                       "label": "Start",
@@ -6432,15 +6555,25 @@
                                       "id": "b"
                                     },
                                     {
-                                      "label": "End",
-                                      "id": "c"
+                                      "id": "c",
+                                      "label": "End"
                                     }
                                   ],
-                                  "width": 400.0,
                                   "height": 200.0,
-                                  "type": "graph-view"
+                                  "width": 400.0,
+                                  "edges": [
+                                    {
+                                      "target": "b",
+                                      "source": "a"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
+                                  ]
                                 }
-                              ]
+                              ],
+                              "gap": "lg"
                             }
                           ],
                           "type": "scaled-diagram"
@@ -6461,8 +6594,8 @@
                     "Schedule",
                     {
                       "emit": {
-                        "success": "ScheduleLoaded",
-                        "failure": "ScheduleLoadFailed"
+                        "failure": "ScheduleLoadFailed",
+                        "success": "ScheduleLoaded"
                       }
                     }
                   ],
@@ -6470,79 +6603,73 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
-                              "gap": "lg",
-                              "direction": "vertical",
                               "children": [
                                 {
+                                  "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Schedule Overview"
                                     }
-                                  ],
-                                  "type": "breadcrumb"
+                                  ]
                                 },
                                 {
                                   "justify": "between",
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "children": [
                                     {
+                                      "type": "stack",
+                                      "direction": "horizontal",
+                                      "gap": "md",
                                       "children": [
                                         {
-                                          "name": "bar-chart-2",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "bar-chart-2"
                                         },
                                         {
+                                          "variant": "h2",
                                           "type": "typography",
-                                          "content": "Schedule Overview",
-                                          "variant": "h2"
+                                          "content": "Schedule Overview"
                                         }
-                                      ],
-                                      "direction": "horizontal",
-                                      "type": "stack",
-                                      "gap": "md"
+                                      ]
                                     },
                                     {
-                                      "icon": "refresh-cw",
+                                      "action": "REFRESH",
                                       "type": "button",
                                       "variant": "secondary",
-                                      "label": "Refresh",
-                                      "action": "REFRESH"
+                                      "icon": "refresh-cw",
+                                      "label": "Refresh"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "gap": "md",
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
                                   "padding": "md",
                                   "children": [
                                     {
-                                      "cols": 4.0,
                                       "type": "simple-grid",
                                       "children": [
                                         {
-                                          "value": "@entity.totalBookings",
                                           "type": "stat-display",
-                                          "label": "TotalBookings"
+                                          "label": "TotalBookings",
+                                          "value": "@entity.totalBookings"
                                         },
                                         {
-                                          "type": "stat-display",
+                                          "label": "ConfirmedToday",
                                           "value": "@entity.confirmedToday",
-                                          "label": "ConfirmedToday"
+                                          "type": "stat-display"
                                         },
                                         {
                                           "type": "stat-display",
@@ -6550,13 +6677,15 @@
                                           "value": "@entity.pendingBookings"
                                         },
                                         {
-                                          "value": "@entity.availableSlots",
                                           "type": "stat-display",
+                                          "value": "@entity.availableSlots",
                                           "label": "AvailableSlots"
                                         }
-                                      ]
+                                      ],
+                                      "cols": 4.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
@@ -6580,9 +6709,9 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "variant": "caption",
+                                          "type": "typography",
                                           "content": "Graph View",
-                                          "type": "typography"
+                                          "variant": "caption"
                                         }
                                       ]
                                     }
@@ -6595,24 +6724,24 @@
                                       "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "value": 15.0,
                                       "date": "Mar"
                                     },
                                     {
-                                      "value": 25.0,
-                                      "date": "Apr"
+                                      "date": "Apr",
+                                      "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
                                   ],
                                   "type": "line-chart"
@@ -6621,8 +6750,8 @@
                                   "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
                                       "color": "muted",
@@ -6631,6 +6760,9 @@
                                   ]
                                 },
                                 {
+                                  "height": 200.0,
+                                  "width": 400.0,
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
                                       "id": "a",
@@ -6641,29 +6773,30 @@
                                       "label": "Process"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "label": "End",
+                                      "id": "c"
                                     }
                                   ],
-                                  "type": "graph-view",
-                                  "height": 200.0,
                                   "edges": [
                                     {
-                                      "target": "b",
-                                      "source": "a"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
-                                      "target": "c",
-                                      "source": "b"
+                                      "source": "b",
+                                      "target": "c"
                                     }
-                                  ],
-                                  "width": 400.0
+                                  ]
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
                           ]
                         }
                       ],
+                      "appName": "BookingSystemApp",
                       "navItems": [
                         {
                           "href": "/providers",
@@ -6672,21 +6805,21 @@
                         },
                         {
                           "label": "Book",
-                          "href": "/book",
-                          "icon": "calendar-plus"
+                          "icon": "calendar-plus",
+                          "href": "/book"
                         },
                         {
-                          "href": "/appointments",
                           "icon": "calendar",
+                          "href": "/appointments",
                           "label": "Appointments"
                         },
                         {
-                          "label": "Schedule",
+                          "href": "/schedule",
                           "icon": "clock",
-                          "href": "/schedule"
+                          "label": "Schedule"
                         }
                       ],
-                      "appName": "BookingSystemApp"
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -6701,8 +6834,8 @@
                     "Schedule",
                     {
                       "emit": {
-                        "failure": "ScheduleLoadFailed",
-                        "success": "ScheduleLoaded"
+                        "success": "ScheduleLoaded",
+                        "failure": "ScheduleLoadFailed"
                       }
                     }
                   ],
@@ -6710,15 +6843,16 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "gap": "lg",
+                              "type": "stack",
                               "direction": "vertical",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "href": "/",
@@ -6727,7 +6861,8 @@
                                     {
                                       "label": "Schedule Overview"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
                                   "type": "stack",
@@ -6736,8 +6871,8 @@
                                   "gap": "md",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
+                                      "type": "stack",
                                       "gap": "md",
                                       "children": [
                                         {
@@ -6745,18 +6880,18 @@
                                           "type": "icon"
                                         },
                                         {
+                                          "variant": "h2",
                                           "type": "typography",
-                                          "content": "Schedule Overview",
-                                          "variant": "h2"
+                                          "content": "Schedule Overview"
                                         }
                                       ]
                                     },
                                     {
-                                      "icon": "refresh-cw",
                                       "label": "Refresh",
-                                      "action": "REFRESH",
+                                      "type": "button",
                                       "variant": "secondary",
-                                      "type": "button"
+                                      "icon": "refresh-cw",
+                                      "action": "REFRESH"
                                     }
                                   ]
                                 },
@@ -6765,16 +6900,13 @@
                                 },
                                 {
                                   "padding": "md",
-                                  "type": "box",
                                   "children": [
                                     {
-                                      "cols": 4.0,
-                                      "type": "simple-grid",
                                       "children": [
                                         {
                                           "type": "stat-display",
-                                          "label": "TotalBookings",
-                                          "value": "@entity.totalBookings"
+                                          "value": "@entity.totalBookings",
+                                          "label": "TotalBookings"
                                         },
                                         {
                                           "label": "ConfirmedToday",
@@ -6787,43 +6919,46 @@
                                           "value": "@entity.pendingBookings"
                                         },
                                         {
-                                          "label": "AvailableSlots",
+                                          "value": "@entity.availableSlots",
                                           "type": "stat-display",
-                                          "value": "@entity.availableSlots"
+                                          "label": "AvailableSlots"
                                         }
-                                      ]
+                                      ],
+                                      "cols": 4.0,
+                                      "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
+                                  "gap": "md",
                                   "cols": 2.0,
+                                  "type": "grid",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
+                                          "variant": "caption",
                                           "content": "Chart View",
-                                          "variant": "caption"
+                                          "type": "typography"
                                         }
                                       ]
                                     },
                                     {
                                       "children": [
                                         {
-                                          "variant": "caption",
                                           "content": "Graph View",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "caption"
                                         }
                                       ],
                                       "type": "card"
                                     }
-                                  ],
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
                                   "data": [
@@ -6832,30 +6967,29 @@
                                       "value": 12.0
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "value": 22.0,
                                       "date": "May"
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
                                   ],
                                   "type": "line-chart"
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "color": "primary",
@@ -6865,29 +6999,30 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
                                   "height": 200.0,
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
                                       "id": "a",
                                       "label": "Start"
                                     },
                                     {
-                                      "id": "b",
-                                      "label": "Process"
+                                      "label": "Process",
+                                      "id": "b"
                                     },
                                     {
                                       "id": "c",
                                       "label": "End"
                                     }
                                   ],
-                                  "type": "graph-view",
                                   "edges": [
                                     {
-                                      "source": "a",
-                                      "target": "b"
+                                      "target": "b",
+                                      "source": "a"
                                     },
                                     {
                                       "source": "b",
@@ -6897,27 +7032,26 @@
                                   "width": 400.0
                                 }
                               ],
-                              "type": "stack"
+                              "gap": "lg"
                             }
-                          ],
-                          "type": "scaled-diagram"
+                          ]
                         }
                       ],
                       "navItems": [
                         {
                           "icon": "user-check",
-                          "href": "/providers",
-                          "label": "Providers"
+                          "label": "Providers",
+                          "href": "/providers"
                         },
                         {
                           "label": "Book",
-                          "href": "/book",
-                          "icon": "calendar-plus"
+                          "icon": "calendar-plus",
+                          "href": "/book"
                         },
                         {
+                          "label": "Appointments",
                           "href": "/appointments",
-                          "icon": "calendar",
-                          "label": "Appointments"
+                          "icon": "calendar"
                         },
                         {
                           "icon": "clock",
@@ -6925,7 +7059,6 @@
                           "href": "/schedule"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "appName": "BookingSystemApp"
                     }
                   ]
@@ -6941,8 +7074,8 @@
                     "Schedule",
                     {
                       "emit": {
-                        "success": "ScheduleLoaded",
-                        "failure": "ScheduleLoadFailed"
+                        "failure": "ScheduleLoadFailed",
+                        "success": "ScheduleLoaded"
                       }
                     }
                   ],
@@ -6950,6 +7083,30 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "BookingSystemApp",
+                      "navItems": [
+                        {
+                          "label": "Providers",
+                          "href": "/providers",
+                          "icon": "user-check"
+                        },
+                        {
+                          "label": "Book",
+                          "href": "/book",
+                          "icon": "calendar-plus"
+                        },
+                        {
+                          "label": "Appointments",
+                          "icon": "calendar",
+                          "href": "/appointments"
+                        },
+                        {
+                          "icon": "clock",
+                          "label": "Schedule",
+                          "href": "/schedule"
+                        }
+                      ],
                       "children": [
                         {
                           "type": "scaled-diagram",
@@ -6957,6 +7114,7 @@
                             {
                               "type": "stack",
                               "gap": "lg",
+                              "direction": "vertical",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -6971,35 +7129,35 @@
                                   ]
                                 },
                                 {
-                                  "direction": "horizontal",
                                   "type": "stack",
+                                  "gap": "md",
+                                  "direction": "horizontal",
                                   "justify": "between",
                                   "children": [
                                     {
-                                      "gap": "md",
-                                      "direction": "horizontal",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "bar-chart-2"
+                                          "name": "bar-chart-2",
+                                          "type": "icon"
                                         },
                                         {
+                                          "variant": "h2",
                                           "type": "typography",
-                                          "content": "Schedule Overview",
-                                          "variant": "h2"
+                                          "content": "Schedule Overview"
                                         }
                                       ],
-                                      "type": "stack"
+                                      "direction": "horizontal",
+                                      "type": "stack",
+                                      "gap": "md"
                                     },
                                     {
-                                      "action": "REFRESH",
-                                      "type": "button",
                                       "icon": "refresh-cw",
+                                      "type": "button",
+                                      "action": "REFRESH",
                                       "variant": "secondary",
                                       "label": "Refresh"
                                     }
-                                  ],
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -7009,29 +7167,29 @@
                                   "children": [
                                     {
                                       "cols": 4.0,
+                                      "type": "simple-grid",
                                       "children": [
                                         {
-                                          "type": "stat-display",
                                           "label": "TotalBookings",
-                                          "value": "@entity.totalBookings"
+                                          "value": "@entity.totalBookings",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "value": "@entity.confirmedToday",
+                                          "type": "stat-display",
                                           "label": "ConfirmedToday"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "PendingBookings",
-                                          "value": "@entity.pendingBookings"
+                                          "value": "@entity.pendingBookings",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "label": "AvailableSlots",
+                                          "value": "@entity.availableSlots",
                                           "type": "stat-display",
-                                          "value": "@entity.availableSlots"
+                                          "label": "AvailableSlots"
                                         }
-                                      ],
-                                      "type": "simple-grid"
+                                      ]
                                     }
                                   ],
                                   "type": "box"
@@ -7040,9 +7198,6 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "gap": "md",
-                                  "cols": 2.0,
                                   "children": [
                                     {
                                       "children": [
@@ -7058,73 +7213,61 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "content": "Graph View",
-                                          "variant": "caption"
+                                          "variant": "caption",
+                                          "type": "typography"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "grid",
+                                  "cols": 2.0,
+                                  "gap": "md"
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
                                       "value": 15.0,
                                       "date": "Mar"
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "date": "May",
                                       "value": 22.0
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
                                       "color": "muted",
                                       "label": "Previous"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
-                                  "width": 400.0,
-                                  "nodes": [
-                                    {
-                                      "id": "a",
-                                      "label": "Start"
-                                    },
-                                    {
-                                      "id": "b",
-                                      "label": "Process"
-                                    },
-                                    {
-                                      "id": "c",
-                                      "label": "End"
-                                    }
-                                  ],
-                                  "height": 200.0,
+                                  "type": "graph-view",
                                   "edges": [
                                     {
                                       "target": "b",
@@ -7135,38 +7278,28 @@
                                       "target": "c"
                                     }
                                   ],
-                                  "type": "graph-view"
+                                  "width": 400.0,
+                                  "height": 200.0,
+                                  "nodes": [
+                                    {
+                                      "label": "Start",
+                                      "id": "a"
+                                    },
+                                    {
+                                      "label": "Process",
+                                      "id": "b"
+                                    },
+                                    {
+                                      "id": "c",
+                                      "label": "End"
+                                    }
+                                  ]
                                 }
-                              ],
-                              "direction": "vertical"
+                              ]
                             }
                           ]
                         }
-                      ],
-                      "appName": "BookingSystemApp",
-                      "navItems": [
-                        {
-                          "label": "Providers",
-                          "href": "/providers",
-                          "icon": "user-check"
-                        },
-                        {
-                          "label": "Book",
-                          "href": "/book",
-                          "icon": "calendar-plus"
-                        },
-                        {
-                          "href": "/appointments",
-                          "label": "Appointments",
-                          "icon": "calendar"
-                        },
-                        {
-                          "icon": "clock",
-                          "label": "Schedule",
-                          "href": "/schedule"
-                        }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]