@almadar/std 14.16.0 → 14.17.0

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

@@ -86,37 +86,37 @@
           "ref": "AppShell.traits.AppLayout",
           "name": "BookingProviderAppLayout",
           "config": {
-            "searchEvent": "BOOKING_SEARCH",
-            "notifications": [],
-            "contentTrait": "@trait.ProviderCatalog",
-            "appName": "BookingSystemApp",
             "navItems": [
               {
                 "label": "Providers",
-                "icon": "user-check",
-                "href": "/providers"
+                "href": "/providers",
+                "icon": "user-check"
               },
               {
                 "href": "/book",
-                "label": "Book",
-                "icon": "calendar-plus"
+                "icon": "calendar-plus",
+                "label": "Book"
               },
               {
+                "label": "Appointments",
                 "href": "/appointments",
-                "icon": "calendar",
-                "label": "Appointments"
+                "icon": "calendar"
               },
               {
                 "label": "Schedule",
-                "icon": "clock",
-                "href": "/schedule"
+                "href": "/schedule",
+                "icon": "clock"
               }
             ],
+            "searchEvent": "BOOKING_SEARCH",
+            "contentTrait": "@trait.ProviderCatalog",
+            "notifications": [],
+            "appName": "BookingSystemApp",
             "notificationClickEvent": "BOOKING_NOTIFICATIONS_OPEN"
           },
           "events": {
-            "NOTIFY_CLICK": "BOOKING_NOTIFICATIONS_OPEN",
-            "SEARCH": "BOOKING_SEARCH"
+            "SEARCH": "BOOKING_SEARCH",
+            "NOTIFY_CLICK": "BOOKING_NOTIFICATIONS_OPEN"
           }
         },
         {
@@ -199,58 +199,58 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
                       "direction": "vertical",
+                      "gap": "lg",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
                           "align": "center",
                           "children": [
                             {
                               "align": "center",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "user"
+                                  "name": "user",
+                                  "type": "icon"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Providers",
-                                  "variant": "h2"
+                                  "variant": "h2",
+                                  "type": "typography"
                                 }
                               ],
                               "gap": "sm",
-                              "type": "stack",
                               "direction": "horizontal"
                             },
                             {
                               "direction": "horizontal",
-                              "type": "stack",
-                              "gap": "sm",
                               "children": [
                                 {
-                                  "icon": "plus",
-                                  "variant": "primary",
                                   "type": "button",
+                                  "label": "Add Provider",
+                                  "variant": "primary",
                                   "action": "CREATE",
-                                  "label": "Add Provider"
+                                  "icon": "plus"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "gap": "sm"
                             }
                           ],
-                          "justify": "between",
-                          "gap": "md"
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md",
+                          "justify": "between"
                         },
                         {
-                          "align": "center",
-                          "type": "stack",
                           "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             "@trait.ProviderSearch",
                             "@trait.ProviderFilter"
                           ],
-                          "gap": "md"
+                          "align": "center"
                         },
                         {
                           "type": "divider"
@@ -262,7 +262,7 @@
                         },
                         "@trait.ProviderBrowseList"
                       ],
-                      "gap": "lg"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -281,34 +281,34 @@
                     "render-ui",
                     "main",
                     {
+                      "gap": "md",
                       "className": "py-8",
-                      "align": "center",
                       "children": [
                         {
-                          "type": "icon",
-                          "name": "bell"
+                          "name": "bell",
+                          "type": "icon"
                         },
                         {
-                          "variant": "h3",
+                          "content": "No notifications",
                           "type": "typography",
-                          "content": "No notifications"
+                          "variant": "h3"
                         },
                         {
-                          "type": "typography",
                           "color": "muted",
                           "variant": "caption",
-                          "content": "You're all caught up."
+                          "content": "You're all caught up.",
+                          "type": "typography"
                         },
                         {
+                          "label": "Back to providers",
                           "variant": "ghost",
-                          "action": "INIT",
                           "type": "button",
-                          "label": "Back to providers"
+                          "action": "INIT"
                         }
                       ],
                       "type": "stack",
                       "direction": "vertical",
-                      "gap": "md"
+                      "align": "center"
                     }
                   ]
                 ]
@@ -321,18 +321,18 @@
           "ref": "Search.traits.SearchResultSearch",
           "name": "ProviderSearch",
           "config": {
-            "placeholder": "Search providers…",
-            "event": "SEARCH"
+            "event": "SEARCH",
+            "placeholder": "Search providers…"
           }
         },
         {
           "ref": "Filter.traits.FilterTargetFilter",
           "name": "ProviderFilter",
           "config": {
-            "event": "FILTER",
             "filters": [
               {
-                "filterType": "select",
+                "field": "specialty",
+                "label": "Specialty",
                 "options": [
                   "general",
                   "dental",
@@ -340,59 +340,59 @@
                   "cardiology",
                   "psychiatry"
                 ],
-                "label": "Specialty",
-                "field": "specialty"
+                "filterType": "select"
               },
               {
-                "label": "Rating",
-                "field": "rating",
-                "max": 5.0,
                 "filterType": "range",
-                "min": 0.0
+                "max": 5.0,
+                "min": 0.0,
+                "label": "Rating",
+                "field": "rating"
               }
-            ]
+            ],
+            "event": "FILTER"
           }
         },
         {
           "ref": "Stats.traits.StatsItemStats",
           "name": "ProviderStats",
           "config": {
+            "title": "Provider Overview",
             "metrics": [
               {
+                "variant": "primary",
+                "aggregation": "count",
                 "label": "Total Providers",
                 "icon": "users",
-                "format": "number",
-                "aggregation": "count",
-                "variant": "primary"
+                "format": "number"
               },
               {
-                "label": "Active",
                 "aggregation": "count",
                 "icon": "check-circle",
-                "format": "number",
+                "variant": "success",
                 "filter": {
                   "available": true
                 },
-                "variant": "success"
+                "format": "number",
+                "label": "Active"
               },
               {
-                "label": "Avg Rating",
                 "aggregation": "avg",
-                "format": "number",
+                "icon": "star",
                 "field": "rating",
-                "variant": "info",
-                "icon": "star"
+                "label": "Avg Rating",
+                "format": "number",
+                "variant": "info"
               },
               {
-                "aggregation": "avg",
                 "format": "currency",
                 "field": "hourlyRate",
+                "aggregation": "avg",
                 "label": "Avg Hourly Rate",
-                "variant": "info",
-                "icon": "dollar-sign"
+                "icon": "dollar-sign",
+                "variant": "info"
               }
-            ],
-            "title": "Provider Overview"
+            ]
           },
           "listens": [
             {
@@ -411,9 +411,9 @@
           "config": {
             "chartType": "pie",
             "categoryField": "specialty",
-            "aggregation": "count",
+            "subtitle": "Distribution across specialties",
             "title": "Providers by Specialty",
-            "subtitle": "Distribution across specialties"
+            "aggregation": "count"
           },
           "listens": [
             {
@@ -431,12 +431,11 @@
           "name": "ProviderBrowseList",
           "linkedEntity": "Provider",
           "config": {
-            "gap": "md",
             "fields": [
               {
-                "variant": "h3",
+                "name": "name",
                 "icon": "user",
-                "name": "name"
+                "variant": "h3"
               },
               {
                 "name": "specialty",
@@ -448,19 +447,18 @@
                 "format": "number"
               },
               {
-                "variant": "h4",
-                "name": "hourlyRate",
+                "format": "currency",
                 "label": "Hourly Rate",
-                "format": "currency"
+                "name": "hourlyRate",
+                "variant": "h4"
               },
               {
-                "variant": "body",
+                "format": "boolean",
                 "name": "available",
-                "label": "Availability",
-                "format": "boolean"
+                "variant": "body",
+                "label": "Availability"
               }
             ],
-            "cols": 2.0,
             "itemActions": [
               {
                 "label": "View",
@@ -468,16 +466,18 @@
                 "variant": "ghost"
               },
               {
-                "variant": "ghost",
+                "label": "Edit",
                 "event": "EDIT",
-                "label": "Edit"
+                "variant": "ghost"
               },
               {
+                "variant": "danger",
                 "label": "Delete",
-                "event": "DELETE",
-                "variant": "danger"
+                "event": "DELETE"
               }
-            ]
+            ],
+            "cols": 2.0,
+            "gap": "md"
           },
           "listens": [
             {
@@ -722,29 +722,32 @@
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
+                      "gap": "md",
                       "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
+                          "gap": "sm",
                           "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "name": "plus-circle",
                               "type": "icon"
                             },
                             {
-                              "type": "typography",
+                              "content": "Add Provider",
                               "variant": "h3",
-                              "content": "Add Provider"
+                              "type": "typography"
                             }
-                          ],
-                          "direction": "horizontal",
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "type": "form-section",
+                          "mode": "create",
                           "fields": [
                             "name",
                             "specialty",
@@ -755,12 +758,9 @@
                             "available"
                           ],
                           "submitEvent": "SAVE",
-                          "mode": "create",
-                          "type": "form-section",
                           "cancelEvent": "CLOSE"
                         }
-                      ],
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -801,8 +801,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "ProviderSaved",
-                        "failure": "ProviderSaveFailed"
+                        "failure": "ProviderSaveFailed",
+                        "success": "ProviderSaved"
                       }
                     }
                   ],
@@ -1039,8 +1039,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "failure": "ProviderLoadFailed",
-                        "success": "ProviderLoaded"
+                        "success": "ProviderLoaded",
+                        "failure": "ProviderLoadFailed"
                       }
                     }
                   ],
@@ -1048,33 +1048,31 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
-                      "type": "stack",
-                      "gap": "md",
                       "children": [
                         {
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
-                              "variant": "h3",
                               "type": "typography",
-                              "content": "Edit Provider"
+                              "content": "Edit Provider",
+                              "variant": "h3"
                             }
                           ],
-                          "gap": "sm",
-                          "type": "stack",
                           "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "form-section",
                           "submitEvent": "SAVE",
                           "entity": "@payload.row",
+                          "type": "form-section",
+                          "mode": "edit",
                           "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
@@ -1084,10 +1082,12 @@
                             "rating",
                             "hourlyRate",
                             "available"
-                          ],
-                          "mode": "edit"
+                          ]
                         }
-                      ]
+                      ],
+                      "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -1128,8 +1128,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "ProviderUpdateFailed",
-                        "success": "ProviderUpdated"
+                        "success": "ProviderUpdated",
+                        "failure": "ProviderUpdateFailed"
                       }
                     }
                   ],
@@ -1338,36 +1338,37 @@
                     "fetch",
                     "Provider",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "success": "ProviderLoaded",
-                        "failure": "ProviderLoadFailed"
-                      },
-                      "id": "@payload.id"
+                        "failure": "ProviderLoadFailed",
+                        "success": "ProviderLoaded"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
                       "direction": "vertical",
+                      "gap": "md",
+                      "type": "stack",
                       "children": [
                         {
+                          "gap": "sm",
+                          "direction": "horizontal",
                           "align": "center",
-                          "type": "stack",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "eye"
+                              "name": "eye",
+                              "type": "icon"
                             },
                             {
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "@entity.name"
+                              "content": "@entity.name",
+                              "variant": "h3"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "sm"
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
@@ -1381,51 +1382,51 @@
                             },
                             {
                               "content": "@entity.name",
-                              "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "type": "typography"
                             }
                           ],
-                          "direction": "horizontal",
                           "gap": "md",
+                          "direction": "horizontal",
                           "type": "stack"
                         },
                         {
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
-                              "content": "Specialty"
+                              "content": "Specialty",
+                              "variant": "caption"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.specialty"
+                              "content": "@entity.specialty",
+                              "type": "typography"
                             }
-                          ],
-                          "gap": "md",
-                          "type": "stack",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "gap": "md",
                           "children": [
                             {
                               "variant": "caption",
-                              "content": "Location",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Location"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.location",
+                              "variant": "body",
                               "type": "typography"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
-                          "direction": "horizontal",
                           "gap": "md",
+                          "direction": "horizontal",
                           "type": "stack",
                           "children": [
                             {
@@ -1434,89 +1435,88 @@
                               "type": "typography"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.phone",
+                              "variant": "body",
                               "type": "typography"
                             }
                           ]
                         },
                         {
                           "gap": "md",
-                          "direction": "horizontal",
                           "type": "stack",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "Rating"
                             },
                             {
-                              "content": "@entity.rating",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.rating"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal"
                         },
                         {
-                          "type": "stack",
                           "gap": "md",
                           "children": [
                             {
+                              "type": "typography",
                               "variant": "caption",
-                              "content": "Hourly Rate",
-                              "type": "typography"
+                              "content": "Hourly Rate"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.hourlyRate",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ],
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
+                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
-                              "content": "Available"
+                              "content": "Available",
+                              "type": "typography"
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.available",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.available"
                             }
                           ],
-                          "gap": "md",
-                          "direction": "horizontal",
                           "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "justify": "end",
                           "direction": "horizontal",
                           "type": "stack",
                           "gap": "sm",
-                          "justify": "end",
                           "children": [
                             {
                               "icon": "edit",
-                              "label": "Edit",
                               "action": "EDIT",
                               "type": "button",
+                              "label": "Edit",
                               "variant": "primary"
                             },
                             {
                               "type": "button",
-                              "label": "Close",
                               "variant": "ghost",
+                              "label": "Close",
                               "action": "CLOSE"
                             }
                           ]
                         }
-                      ],
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -1767,20 +1767,22 @@
                     "fetch",
                     "Provider",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "ProviderLoaded",
                         "failure": "ProviderLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
                       "gap": "md",
                       "children": [
                         {
+                          "type": "stack",
                           "direction": "horizontal",
                           "children": [
                             {
@@ -1789,45 +1791,43 @@
                             },
                             {
                               "content": "Delete Provider",
-                              "variant": "h3",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
                           ],
-                          "type": "stack",
-                          "align": "center",
-                          "gap": "sm"
+                          "gap": "sm",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
                           "type": "alert",
+                          "variant": "error",
                           "message": "This action cannot be undone."
                         },
                         {
                           "type": "stack",
-                          "direction": "horizontal",
+                          "justify": "end",
+                          "gap": "sm",
                           "children": [
                             {
-                              "type": "button",
                               "label": "Cancel",
-                              "variant": "ghost",
-                              "action": "CANCEL"
+                              "type": "button",
+                              "action": "CANCEL",
+                              "variant": "ghost"
                             },
                             {
-                              "label": "Delete",
-                              "icon": "check",
-                              "type": "button",
                               "action": "CONFIRM_DELETE",
-                              "variant": "danger"
+                              "variant": "danger",
+                              "icon": "check",
+                              "label": "Delete",
+                              "type": "button"
                             }
                           ],
-                          "justify": "end",
-                          "gap": "sm"
+                          "direction": "horizontal"
                         }
                       ],
-                      "type": "stack",
                       "direction": "vertical"
                     }
                   ]
@@ -1845,8 +1845,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "ProviderDeleteFailed",
-                        "success": "ProviderDeleted"
+                        "success": "ProviderDeleted",
+                        "failure": "ProviderDeleteFailed"
                       }
                     }
                   ],
@@ -1867,8 +1867,8 @@
                     "Provider",
                     {
                       "emit": {
-                        "failure": "ProviderLoadFailed",
-                        "success": "ProviderLoaded"
+                        "success": "ProviderLoaded",
+                        "failure": "ProviderLoadFailed"
                       }
                     }
                   ],
@@ -1929,8 +1929,8 @@
                     "Provider",
                     {
                       "emit": {
-                        "success": "ProviderLoaded",
-                        "failure": "ProviderLoadFailed"
+                        "failure": "ProviderLoadFailed",
+                        "success": "ProviderLoaded"
                       }
                     }
                   ]
@@ -2051,21 +2051,23 @@
           "name": "BookingAppLayout",
           "linkedEntity": "Booking",
           "config": {
+            "searchEvent": "BOOKING_SEARCH",
+            "topBarActions": [],
             "navItems": [
               {
+                "label": "Providers",
                 "href": "/providers",
-                "icon": "user-check",
-                "label": "Providers"
+                "icon": "user-check"
               },
               {
+                "label": "Book",
                 "href": "/book",
-                "icon": "calendar-plus",
-                "label": "Book"
+                "icon": "calendar-plus"
               },
               {
                 "label": "Appointments",
-                "icon": "calendar",
-                "href": "/appointments"
+                "href": "/appointments",
+                "icon": "calendar"
               },
               {
                 "href": "/schedule",
@@ -2073,16 +2075,14 @@
                 "label": "Schedule"
               }
             ],
-            "contentTrait": "@trait.BookingWizard",
             "notifications": [],
             "notificationClickEvent": "BOOKING_NOTIFICATIONS_OPEN",
             "appName": "BookingSystemApp",
-            "searchEvent": "BOOKING_SEARCH",
-            "topBarActions": []
+            "contentTrait": "@trait.BookingWizard"
           },
           "events": {
-            "SEARCH": "BOOKING_SEARCH",
-            "NOTIFY_CLICK": "BOOKING_NOTIFICATIONS_OPEN"
+            "NOTIFY_CLICK": "BOOKING_NOTIFICATIONS_OPEN",
+            "SEARCH": "BOOKING_SEARCH"
           }
         },
         {
@@ -2147,22 +2147,19 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "md",
                       "children": [
                         {
+                          "type": "alert",
                           "variant": "info",
-                          "message": "Enter card details to pay your booking deposit.",
-                          "type": "alert"
+                          "message": "Enter card details to pay your booking deposit."
                         },
                         {
-                          "inputType": "text",
                           "placeholder": "Card number",
+                          "inputType": "text",
                           "type": "input"
                         },
                         {
-                          "gap": "sm",
                           "type": "stack",
-                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "input",
@@ -2171,21 +2168,24 @@
                             },
                             {
                               "placeholder": "CVC",
-                              "inputType": "text",
-                              "type": "input"
+                              "type": "input",
+                              "inputType": "text"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "sm"
                         },
                         {
                           "icon": "credit-card",
-                          "type": "button",
-                          "label": "Pay deposit",
                           "action": "CREATE_PAYMENT",
-                          "variant": "primary"
+                          "variant": "primary",
+                          "label": "Pay deposit",
+                          "type": "button"
                         }
                       ],
-                      "type": "stack",
-                      "direction": "vertical"
+                      "direction": "vertical",
+                      "gap": "md",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -2540,22 +2540,23 @@
                     "render-ui",
                     "main",
                     {
+                      "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
+                          "variant": "h2",
                           "content": "Book Appointment",
-                          "type": "typography",
-                          "variant": "h2"
+                          "type": "typography"
                         },
                         {
-                          "type": "wizard-progress",
-                          "currentStep": 0.0,
                           "steps": [
                             "Select Provider",
                             "Select Time",
                             "Your Details",
                             "Payment",
                             "Confirmation"
-                          ]
+                          ],
+                          "currentStep": 0.0,
+                          "type": "wizard-progress"
                         },
                         {
                           "type": "divider"
@@ -2566,24 +2567,23 @@
                           "content": "Select Provider"
                         },
                         {
-                          "mode": "create",
-                          "submitLabel": "Continue",
-                          "showCancel": false,
                           "fields": [
                             {
+                              "required": true,
                               "name": "providerName",
-                              "min": 2.0,
-                              "required": true
+                              "min": 2.0
                             }
                           ],
+                          "submitLabel": "Continue",
                           "submitEvent": "NEXT",
-                          "type": "form-section"
+                          "showCancel": false,
+                          "type": "form-section",
+                          "mode": "create"
                         }
                       ],
-                      "className": "max-w-xl mx-auto w-full",
-                      "direction": "vertical",
                       "gap": "lg",
-                      "type": "stack"
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -2603,10 +2603,6 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "lg",
-                      "direction": "vertical",
-                      "type": "stack",
-                      "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
                           "variant": "h2",
@@ -2614,8 +2610,8 @@
                           "content": "Book Appointment"
                         },
                         {
-                          "currentStep": 1.0,
                           "type": "wizard-progress",
+                          "currentStep": 1.0,
                           "steps": [
                             "Select Provider",
                             "Select Time",
@@ -2629,12 +2625,14 @@
                         },
                         {
                           "type": "typography",
-                          "variant": "h3",
-                          "content": "Select Time"
+                          "content": "Select Time",
+                          "variant": "h3"
                         },
                         {
+                          "submitLabel": "Continue",
+                          "cancelLabel": "Back",
+                          "type": "form-section",
                           "cancelEvent": "PREV",
-                          "submitEvent": "NEXT",
                           "mode": "edit",
                           "fields": [
                             {
@@ -2643,11 +2641,13 @@
                             }
                           ],
                           "entity": "@entity",
-                          "type": "form-section",
-                          "cancelLabel": "Back",
-                          "submitLabel": "Continue"
+                          "submitEvent": "NEXT"
                         }
-                      ]
+                      ],
+                      "direction": "vertical",
+                      "type": "stack",
+                      "gap": "lg",
+                      "className": "max-w-xl mx-auto w-full"
                     }
                   ]
                 ]
@@ -2673,11 +2673,12 @@
                     {
                       "children": [
                         {
-                          "content": "Book Appointment",
                           "variant": "h2",
+                          "content": "Book Appointment",
                           "type": "typography"
                         },
                         {
+                          "type": "wizard-progress",
                           "steps": [
                             "Select Provider",
                             "Select Time",
@@ -2685,48 +2686,47 @@
                             "Payment",
                             "Confirmation"
                           ],
-                          "currentStep": 2.0,
-                          "type": "wizard-progress"
+                          "currentStep": 2.0
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "variant": "h3",
-                          "content": "Your Details",
-                          "type": "typography"
+                          "type": "typography",
+                          "content": "Your Details"
                         },
                         {
-                          "submitLabel": "Continue",
+                          "entity": "@entity",
+                          "mode": "edit",
+                          "cancelLabel": "Back",
+                          "cancelEvent": "PREV",
                           "type": "form-section",
                           "fields": [
                             {
-                              "required": true,
+                              "min": 2.0,
                               "name": "customerName",
-                              "min": 2.0
+                              "required": true
                             },
                             {
-                              "name": "email",
                               "required": true,
+                              "name": "email",
                               "type": "email"
                             },
                             {
-                              "name": "phone",
-                              "required": true
+                              "required": true,
+                              "name": "phone"
                             },
                             {
                               "name": "notes"
                             }
                           ],
-                          "mode": "edit",
-                          "cancelLabel": "Back",
-                          "cancelEvent": "PREV",
                           "submitEvent": "NEXT",
-                          "entity": "@entity"
+                          "submitLabel": "Continue"
                         }
                       ],
-                      "gap": "lg",
                       "className": "max-w-xl mx-auto w-full",
+                      "gap": "lg",
                       "type": "stack",
                       "direction": "vertical"
                     }
@@ -2743,16 +2743,16 @@
                     "main",
                     {
                       "gap": "lg",
+                      "className": "max-w-xl mx-auto w-full",
                       "type": "stack",
                       "direction": "vertical",
                       "children": [
                         {
-                          "type": "typography",
                           "variant": "h2",
-                          "content": "Book Appointment"
+                          "content": "Book Appointment",
+                          "type": "typography"
                         },
                         {
-                          "currentStep": 0.0,
                           "type": "wizard-progress",
                           "steps": [
                             "Select Provider",
@@ -2760,7 +2760,8 @@
                             "Your Details",
                             "Payment",
                             "Confirmation"
-                          ]
+                          ],
+                          "currentStep": 0.0
                         },
                         {
                           "type": "divider"
@@ -2771,22 +2772,21 @@
                           "type": "typography"
                         },
                         {
-                          "submitLabel": "Continue",
+                          "type": "form-section",
+                          "entity": "@entity",
                           "mode": "edit",
+                          "submitLabel": "Continue",
+                          "showCancel": false,
                           "fields": [
                             {
                               "min": 2.0,
-                              "name": "providerName",
-                              "required": true
+                              "required": true,
+                              "name": "providerName"
                             }
                           ],
-                          "submitEvent": "NEXT",
-                          "showCancel": false,
-                          "type": "form-section",
-                          "entity": "@entity"
+                          "submitEvent": "NEXT"
                         }
-                      ],
-                      "className": "max-w-xl mx-auto w-full"
+                      ]
                     }
                   ]
                 ]
@@ -2826,11 +2826,15 @@
                     "render-ui",
                     "main",
                     {
+                      "gap": "lg",
+                      "className": "max-w-xl mx-auto w-full",
+                      "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
-                          "variant": "h2",
+                          "content": "Book Appointment",
                           "type": "typography",
-                          "content": "Book Appointment"
+                          "variant": "h2"
                         },
                         {
                           "steps": [
@@ -2847,31 +2851,27 @@
                           "type": "divider"
                         },
                         {
-                          "type": "typography",
                           "content": "Pay Deposit",
+                          "type": "typography",
                           "variant": "h3"
                         },
                         "@trait.BookingPayment",
                         {
-                          "type": "stack",
                           "gap": "sm",
-                          "direction": "horizontal",
+                          "type": "stack",
                           "justify": "start",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "button",
+                              "label": "Back",
                               "variant": "ghost",
                               "icon": "arrow-left",
-                              "label": "Back",
+                              "type": "button",
                               "action": "PREV"
                             }
                           ]
                         }
-                      ],
-                      "gap": "lg",
-                      "type": "stack",
-                      "direction": "vertical",
-                      "className": "max-w-xl mx-auto w-full"
+                      ]
                     }
                   ]
                 ]
@@ -2886,48 +2886,48 @@
                     "main",
                     {
                       "direction": "vertical",
-                      "className": "max-w-xl mx-auto w-full",
                       "children": [
                         {
                           "variant": "h2",
-                          "type": "typography",
-                          "content": "Book Appointment"
+                          "content": "Book Appointment",
+                          "type": "typography"
                         },
                         {
+                          "currentStep": 1.0,
+                          "type": "wizard-progress",
                           "steps": [
                             "Select Provider",
                             "Select Time",
                             "Your Details",
                             "Payment",
                             "Confirmation"
-                          ],
-                          "type": "wizard-progress",
-                          "currentStep": 1.0
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "h3",
                           "type": "typography",
-                          "content": "Select Time"
+                          "content": "Select Time",
+                          "variant": "h3"
                         },
                         {
-                          "cancelEvent": "PREV",
-                          "submitLabel": "Continue",
-                          "mode": "edit",
                           "entity": "@entity",
-                          "submitEvent": "NEXT",
-                          "cancelLabel": "Back",
+                          "mode": "edit",
                           "fields": [
                             {
-                              "name": "scheduledAt",
-                              "required": true
+                              "required": true,
+                              "name": "scheduledAt"
                             }
                           ],
-                          "type": "form-section"
+                          "cancelEvent": "PREV",
+                          "submitLabel": "Continue",
+                          "cancelLabel": "Back",
+                          "type": "form-section",
+                          "submitEvent": "NEXT"
                         }
                       ],
+                      "className": "max-w-xl mx-auto w-full",
                       "type": "stack",
                       "gap": "lg"
                     }
@@ -2951,52 +2951,54 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "lg",
                       "type": "stack",
+                      "className": "max-w-xl mx-auto w-full",
+                      "gap": "lg",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "typography",
                           "variant": "h2",
+                          "type": "typography",
                           "content": "Review your booking"
                         },
                         {
                           "type": "wizard-progress",
-                          "currentStep": 4.0,
                           "steps": [
                             "Select Provider",
                             "Select Time",
                             "Your Details",
                             "Payment",
                             "Confirmation"
-                          ]
+                          ],
+                          "currentStep": 4.0
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "type": "stack",
-                          "direction": "vertical",
                           "gap": "sm",
                           "children": [
                             {
                               "children": [
                                 {
                                   "variant": "caption",
-                                  "type": "typography",
-                                  "content": "Provider"
+                                  "content": "Provider",
+                                  "type": "typography"
                                 },
                                 {
-                                  "variant": "body",
+                                  "type": "typography",
                                   "content": "@entity.providerName",
-                                  "type": "typography"
+                                  "variant": "body"
                                 }
                               ],
-                              "gap": "md",
+                              "type": "stack",
                               "direction": "horizontal",
-                              "justify": "between",
-                              "type": "stack"
+                              "gap": "md",
+                              "justify": "between"
                             },
                             {
+                              "type": "stack",
                               "children": [
                                 {
                                   "variant": "caption",
@@ -3004,76 +3006,76 @@
                                   "content": "When"
                                 },
                                 {
-                                  "variant": "body",
                                   "type": "typography",
-                                  "content": "@entity.scheduledAt"
+                                  "content": "@entity.scheduledAt",
+                                  "variant": "body"
                                 }
                               ],
-                              "direction": "horizontal",
+                              "gap": "md",
                               "justify": "between",
-                              "type": "stack",
-                              "gap": "md"
+                              "direction": "horizontal"
                             },
                             {
-                              "direction": "horizontal",
                               "type": "stack",
                               "gap": "md",
                               "justify": "between",
                               "children": [
                                 {
                                   "content": "Customer",
-                                  "type": "typography",
-                                  "variant": "caption"
+                                  "variant": "caption",
+                                  "type": "typography"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "body",
-                                  "content": "@entity.customerName"
+                                  "content": "@entity.customerName",
+                                  "type": "typography"
                                 }
-                              ]
+                              ],
+                              "direction": "horizontal"
                             },
                             {
                               "type": "stack",
-                              "gap": "md",
+                              "justify": "between",
                               "children": [
                                 {
-                                  "content": "Email",
+                                  "type": "typography",
                                   "variant": "caption",
-                                  "type": "typography"
+                                  "content": "Email"
                                 },
                                 {
                                   "content": "@entity.email",
-                                  "type": "typography",
-                                  "variant": "body"
+                                  "variant": "body",
+                                  "type": "typography"
                                 }
                               ],
-                              "direction": "horizontal",
-                              "justify": "between"
+                              "gap": "md",
+                              "direction": "horizontal"
                             },
                             {
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "variant": "caption",
                                   "type": "typography",
+                                  "variant": "caption",
                                   "content": "Phone"
                                 },
                                 {
-                                  "type": "typography",
+                                  "content": "@entity.phone",
                                   "variant": "body",
-                                  "content": "@entity.phone"
+                                  "type": "typography"
                                 }
                               ],
                               "type": "stack",
-                              "justify": "between",
                               "gap": "md",
-                              "direction": "horizontal"
+                              "justify": "between"
                             },
                             {
+                              "type": "stack",
                               "children": [
                                 {
+                                  "type": "typography",
                                   "variant": "caption",
-                                  "content": "Deposit Paid",
-                                  "type": "typography"
+                                  "content": "Deposit Paid"
                                 },
                                 {
                                   "variant": "body",
@@ -3081,41 +3083,39 @@
                                   "content": "@entity.depositAmount"
                                 }
                               ],
+                              "justify": "between",
                               "direction": "horizontal",
-                              "type": "stack",
-                              "gap": "md",
-                              "justify": "between"
+                              "gap": "md"
                             }
-                          ]
+                          ],
+                          "direction": "vertical"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "gap": "sm",
+                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
                               "icon": "arrow-left",
-                              "action": "PREV",
-                              "variant": "ghost",
+                              "label": "Back",
                               "type": "button",
-                              "label": "Back"
+                              "action": "PREV",
+                              "variant": "ghost"
                             },
                             {
-                              "type": "button",
                               "label": "Confirm booking",
                               "action": "COMPLETE",
                               "variant": "primary",
+                              "type": "button",
                               "icon": "check"
                             }
                           ],
-                          "direction": "horizontal",
-                          "type": "stack",
+                          "gap": "sm",
                           "justify": "between"
                         }
-                      ],
-                      "className": "max-w-xl mx-auto w-full",
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -3130,14 +3130,13 @@
                     "main",
                     {
                       "gap": "lg",
-                      "direction": "vertical",
-                      "className": "max-w-xl mx-auto w-full",
                       "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "content": "Book Appointment",
                           "type": "typography",
-                          "variant": "h2"
+                          "variant": "h2",
+                          "content": "Book Appointment"
                         },
                         {
                           "currentStep": 2.0,
@@ -3154,39 +3153,40 @@
                           "type": "divider"
                         },
                         {
-                          "variant": "h3",
                           "content": "Your Details",
-                          "type": "typography"
+                          "type": "typography",
+                          "variant": "h3"
                         },
                         {
-                          "type": "form-section",
+                          "cancelEvent": "PREV",
+                          "cancelLabel": "Back",
+                          "entity": "@entity",
+                          "mode": "edit",
+                          "submitEvent": "NEXT",
+                          "submitLabel": "Continue",
                           "fields": [
                             {
+                              "name": "customerName",
                               "required": true,
-                              "min": 2.0,
-                              "name": "customerName"
+                              "min": 2.0
                             },
                             {
-                              "name": "email",
                               "required": true,
+                              "name": "email",
                               "type": "email"
                             },
                             {
-                              "name": "phone",
-                              "required": true
+                              "required": true,
+                              "name": "phone"
                             },
                             {
                               "name": "notes"
                             }
                           ],
-                          "cancelEvent": "PREV",
-                          "submitEvent": "NEXT",
-                          "mode": "edit",
-                          "cancelLabel": "Back",
-                          "submitLabel": "Continue",
-                          "entity": "@entity"
+                          "type": "form-section"
                         }
-                      ]
+                      ],
+                      "className": "max-w-xl mx-auto w-full"
                     }
                   ]
                 ]
@@ -3216,8 +3216,8 @@
                     "@entity",
                     {
                       "emit": {
-                        "success": "BookingSaved",
-                        "failure": "BookingSaveFailed"
+                        "failure": "BookingSaveFailed",
+                        "success": "BookingSaved"
                       }
                     }
                   ],
@@ -3227,9 +3227,9 @@
                     "send",
                     {
                       "body": "Your booking is confirmed.",
-                      "sender": "noreply@bookings.example",
                       "recipient": "@entity.email",
-                      "subject": "Booking Confirmed"
+                      "subject": "Booking Confirmed",
+                      "sender": "noreply@bookings.example"
                     },
                     {
                       "emit": {
@@ -3244,8 +3244,8 @@
                     "sendSMS",
                     {
                       "recipient": "@entity.phone",
-                      "sender": "+15551234567",
-                      "body": "Booking confirmed for @entity.scheduledAt"
+                      "body": "Booking confirmed for @entity.scheduledAt",
+                      "sender": "+15551234567"
                     },
                     {
                       "emit": {
@@ -3271,33 +3271,33 @@
                     "main",
                     {
                       "className": "max-w-xl mx-auto w-full py-12",
-                      "type": "stack",
                       "children": [
                         {
-                          "name": "check-circle",
-                          "type": "icon"
+                          "type": "icon",
+                          "name": "check-circle"
                         },
                         {
-                          "variant": "h2",
                           "type": "typography",
+                          "variant": "h2",
                           "content": "Booking confirmed"
                         },
                         {
                           "type": "typography",
-                          "color": "muted",
                           "variant": "body",
+                          "color": "muted",
                           "content": "We have emailed and SMS-confirmed your appointment."
                         },
                         {
                           "label": "Book another",
-                          "icon": "rotate-ccw",
                           "type": "button",
-                          "action": "RESTART",
-                          "variant": "ghost"
+                          "variant": "ghost",
+                          "icon": "rotate-ccw",
+                          "action": "RESTART"
                         }
                       ],
-                      "align": "center",
+                      "type": "stack",
                       "gap": "lg",
+                      "align": "center",
                       "direction": "vertical"
                     }
                   ]
@@ -3313,7 +3313,9 @@
                     "main",
                     {
                       "className": "max-w-xl mx-auto w-full",
+                      "direction": "vertical",
                       "type": "stack",
+                      "gap": "lg",
                       "children": [
                         {
                           "variant": "h2",
@@ -3321,43 +3323,41 @@
                           "type": "typography"
                         },
                         {
-                          "currentStep": 3.0,
-                          "type": "wizard-progress",
                           "steps": [
                             "Select Provider",
                             "Select Time",
                             "Your Details",
                             "Payment",
                             "Confirmation"
-                          ]
+                          ],
+                          "currentStep": 3.0,
+                          "type": "wizard-progress"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "h3",
+                          "content": "Pay Deposit",
                           "type": "typography",
-                          "content": "Pay Deposit"
+                          "variant": "h3"
                         },
                         "@trait.BookingPayment",
                         {
-                          "gap": "sm",
                           "type": "stack",
-                          "justify": "start",
                           "direction": "horizontal",
                           "children": [
                             {
-                              "label": "Back",
                               "action": "PREV",
                               "variant": "ghost",
                               "icon": "arrow-left",
-                              "type": "button"
+                              "type": "button",
+                              "label": "Back"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "justify": "start"
                         }
-                      ],
-                      "direction": "vertical",
-                      "gap": "lg"
+                      ]
                     }
                   ]
                 ]
@@ -3413,24 +3413,23 @@
                     {
                       "className": "max-w-xl mx-auto w-full",
                       "direction": "vertical",
-                      "type": "stack",
                       "gap": "lg",
                       "children": [
                         {
-                          "type": "typography",
+                          "variant": "h2",
                           "content": "Book Appointment",
-                          "variant": "h2"
+                          "type": "typography"
                         },
                         {
-                          "type": "wizard-progress",
-                          "currentStep": 0.0,
                           "steps": [
                             "Select Provider",
                             "Select Time",
                             "Your Details",
                             "Payment",
                             "Confirmation"
-                          ]
+                          ],
+                          "currentStep": 0.0,
+                          "type": "wizard-progress"
                         },
                         {
                           "type": "divider"
@@ -3441,20 +3440,21 @@
                           "content": "Select Provider"
                         },
                         {
-                          "showCancel": false,
                           "mode": "create",
+                          "type": "form-section",
                           "submitEvent": "NEXT",
+                          "showCancel": false,
                           "submitLabel": "Continue",
                           "fields": [
                             {
-                              "required": true,
                               "name": "providerName",
-                              "min": 2.0
+                              "min": 2.0,
+                              "required": true
                             }
-                          ],
-                          "type": "form-section"
+                          ]
                         }
-                      ]
+                      ],
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -3558,38 +3558,38 @@
           "name": "AppointmentAppLayout",
           "linkedEntity": "Appointment",
           "config": {
-            "notificationClickEvent": "APPOINTMENT_NOTIFICATIONS_OPEN",
-            "notifications": [],
+            "topBarActions": [],
             "contentTrait": "@trait.AppointmentDashboard",
-            "searchEvent": "APPOINTMENT_SEARCH",
-            "appName": "BookingSystemApp",
             "navItems": [
               {
                 "href": "/providers",
-                "label": "Providers",
-                "icon": "user-check"
+                "icon": "user-check",
+                "label": "Providers"
               },
               {
+                "label": "Book",
                 "href": "/book",
-                "icon": "calendar-plus",
-                "label": "Book"
+                "icon": "calendar-plus"
               },
               {
                 "icon": "calendar",
-                "href": "/appointments",
-                "label": "Appointments"
+                "label": "Appointments",
+                "href": "/appointments"
               },
               {
-                "label": "Schedule",
                 "href": "/schedule",
-                "icon": "clock"
+                "icon": "clock",
+                "label": "Schedule"
               }
             ],
-            "topBarActions": []
+            "appName": "BookingSystemApp",
+            "notifications": [],
+            "searchEvent": "APPOINTMENT_SEARCH",
+            "notificationClickEvent": "APPOINTMENT_NOTIFICATIONS_OPEN"
           },
           "events": {
-            "SEARCH": "APPOINTMENT_SEARCH",
-            "NOTIFY_CLICK": "APPOINTMENT_NOTIFICATIONS_OPEN"
+            "NOTIFY_CLICK": "APPOINTMENT_NOTIFICATIONS_OPEN",
+            "SEARCH": "APPOINTMENT_SEARCH"
           }
         },
         {
@@ -3634,48 +3634,47 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
                       "gap": "lg",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "justify": "between",
-                          "align": "center",
+                          "gap": "md",
                           "children": [
                             {
-                              "type": "stack",
+                              "direction": "horizontal",
+                              "align": "center",
                               "gap": "sm",
                               "children": [
                                 {
-                                  "name": "calendar",
-                                  "type": "icon"
+                                  "type": "icon",
+                                  "name": "calendar"
                                 },
                                 {
-                                  "variant": "h2",
+                                  "type": "typography",
                                   "content": "Appointments",
-                                  "type": "typography"
+                                  "variant": "h2"
                                 }
                               ],
-                              "align": "center",
-                              "direction": "horizontal"
+                              "type": "stack"
                             },
                             {
                               "children": [
                                 {
                                   "icon": "plus",
+                                  "action": "CREATE",
                                   "label": "Create Appointment",
                                   "type": "button",
-                                  "action": "CREATE",
                                   "variant": "primary"
                                 }
                               ],
-                              "type": "stack",
+                              "direction": "horizontal",
                               "gap": "sm",
-                              "direction": "horizontal"
+                              "type": "stack"
                             }
                           ],
-                          "gap": "md"
+                          "justify": "between",
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
@@ -3686,7 +3685,8 @@
                         },
                         "@trait.AppointmentBrowseList"
                       ],
-                      "direction": "vertical"
+                      "direction": "vertical",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -3700,9 +3700,9 @@
           "name": "AppointmentCalendar",
           "linkedEntity": "Appointment",
           "config": {
+            "dateField": "scheduledAt",
             "titleField": "summary",
-            "colorField": "status",
-            "dateField": "scheduledAt"
+            "colorField": "status"
           },
           "listens": [
             {
@@ -3746,46 +3746,28 @@
           "linkedEntity": "Appointment",
           "config": {
             "gap": "sm",
-            "cols": 1.0,
-            "itemActions": [
-              {
-                "variant": "ghost",
-                "event": "VIEW",
-                "label": "View"
-              },
-              {
-                "variant": "ghost",
-                "label": "Edit",
-                "event": "EDIT"
-              },
-              {
-                "label": "Delete",
-                "event": "DELETE",
-                "variant": "danger"
-              }
-            ],
             "fields": [
               {
-                "icon": "calendar",
-                "name": "summary",
                 "variant": "h3",
+                "name": "summary",
+                "icon": "calendar",
                 "label": "Summary"
               },
               {
+                "label": "Provider",
                 "name": "providerName",
-                "variant": "body",
-                "label": "Provider"
+                "variant": "body"
               },
               {
                 "variant": "body",
-                "name": "customerName",
-                "label": "Customer"
+                "label": "Customer",
+                "name": "customerName"
               },
               {
-                "format": "date",
+                "name": "scheduledAt",
                 "label": "When",
-                "variant": "body",
-                "name": "scheduledAt"
+                "format": "date",
+                "variant": "body"
               },
               {
                 "name": "time",
@@ -3795,7 +3777,25 @@
                 "variant": "badge",
                 "name": "status"
               }
-            ]
+            ],
+            "itemActions": [
+              {
+                "label": "View",
+                "event": "VIEW",
+                "variant": "ghost"
+              },
+              {
+                "label": "Edit",
+                "variant": "ghost",
+                "event": "EDIT"
+              },
+              {
+                "event": "DELETE",
+                "label": "Delete",
+                "variant": "danger"
+              }
+            ],
+            "cols": 1.0
           },
           "listens": [
             {
@@ -3999,8 +3999,8 @@
                     "Appointment",
                     {
                       "emit": {
-                        "failure": "AppointmentLoadFailed",
-                        "success": "AppointmentLoaded"
+                        "success": "AppointmentLoaded",
+                        "failure": "AppointmentLoadFailed"
                       }
                     }
                   ]
@@ -4026,30 +4026,29 @@
                     "modal",
                     {
                       "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md",
                       "children": [
                         {
+                          "gap": "sm",
                           "type": "stack",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "name": "plus-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "plus-circle"
                             },
                             {
                               "content": "Create Appointment",
-                              "variant": "h3",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
                           ],
-                          "gap": "sm"
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE",
+                          "type": "form-section",
                           "fields": [
                             "providerName",
                             "customerName",
@@ -4060,10 +4059,11 @@
                             "notes"
                           ],
                           "mode": "create",
-                          "cancelEvent": "CLOSE",
-                          "type": "form-section"
+                          "submitEvent": "SAVE"
                         }
-                      ]
+                      ],
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -4315,8 +4315,8 @@
                     "Appointment",
                     {
                       "emit": {
-                        "success": "AppointmentLoaded",
-                        "failure": "AppointmentLoadFailed"
+                        "failure": "AppointmentLoadFailed",
+                        "success": "AppointmentLoaded"
                       }
                     }
                   ]
@@ -4331,41 +4331,40 @@
                     "fetch",
                     "Appointment",
                     {
-                      "id": "@payload.id",
                       "emit": {
-                        "failure": "AppointmentLoadFailed",
-                        "success": "AppointmentLoaded"
-                      }
+                        "success": "AppointmentLoaded",
+                        "failure": "AppointmentLoadFailed"
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
-                      "direction": "vertical",
                       "children": [
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "edit"
+                              "name": "edit",
+                              "type": "icon"
                             },
                             {
                               "content": "Edit Appointment",
-                              "variant": "h3",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "sm",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "submitEvent": "SAVE",
+                          "type": "form-section",
                           "cancelEvent": "CLOSE",
                           "fields": [
                             "providerName",
@@ -4376,12 +4375,13 @@
                             "status",
                             "notes"
                           ],
-                          "mode": "edit",
-                          "type": "form-section",
-                          "entity": "@payload.row"
+                          "entity": "@payload.row",
+                          "mode": "edit"
                         }
                       ],
-                      "type": "stack"
+                      "direction": "vertical",
+                      "type": "stack",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -4422,8 +4422,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "AppointmentUpdated",
-                        "failure": "AppointmentUpdateFailed"
+                        "failure": "AppointmentUpdateFailed",
+                        "success": "AppointmentUpdated"
                       }
                     }
                   ],
@@ -4608,8 +4608,8 @@
                     "Appointment",
                     {
                       "emit": {
-                        "failure": "AppointmentLoadFailed",
-                        "success": "AppointmentLoaded"
+                        "success": "AppointmentLoaded",
+                        "failure": "AppointmentLoadFailed"
                       }
                     }
                   ]
@@ -4624,22 +4624,19 @@
                     "fetch",
                     "Appointment",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "AppointmentLoaded",
                         "failure": "AppointmentLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
                           "align": "center",
                           "children": [
                             {
@@ -4647,39 +4644,41 @@
                               "type": "icon"
                             },
                             {
-                              "variant": "h3",
                               "content": "@entity.summary",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
                           ],
-                          "gap": "sm"
+                          "direction": "horizontal",
+                          "gap": "sm",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "type": "stack",
                           "direction": "horizontal",
                           "gap": "md",
-                          "type": "stack",
                           "children": [
                             {
+                              "type": "typography",
                               "content": "Provider",
-                              "variant": "caption",
-                              "type": "typography"
+                              "variant": "caption"
                             },
                             {
-                              "type": "typography",
+                              "variant": "body",
                               "content": "@entity.providerName",
-                              "variant": "body"
+                              "type": "typography"
                             }
                           ]
                         },
                         {
                           "children": [
                             {
-                              "content": "Customer",
+                              "variant": "caption",
                               "type": "typography",
-                              "variant": "caption"
+                              "content": "Customer"
                             },
                             {
                               "type": "typography",
@@ -4687,14 +4686,11 @@
                               "variant": "body"
                             }
                           ],
-                          "type": "stack",
                           "gap": "md",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "type": "stack"
                         },
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "md",
                           "children": [
                             {
                               "variant": "caption",
@@ -4702,16 +4698,19 @@
                               "type": "typography"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
+                              "type": "typography",
                               "content": "@entity.scheduledAt"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "gap": "md",
+                          "direction": "horizontal"
                         },
                         {
+                          "type": "stack",
                           "gap": "md",
                           "direction": "horizontal",
-                          "type": "stack",
                           "children": [
                             {
                               "type": "typography",
@@ -4719,38 +4718,38 @@
                               "content": "Time"
                             },
                             {
-                              "variant": "body",
                               "type": "typography",
+                              "variant": "body",
                               "content": "@entity.time"
                             }
                           ]
                         },
                         {
                           "type": "stack",
+                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
+                              "type": "typography",
                               "variant": "caption",
-                              "content": "Status",
-                              "type": "typography"
+                              "content": "Status"
                             },
                             {
                               "type": "typography",
                               "variant": "body",
                               "content": "@entity.status"
                             }
-                          ],
-                          "direction": "horizontal",
-                          "gap": "md"
+                          ]
                         },
                         {
-                          "type": "stack",
                           "gap": "md",
                           "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
+                              "type": "typography",
                               "variant": "caption",
-                              "content": "Notes",
-                              "type": "typography"
+                              "content": "Notes"
                             },
                             {
                               "type": "typography",
@@ -4763,29 +4762,30 @@
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
-                          "gap": "sm",
-                          "justify": "end",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "button",
-                              "variant": "primary",
-                              "label": "Edit",
                               "icon": "edit",
+                              "label": "Edit",
+                              "variant": "primary",
+                              "type": "button",
                               "action": "EDIT"
                             },
                             {
-                              "label": "Close",
+                              "action": "CLOSE",
                               "variant": "ghost",
                               "type": "button",
-                              "action": "CLOSE"
+                              "label": "Close"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "justify": "end",
+                          "gap": "sm"
                         }
                       ],
+                      "direction": "vertical",
                       "gap": "md",
-                      "direction": "vertical"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -5039,25 +5039,22 @@
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
-                          "align": "center",
-                          "gap": "sm",
                           "children": [
                             {
-                              "name": "alert-triangle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "alert-triangle"
                             },
                             {
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "Delete Appointment"
+                              "content": "Delete Appointment",
+                              "variant": "h3"
                             }
                           ],
+                          "gap": "sm",
+                          "align": "center",
+                          "type": "stack",
                           "direction": "horizontal"
                         },
                         {
@@ -5065,31 +5062,34 @@
                         },
                         {
                           "message": "This action cannot be undone.",
-                          "variant": "error",
-                          "type": "alert"
+                          "type": "alert",
+                          "variant": "error"
                         },
                         {
-                          "justify": "end",
-                          "gap": "sm",
                           "children": [
                             {
-                              "label": "Cancel",
                               "action": "CANCEL",
                               "variant": "ghost",
-                              "type": "button"
+                              "type": "button",
+                              "label": "Cancel"
                             },
                             {
                               "variant": "danger",
                               "action": "CONFIRM_DELETE",
-                              "label": "Delete",
                               "type": "button",
-                              "icon": "check"
+                              "icon": "check",
+                              "label": "Delete"
                             }
                           ],
+                          "gap": "sm",
                           "type": "stack",
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "justify": "end"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "gap": "md",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -5128,8 +5128,8 @@
                     "Appointment",
                     {
                       "emit": {
-                        "failure": "AppointmentLoadFailed",
-                        "success": "AppointmentLoaded"
+                        "success": "AppointmentLoaded",
+                        "failure": "AppointmentLoadFailed"
                       }
                     }
                   ],
@@ -5190,8 +5190,8 @@
                     "Appointment",
                     {
                       "emit": {
-                        "success": "AppointmentLoaded",
-                        "failure": "AppointmentLoadFailed"
+                        "failure": "AppointmentLoadFailed",
+                        "success": "AppointmentLoaded"
                       }
                     }
                   ]
@@ -5280,6 +5280,11 @@
           "name": "ScheduleAppLayout",
           "linkedEntity": "Schedule",
           "config": {
+            "searchEvent": "SCHEDULE_SEARCH",
+            "appName": "BookingSystemApp",
+            "contentTrait": "@trait.ScheduleDisplay",
+            "topBarActions": [],
+            "notifications": [],
             "notificationClickEvent": "SCHEDULE_NOTIFICATIONS_OPEN",
             "navItems": [
               {
@@ -5288,26 +5293,21 @@
                 "label": "Providers"
               },
               {
+                "label": "Book",
                 "icon": "calendar-plus",
-                "href": "/book",
-                "label": "Book"
+                "href": "/book"
               },
               {
+                "icon": "calendar",
                 "href": "/appointments",
-                "label": "Appointments",
-                "icon": "calendar"
+                "label": "Appointments"
               },
               {
                 "label": "Schedule",
                 "href": "/schedule",
                 "icon": "clock"
               }
-            ],
-            "topBarActions": [],
-            "contentTrait": "@trait.ScheduleDisplay",
-            "notifications": [],
-            "searchEvent": "SCHEDULE_SEARCH",
-            "appName": "BookingSystemApp"
+            ]
           },
           "events": {
             "NOTIFY_CLICK": "SCHEDULE_NOTIFICATIONS_OPEN",
@@ -5447,70 +5447,70 @@
                       "type": "stack",
                       "children": [
                         {
-                          "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal",
-                          "justify": "between",
                           "align": "center",
+                          "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
                               "align": "center",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "clock"
+                                  "name": "clock",
+                                  "type": "icon"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "h2",
+                                  "type": "typography",
                                   "content": "Schedule Overview"
                                 }
                               ],
-                              "direction": "horizontal",
                               "gap": "sm",
                               "type": "stack"
                             },
                             {
+                              "action": "REFRESH",
                               "type": "button",
                               "label": "Refresh",
-                              "variant": "secondary",
                               "icon": "refresh-cw",
-                              "action": "REFRESH"
+                              "variant": "secondary"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "justify": "between"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "cols": 4.0,
-                          "type": "simple-grid",
                           "children": [
                             {
-                              "value": "@entity.totalBookings",
+                              "icon": "calendar",
                               "label": "Total Bookings",
-                              "type": "stat-display",
-                              "icon": "calendar"
+                              "value": "@entity.totalBookings",
+                              "type": "stat-display"
                             },
                             {
-                              "type": "stat-display",
+                              "value": "@entity.confirmedToday",
                               "icon": "check-circle",
                               "label": "Confirmed Today",
-                              "value": "@entity.confirmedToday"
+                              "type": "stat-display"
                             },
                             {
-                              "type": "stat-display",
                               "label": "Pending",
                               "value": "@entity.pendingBookings",
-                              "icon": "clock"
+                              "icon": "clock",
+                              "type": "stat-display"
                             },
                             {
+                              "value": "@entity.availableSlots",
                               "label": "Available Slots",
                               "icon": "calendar-plus",
-                              "value": "@entity.availableSlots",
                               "type": "stat-display"
                             }
-                          ]
+                          ],
+                          "type": "simple-grid"
                         },
                         {
                           "type": "divider"
@@ -5544,20 +5544,20 @@
                     "render-ui",
                     "main",
                     {
-                      "className": "py-12",
-                      "direction": "vertical",
                       "type": "stack",
-                      "align": "center",
+                      "direction": "vertical",
                       "gap": "md",
+                      "align": "center",
+                      "className": "py-12",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
+                          "color": "muted",
                           "content": "Refreshing…",
                           "variant": "caption",
-                          "color": "muted"
+                          "type": "typography"
                         }
                       ]
                     }
@@ -5573,40 +5573,39 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "lg",
                       "children": [
                         {
+                          "align": "center",
+                          "justify": "between",
                           "children": [
                             {
+                              "gap": "sm",
                               "direction": "horizontal",
+                              "type": "stack",
+                              "align": "center",
                               "children": [
                                 {
-                                  "name": "clock",
-                                  "type": "icon"
+                                  "type": "icon",
+                                  "name": "clock"
                                 },
                                 {
-                                  "type": "typography",
+                                  "variant": "h2",
                                   "content": "Schedule Overview",
-                                  "variant": "h2"
+                                  "type": "typography"
                                 }
-                              ],
-                              "gap": "sm",
-                              "align": "center",
-                              "type": "stack"
+                              ]
                             },
                             {
-                              "action": "REFRESH",
                               "icon": "refresh-cw",
+                              "type": "button",
                               "label": "Refresh",
-                              "variant": "secondary",
-                              "type": "button"
+                              "action": "REFRESH",
+                              "variant": "secondary"
                             }
                           ],
-                          "align": "center",
                           "type": "stack",
                           "direction": "horizontal",
-                          "gap": "md",
-                          "justify": "between"
+                          "gap": "md"
                         },
                         {
                           "type": "divider"
@@ -5614,28 +5613,28 @@
                         {
                           "children": [
                             {
-                              "type": "stat-display",
+                              "value": "@entity.totalBookings",
                               "icon": "calendar",
                               "label": "Total Bookings",
-                              "value": "@entity.totalBookings"
+                              "type": "stat-display"
                             },
                             {
-                              "label": "Confirmed Today",
-                              "type": "stat-display",
+                              "value": "@entity.confirmedToday",
                               "icon": "check-circle",
-                              "value": "@entity.confirmedToday"
+                              "label": "Confirmed Today",
+                              "type": "stat-display"
                             },
                             {
-                              "type": "stat-display",
                               "label": "Pending",
-                              "value": "@entity.pendingBookings",
-                              "icon": "clock"
+                              "icon": "clock",
+                              "type": "stat-display",
+                              "value": "@entity.pendingBookings"
                             },
                             {
                               "icon": "calendar-plus",
-                              "label": "Available Slots",
+                              "type": "stat-display",
                               "value": "@entity.availableSlots",
-                              "type": "stat-display"
+                              "label": "Available Slots"
                             }
                           ],
                           "cols": 4.0,
@@ -5649,7 +5648,8 @@
                         }
                       ],
                       "type": "stack",
-                      "direction": "vertical"
+                      "direction": "vertical",
+                      "gap": "lg"
                     }
                   ]
                 ]
@@ -5664,72 +5664,73 @@
                     "main",
                     {
                       "type": "stack",
+                      "gap": "lg",
                       "children": [
                         {
-                          "type": "stack",
-                          "align": "center",
                           "gap": "md",
                           "justify": "between",
+                          "direction": "horizontal",
                           "children": [
                             {
+                              "align": "center",
+                              "gap": "sm",
+                              "type": "stack",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "clock"
+                                  "name": "clock",
+                                  "type": "icon"
                                 },
                                 {
                                   "content": "Schedule Overview",
-                                  "type": "typography",
-                                  "variant": "h2"
+                                  "variant": "h2",
+                                  "type": "typography"
                                 }
-                              ],
-                              "align": "center",
-                              "direction": "horizontal",
-                              "type": "stack",
-                              "gap": "sm"
+                              ]
                             },
                             {
                               "label": "Refresh",
-                              "icon": "refresh-cw",
-                              "action": "REFRESH",
                               "type": "button",
+                              "action": "REFRESH",
+                              "icon": "refresh-cw",
                               "variant": "secondary"
                             }
                           ],
-                          "direction": "horizontal"
+                          "align": "center",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "simple-grid",
-                          "cols": 4.0,
                           "children": [
                             {
                               "value": "@entity.totalBookings",
-                              "label": "Total Bookings",
                               "type": "stat-display",
+                              "label": "Total Bookings",
                               "icon": "calendar"
                             },
                             {
                               "type": "stat-display",
+                              "label": "Confirmed Today",
                               "value": "@entity.confirmedToday",
-                              "icon": "check-circle",
-                              "label": "Confirmed Today"
+                              "icon": "check-circle"
                             },
                             {
-                              "type": "stat-display",
-                              "value": "@entity.pendingBookings",
+                              "icon": "clock",
                               "label": "Pending",
-                              "icon": "clock"
+                              "type": "stat-display",
+                              "value": "@entity.pendingBookings"
                             },
                             {
-                              "label": "Available Slots",
-                              "type": "stat-display",
                               "icon": "calendar-plus",
-                              "value": "@entity.availableSlots"
+                              "value": "@entity.availableSlots",
+                              "label": "Available Slots",
+                              "type": "stat-display"
                             }
-                          ]
+                          ],
+                          "type": "simple-grid",
+                          "cols": 4.0
                         },
                         {
                           "type": "divider"
@@ -5738,7 +5739,6 @@
                           "type": "calendar-grid"
                         }
                       ],
-                      "gap": "lg",
                       "direction": "vertical"
                     }
                   ]
@@ -5753,9 +5753,9 @@
                     "render-ui",
                     "main",
                     {
-                      "gap": "md",
                       "className": "py-12",
                       "align": "center",
+                      "type": "stack",
                       "children": [
                         {
                           "name": "alert-triangle",
@@ -5763,26 +5763,26 @@
                           "type": "icon"
                         },
                         {
-                          "content": "Failed to refresh schedule",
+                          "type": "typography",
                           "variant": "h3",
-                          "type": "typography"
+                          "content": "Failed to refresh schedule"
                         },
                         {
-                          "variant": "body",
                           "color": "muted",
+                          "variant": "body",
                           "type": "typography",
                           "content": "@payload.error"
                         },
                         {
                           "label": "Retry",
-                          "action": "REFRESH",
                           "variant": "primary",
-                          "icon": "rotate-ccw",
-                          "type": "button"
+                          "action": "REFRESH",
+                          "type": "button",
+                          "icon": "rotate-ccw"
                         }
                       ],
                       "direction": "vertical",
-                      "type": "stack"
+                      "gap": "md"
                     }
                   ]
                 ]