@almadar/std 14.5.1 → 14.6.0

package/dist/behaviors/registry/app/organisms/std-hr-portal.orb

@@ -1,7 +1,7 @@
 {
   "name": "std-hr-portal",
   "version": "1.0.0",
-  "description": "std-hr-portal as a Function",
+  "description": "HR portal: employees, onboarding flows, time-off requests, and org chart.",
   "orbitals": [
     {
       "name": "EmployeeOrbital",
@@ -57,37 +57,37 @@
           "ref": "AppShell.traits.AppLayout",
           "name": "EmployeeAppLayout",
           "config": {
+            "searchEvent": "EMPLOYEE_SEARCH",
+            "notificationClickEvent": "EMPLOYEE_NOTIFICATIONS_OPEN",
             "appName": "HRPortal",
+            "contentTrait": "@trait.EmployeeBrowse",
+            "notifications": [],
             "navItems": [
               {
-                "icon": "users",
+                "label": "Employees",
                 "href": "/employees",
-                "label": "Employees"
+                "icon": "users"
               },
               {
+                "href": "/onboarding",
                 "label": "Onboarding",
-                "icon": "layout-list",
-                "href": "/onboarding"
+                "icon": "layout-list"
               },
               {
                 "href": "/timeoff",
-                "label": "Time Off",
-                "icon": "calendar"
+                "icon": "calendar",
+                "label": "Time Off"
               },
               {
+                "label": "Org Chart",
                 "href": "/org-chart",
-                "icon": "layout-list",
-                "label": "Org Chart"
+                "icon": "layout-list"
               }
-            ],
-            "searchEvent": "EMPLOYEE_SEARCH",
-            "contentTrait": "@trait.EmployeeBrowse",
-            "notificationClickEvent": "EMPLOYEE_NOTIFICATIONS_OPEN",
-            "notifications": []
+            ]
           },
           "events": {
-            "SEARCH": "EMPLOYEE_SEARCH",
-            "NOTIFY_CLICK": "EMPLOYEE_NOTIFICATIONS_OPEN"
+            "NOTIFY_CLICK": "EMPLOYEE_NOTIFICATIONS_OPEN",
+            "SEARCH": "EMPLOYEE_SEARCH"
           }
         },
         {
@@ -761,21 +761,21 @@
                     "main",
                     {
                       "direction": "vertical",
-                      "gap": "md",
-                      "type": "stack",
-                      "className": "py-12",
-                      "align": "center",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "color": "muted",
-                          "type": "typography",
                           "variant": "caption",
-                          "content": "Loading…"
+                          "color": "muted",
+                          "content": "Loading…",
+                          "type": "typography"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "gap": "md",
+                      "align": "center",
+                      "className": "py-12"
                     }
                   ]
                 ]
@@ -790,8 +790,8 @@
                     "Employee",
                     {
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
                       }
                     }
                   ],
@@ -800,21 +800,21 @@
                     "main",
                     {
                       "direction": "vertical",
-                      "className": "py-12",
                       "type": "stack",
                       "align": "center",
+                      "gap": "md",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "type": "typography",
-                          "variant": "caption",
                           "color": "muted",
-                          "content": "Searching…"
+                          "content": "Searching…",
+                          "type": "typography",
+                          "variant": "caption"
                         }
                       ],
-                      "gap": "md"
+                      "className": "py-12"
                     }
                   ]
                 ]
@@ -828,32 +828,32 @@
                     "render-ui",
                     "main",
                     {
-                      "align": "center",
-                      "type": "stack",
-                      "direction": "vertical",
                       "className": "py-8",
+                      "type": "stack",
+                      "align": "center",
                       "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "name": "bell",
-                          "type": "icon"
+                          "type": "icon",
+                          "name": "bell"
                         },
                         {
-                          "type": "typography",
                           "variant": "h3",
+                          "type": "typography",
                           "content": "No notifications"
                         },
                         {
-                          "type": "typography",
+                          "variant": "caption",
                           "color": "muted",
-                          "content": "You're all caught up.",
-                          "variant": "caption"
+                          "type": "typography",
+                          "content": "You're all caught up."
                         },
                         {
+                          "label": "Back to employees",
                           "action": "INIT",
                           "variant": "ghost",
-                          "type": "button",
-                          "label": "Back to employees"
+                          "type": "button"
                         }
                       ]
                     }
@@ -869,60 +869,61 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "stack",
                       "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
-                          "justify": "between",
-                          "gap": "md",
-                          "align": "center",
                           "children": [
                             {
-                              "direction": "horizontal",
-                              "gap": "sm",
-                              "type": "stack",
-                              "align": "center",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "users"
+                                  "name": "users",
+                                  "type": "icon"
                                 },
                                 {
-                                  "content": "Employees",
+                                  "variant": "h2",
                                   "type": "typography",
-                                  "variant": "h2"
+                                  "content": "Employees"
                                 }
-                              ]
+                              ],
+                              "gap": "sm",
+                              "align": "center",
+                              "type": "stack",
+                              "direction": "horizontal"
                             },
                             {
                               "gap": "sm",
+                              "type": "stack",
                               "direction": "horizontal",
                               "children": [
                                 {
-                                  "type": "button",
                                   "label": "Add Employee",
                                   "variant": "primary",
                                   "icon": "plus",
+                                  "type": "button",
                                   "action": "CREATE"
                                 }
-                              ],
-                              "type": "stack"
+                              ]
                             }
                           ],
-                          "direction": "horizontal"
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "justify": "between",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "variant": "card",
                           "type": "data-list",
                           "entity": "@payload.data",
+                          "gap": "sm",
                           "fields": [
                             {
-                              "icon": "user",
+                              "name": "name",
                               "variant": "h3",
-                              "name": "name"
+                              "icon": "user"
                             },
                             {
                               "name": "department",
@@ -938,32 +939,31 @@
                             },
                             {
                               "label": "Joined",
+                              "name": "startDate",
                               "variant": "caption",
-                              "format": "date",
-                              "name": "startDate"
+                              "format": "date"
                             }
                           ],
                           "itemActions": [
                             {
+                              "label": "View",
                               "variant": "ghost",
-                              "event": "VIEW",
-                              "label": "View"
+                              "event": "VIEW"
                             },
                             {
-                              "variant": "ghost",
+                              "label": "Edit",
                               "event": "EDIT",
-                              "label": "Edit"
+                              "variant": "ghost"
                             },
                             {
-                              "label": "Delete",
                               "event": "DELETE",
-                              "variant": "danger"
+                              "variant": "danger",
+                              "label": "Delete"
                             }
-                          ],
-                          "variant": "card",
-                          "gap": "sm"
+                          ]
                         }
                       ],
+                      "type": "stack",
                       "gap": "lg"
                     }
                   ]
@@ -979,35 +979,35 @@
                     "main",
                     {
                       "gap": "md",
-                      "className": "py-12",
                       "type": "stack",
+                      "className": "py-12",
+                      "direction": "vertical",
                       "align": "center",
                       "children": [
                         {
-                          "name": "alert-triangle",
                           "color": "destructive",
-                          "type": "icon"
+                          "type": "icon",
+                          "name": "alert-triangle"
                         },
                         {
+                          "content": "Failed to load employee",
                           "type": "typography",
-                          "variant": "h3",
-                          "content": "Failed to load employee"
+                          "variant": "h3"
                         },
                         {
                           "variant": "body",
-                          "content": "@payload.error",
                           "type": "typography",
-                          "color": "muted"
+                          "color": "muted",
+                          "content": "@payload.error"
                         },
                         {
                           "label": "Retry",
-                          "action": "INIT",
                           "icon": "rotate-ccw",
+                          "variant": "primary",
                           "type": "button",
-                          "variant": "primary"
+                          "action": "INIT"
                         }
-                      ],
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -1216,10 +1216,10 @@
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
                       "children": [
                         {
                           "type": "stack",
+                          "direction": "horizontal",
                           "gap": "sm",
                           "children": [
                             {
@@ -1228,19 +1228,17 @@
                             },
                             {
                               "content": "New Employee",
-                              "type": "typography",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             }
-                          ],
-                          "direction": "horizontal"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "cancelEvent": "CLOSE",
-                          "mode": "create",
                           "type": "form-section",
+                          "mode": "create",
                           "fields": [
                             "name",
                             "email",
@@ -1248,11 +1246,13 @@
                             "role",
                             "startDate"
                           ],
-                          "submitEvent": "SAVE"
+                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE"
                         }
                       ],
+                      "direction": "vertical",
                       "gap": "md",
-                      "direction": "vertical"
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -1513,8 +1513,8 @@
                     "Employee",
                     {
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
                       }
                     }
                   ]
@@ -1529,11 +1529,11 @@
                     "fetch",
                     "Employee",
                     {
-                      "id": "@payload.id",
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
-                      }
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
@@ -1542,6 +1542,7 @@
                     {
                       "direction": "vertical",
                       "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
                           "type": "stack",
@@ -1549,13 +1550,13 @@
                           "direction": "horizontal",
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
                               "content": "Edit Employee",
-                              "variant": "h3",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
                           ]
                         },
@@ -1563,7 +1564,7 @@
                           "type": "divider"
                         },
                         {
-                          "type": "form-section",
+                          "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
                             "email",
@@ -1571,13 +1572,12 @@
                             "role",
                             "startDate"
                           ],
+                          "type": "form-section",
                           "submitEvent": "SAVE",
                           "entity": "@payload.row",
-                          "cancelEvent": "CLOSE",
                           "mode": "edit"
                         }
-                      ],
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -1618,8 +1618,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "EmployeeUpdated",
-                        "failure": "EmployeeUpdateFailed"
+                        "failure": "EmployeeUpdateFailed",
+                        "success": "EmployeeUpdated"
                       }
                     }
                   ],
@@ -1802,8 +1802,8 @@
                     "Employee",
                     {
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
                       }
                     }
                   ]
@@ -1818,20 +1818,18 @@
                     "fetch",
                     "Employee",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "EmployeeLoaded",
                         "failure": "EmployeeLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
                       "gap": "md",
-                      "type": "stack",
                       "children": [
                         {
                           "children": [
@@ -1840,21 +1838,21 @@
                               "type": "icon"
                             },
                             {
+                              "variant": "h3",
                               "content": "@entity.name",
-                              "type": "typography",
-                              "variant": "h3"
+                              "type": "typography"
                             }
                           ],
-                          "gap": "sm",
-                          "direction": "horizontal",
                           "type": "stack",
-                          "align": "center"
+                          "direction": "horizontal",
+                          "align": "center",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
+                          "direction": "horizontal",
                           "gap": "md",
                           "children": [
                             {
@@ -1863,16 +1861,14 @@
                               "content": "Name"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
+                              "type": "typography",
                               "content": "@entity.name"
                             }
                           ],
-                          "direction": "horizontal"
+                          "type": "stack"
                         },
                         {
-                          "type": "stack",
-                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
@@ -1880,14 +1876,18 @@
                               "content": "Email"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.email",
+                              "variant": "body",
                               "type": "typography"
                             }
                           ],
-                          "direction": "horizontal"
+                          "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "md"
                         },
                         {
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
                               "type": "typography",
@@ -1900,12 +1900,12 @@
                               "type": "typography"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "md",
-                          "type": "stack"
+                          "gap": "md"
                         },
                         {
                           "type": "stack",
+                          "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
                               "variant": "caption",
@@ -1917,52 +1917,52 @@
                               "variant": "body",
                               "content": "@entity.role"
                             }
-                          ],
-                          "gap": "md",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
-                          "gap": "md",
                           "type": "stack",
                           "direction": "horizontal",
                           "children": [
                             {
+                              "variant": "caption",
                               "content": "Start Date",
-                              "type": "typography",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.startDate"
+                              "content": "@entity.startDate",
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "gap": "md"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "justify": "end",
+                          "type": "stack",
+                          "gap": "sm",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "primary",
                               "icon": "edit",
-                              "action": "EDIT",
+                              "variant": "primary",
                               "type": "button",
+                              "action": "EDIT",
                               "label": "Edit"
                             },
                             {
                               "variant": "ghost",
+                              "label": "Close",
                               "type": "button",
-                              "action": "CLOSE",
-                              "label": "Close"
+                              "action": "CLOSE"
                             }
-                          ],
-                          "gap": "sm",
-                          "direction": "horizontal",
-                          "type": "stack"
+                          ]
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -2224,21 +2224,24 @@
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
-                          "align": "center",
                           "direction": "horizontal",
                           "gap": "sm",
+                          "type": "stack",
+                          "align": "center",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "alert-triangle"
+                              "name": "alert-triangle",
+                              "type": "icon"
                             },
                             {
                               "content": "Delete Employee",
-                              "variant": "h3",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
                           ]
                         },
@@ -2246,35 +2249,32 @@
                           "type": "divider"
                         },
                         {
-                          "message": "This action cannot be undone.",
+                          "type": "alert",
                           "variant": "error",
-                          "type": "alert"
+                          "message": "This action cannot be undone."
                         },
                         {
+                          "justify": "end",
                           "direction": "horizontal",
                           "gap": "sm",
-                          "type": "stack",
                           "children": [
                             {
-                              "variant": "ghost",
-                              "type": "button",
                               "label": "Cancel",
-                              "action": "CANCEL"
+                              "action": "CANCEL",
+                              "type": "button",
+                              "variant": "ghost"
                             },
                             {
-                              "variant": "danger",
-                              "icon": "check",
                               "label": "Delete",
                               "type": "button",
-                              "action": "CONFIRM_DELETE"
+                              "action": "CONFIRM_DELETE",
+                              "variant": "danger",
+                              "icon": "check"
                             }
                           ],
-                          "justify": "end"
+                          "type": "stack"
                         }
-                      ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -2291,8 +2291,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "success": "EmployeeDeleted",
-                        "failure": "EmployeeDeleteFailed"
+                        "failure": "EmployeeDeleteFailed",
+                        "success": "EmployeeDeleted"
                       }
                     }
                   ],
@@ -2375,8 +2375,8 @@
                     "Employee",
                     {
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
                       }
                     }
                   ]
@@ -2656,20 +2656,43 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/onboarding",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "href": "/timeoff",
+                          "label": "Time Off",
+                          "icon": "calendar"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "label": "Org Chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "container",
-                          "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
+                              "type": "stack",
                               "direction": "vertical",
+                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "stack",
+                                  "align": "center",
                                   "direction": "horizontal",
                                   "gap": "sm",
-                                  "align": "center",
                                   "children": [
                                     {
                                       "type": "icon",
@@ -2677,8 +2700,8 @@
                                     },
                                     {
                                       "type": "typography",
-                                      "variant": "h2",
-                                      "content": "Employee Onboarding"
+                                      "content": "Employee Onboarding",
+                                      "variant": "h2"
                                     }
                                   ]
                                 },
@@ -2689,75 +2712,52 @@
                                 },
                                 {
                                   "type": "wizard-progress",
-                                  "currentStep": 0.0,
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ]
+                                  ],
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Employee Details",
-                                  "variant": "h3"
+                                  "variant": "h3",
+                                  "type": "typography"
                                 },
                                 {
-                                  "cancelEvent": "INIT",
-                                  "submitEvent": "NEXT",
                                   "type": "form-section",
+                                  "submitEvent": "NEXT",
+                                  "mode": "create",
+                                  "cancelEvent": "INIT",
                                   "fields": [
                                     "employeeName",
                                     "department"
-                                  ],
-                                  "mode": "create"
+                                  ]
                                 },
                                 {
+                                  "justify": "end",
                                   "children": [
                                     {
                                       "type": "button",
+                                      "icon": "arrow-right",
                                       "label": "Next",
                                       "variant": "primary",
-                                      "icon": "arrow-right",
                                       "action": "NEXT"
                                     }
                                   ],
-                                  "type": "stack",
                                   "direction": "horizontal",
                                   "gap": "sm",
-                                  "justify": "end"
+                                  "type": "stack"
                                 }
-                              ],
-                              "type": "stack",
-                              "gap": "lg"
+                              ]
                             }
-                          ]
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal",
-                      "navItems": [
-                        {
-                          "label": "Employees",
-                          "icon": "users",
-                          "href": "/employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "icon": "layout-list",
-                          "href": "/onboarding"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Org Chart",
-                          "href": "/org-chart"
+                          ],
+                          "type": "container",
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ]
                     }
@@ -2783,7 +2783,7 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "padding": "lg",
@@ -2791,6 +2791,9 @@
                             {
                               "children": [
                                 {
+                                  "direction": "horizontal",
+                                  "type": "stack",
+                                  "align": "center",
                                   "gap": "sm",
                                   "children": [
                                     {
@@ -2798,67 +2801,64 @@
                                       "name": "clipboard-check"
                                     },
                                     {
+                                      "type": "typography",
                                       "content": "Employee Onboarding",
-                                      "variant": "h2",
-                                      "type": "typography"
+                                      "variant": "h2"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "align": "center"
+                                  ]
                                 },
                                 {
+                                  "count": 3.0,
                                   "currentIndex": 1.0,
-                                  "type": "progress-dots",
-                                  "count": 3.0
+                                  "type": "progress-dots"
                                 },
                                 {
+                                  "currentStep": 1.0,
+                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ],
-                                  "type": "wizard-progress",
-                                  "currentStep": 1.0
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "variant": "h3",
                                   "type": "typography",
+                                  "variant": "h3",
                                   "content": "Manager Assignment"
                                 },
                                 {
+                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "PREV",
                                   "type": "form-section",
-                                  "mode": "create",
                                   "fields": [
                                     "manager"
                                   ],
-                                  "submitEvent": "NEXT",
-                                  "cancelEvent": "PREV"
+                                  "mode": "create"
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "sm",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "icon": "arrow-left",
-                                      "type": "button",
+                                      "variant": "ghost",
                                       "action": "PREV",
+                                      "type": "button",
                                       "label": "Back",
-                                      "variant": "ghost"
+                                      "icon": "arrow-left"
                                     },
                                     {
-                                      "type": "button",
-                                      "variant": "primary",
+                                      "action": "NEXT",
                                       "label": "Next",
                                       "icon": "arrow-right",
-                                      "action": "NEXT"
+                                      "type": "button",
+                                      "variant": "primary"
                                     }
                                   ],
-                                  "justify": "end"
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 }
                               ],
                               "type": "stack",
@@ -2866,25 +2866,24 @@
                               "gap": "lg"
                             }
                           ],
-                          "maxWidth": "lg",
-                          "type": "container"
+                          "type": "container",
+                          "maxWidth": "lg"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "href": "/employees",
                           "icon": "users",
-                          "label": "Employees",
-                          "href": "/employees"
+                          "label": "Employees"
                         },
                         {
-                          "href": "/onboarding",
+                          "label": "Onboarding",
                           "icon": "layout-list",
-                          "label": "Onboarding"
+                          "href": "/onboarding"
                         },
                         {
-                          "icon": "calendar",
                           "href": "/timeoff",
+                          "icon": "calendar",
                           "label": "Time Off"
                         },
                         {
@@ -2892,7 +2891,8 @@
                           "icon": "layout-list",
                           "label": "Org Chart"
                         }
-                      ]
+                      ],
+                      "appName": "HRPortal"
                     }
                   ]
                 ]
@@ -2907,8 +2907,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "failure": "OnboardingLoadFailed",
-                        "success": "OnboardingLoaded"
+                        "success": "OnboardingLoaded",
+                        "failure": "OnboardingLoadFailed"
                       }
                     }
                   ],
@@ -2918,31 +2918,33 @@
                     {
                       "children": [
                         {
+                          "maxWidth": "lg",
+                          "type": "container",
                           "children": [
                             {
                               "type": "stack",
                               "children": [
                                 {
                                   "align": "center",
+                                  "gap": "sm",
                                   "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
-                                      "variant": "h2",
                                       "type": "typography",
-                                      "content": "Employee Onboarding"
+                                      "content": "Employee Onboarding",
+                                      "variant": "h2"
                                     }
                                   ]
                                 },
                                 {
-                                  "count": 3.0,
                                   "currentIndex": 2.0,
-                                  "type": "progress-dots"
+                                  "type": "progress-dots",
+                                  "count": 3.0
                                 },
                                 {
                                   "type": "wizard-progress",
@@ -2958,75 +2960,73 @@
                                 },
                                 {
                                   "type": "typography",
-                                  "content": "Setup Checklist",
-                                  "variant": "h3"
+                                  "variant": "h3",
+                                  "content": "Setup Checklist"
                                 },
                                 {
-                                  "fields": [
-                                    "equipmentReady",
-                                    "accessGranted"
-                                  ],
                                   "mode": "create",
+                                  "type": "form-section",
                                   "cancelEvent": "PREV",
                                   "submitEvent": "NEXT",
-                                  "type": "form-section"
+                                  "fields": [
+                                    "equipmentReady",
+                                    "accessGranted"
+                                  ]
                                 },
                                 {
                                   "direction": "horizontal",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "label": "Back",
-                                      "variant": "ghost",
-                                      "type": "button",
                                       "icon": "arrow-left",
-                                      "action": "PREV"
+                                      "action": "PREV",
+                                      "type": "button",
+                                      "label": "Back",
+                                      "variant": "ghost"
                                     },
                                     {
+                                      "type": "button",
                                       "label": "Next",
                                       "action": "NEXT",
                                       "icon": "arrow-right",
-                                      "type": "button",
                                       "variant": "primary"
                                     }
                                   ],
-                                  "justify": "end",
-                                  "type": "stack",
-                                  "gap": "sm"
+                                  "gap": "sm",
+                                  "type": "stack"
                                 }
                               ],
                               "direction": "vertical",
                               "gap": "lg"
                             }
                           ],
-                          "padding": "lg",
-                          "type": "container",
-                          "maxWidth": "lg"
+                          "padding": "lg"
                         }
                       ],
                       "appName": "HRPortal",
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
+                          "href": "/employees",
                           "label": "Employees",
-                          "icon": "users",
-                          "href": "/employees"
+                          "icon": "users"
                         },
                         {
-                          "label": "Onboarding",
+                          "icon": "layout-list",
                           "href": "/onboarding",
-                          "icon": "layout-list"
+                          "label": "Onboarding"
                         },
                         {
-                          "href": "/timeoff",
+                          "label": "Time Off",
                           "icon": "calendar",
-                          "label": "Time Off"
+                          "href": "/timeoff"
                         },
                         {
                           "icon": "layout-list",
                           "label": "Org Chart",
                           "href": "/org-chart"
                         }
-                      ],
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -3050,21 +3050,22 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
+                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "direction": "horizontal",
+                                  "gap": "sm",
                                   "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
                                       "type": "typography",
@@ -3072,71 +3073,70 @@
                                       "variant": "h2"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "gap": "sm"
+                                  "type": "stack"
                                 },
                                 {
-                                  "count": 3.0,
                                   "type": "progress-dots",
+                                  "count": 3.0,
                                   "currentIndex": 0.0
                                 },
                                 {
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
                                   ],
+                                  "type": "wizard-progress",
                                   "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "content": "Employee Details",
+                                  "type": "typography",
                                   "variant": "h3",
-                                  "type": "typography"
+                                  "content": "Employee Details"
                                 },
                                 {
-                                  "cancelEvent": "INIT",
+                                  "type": "form-section",
                                   "submitEvent": "NEXT",
-                                  "mode": "create",
                                   "fields": [
                                     "employeeName",
                                     "department"
                                   ],
-                                  "type": "form-section"
+                                  "mode": "create",
+                                  "cancelEvent": "INIT"
                                 },
                                 {
-                                  "justify": "end",
-                                  "type": "stack",
-                                  "gap": "sm",
                                   "direction": "horizontal",
+                                  "gap": "sm",
+                                  "type": "stack",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "label": "Next",
                                       "action": "NEXT",
-                                      "type": "button",
+                                      "label": "Next",
                                       "icon": "arrow-right",
+                                      "type": "button",
                                       "variant": "primary"
                                     }
                                   ]
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
                           ],
-                          "padding": "lg",
                           "type": "container",
                           "maxWidth": "lg"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "navItems": [
                         {
-                          "icon": "users",
+                          "label": "Employees",
                           "href": "/employees",
-                          "label": "Employees"
+                          "icon": "users"
                         },
                         {
                           "icon": "layout-list",
@@ -3149,9 +3149,9 @@
                           "href": "/timeoff"
                         },
                         {
-                          "label": "Org Chart",
                           "href": "/org-chart",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Org Chart"
                         }
                       ]
                     }
@@ -3168,8 +3168,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -3177,34 +3177,13 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "label": "Org Chart",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
+                          "type": "stack",
+                          "direction": "vertical",
+                          "gap": "lg",
                           "children": [
                             {
-                              "align": "center",
-                              "type": "stack",
                               "gap": "sm",
                               "children": [
                                 {
@@ -3213,41 +3192,40 @@
                                 },
                                 {
                                   "type": "typography",
-                                  "content": "Employee Onboarding",
-                                  "variant": "h2"
+                                  "variant": "h2",
+                                  "content": "Employee Onboarding"
                                 }
                               ],
-                              "direction": "horizontal"
+                              "direction": "horizontal",
+                              "type": "stack",
+                              "align": "center"
                             },
                             {
-                              "type": "badge",
-                              "label": "Review"
+                              "label": "Review",
+                              "type": "badge"
                             },
                             {
                               "type": "wizard-progress",
+                              "currentStep": 3.0,
                               "steps": [
                                 "Employee Details",
                                 "Manager Assignment",
                                 "Setup Checklist"
-                              ],
-                              "currentStep": 3.0
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "stack",
-                              "gap": "sm",
                               "children": [
                                 {
                                   "type": "stack",
-                                  "justify": "between",
                                   "gap": "md",
-                                  "direction": "horizontal",
+                                  "justify": "between",
                                   "children": [
                                     {
-                                      "variant": "caption",
                                       "type": "typography",
+                                      "variant": "caption",
                                       "content": "Employee Name"
                                     },
                                     {
@@ -3255,31 +3233,28 @@
                                       "content": "@entity.employeeName",
                                       "variant": "body"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal"
                                 },
                                 {
+                                  "direction": "horizontal",
                                   "justify": "between",
                                   "gap": "md",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "type": "typography",
-                                      "variant": "caption",
-                                      "content": "Department"
+                                      "content": "Department",
+                                      "variant": "caption"
                                     },
                                     {
+                                      "type": "typography",
                                       "variant": "body",
-                                      "content": "@entity.department",
-                                      "type": "typography"
+                                      "content": "@entity.department"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "type": "stack"
+                                  ]
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "justify": "between",
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "typography",
@@ -3287,66 +3262,91 @@
                                       "content": "Manager"
                                     },
                                     {
-                                      "type": "typography",
+                                      "variant": "body",
                                       "content": "@entity.manager",
-                                      "variant": "body"
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "justify": "between"
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "justify": "between",
                                   "gap": "md",
+                                  "justify": "between",
+                                  "direction": "horizontal",
                                   "type": "stack",
                                   "children": [
                                     {
-                                      "content": "Equipment Ready",
                                       "variant": "caption",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "content": "Equipment Ready"
                                     },
                                     {
-                                      "type": "typography",
                                       "variant": "body",
+                                      "type": "typography",
                                       "content": "@entity.equipmentReady"
                                     }
                                   ]
                                 },
                                 {
                                   "type": "stack",
+                                  "direction": "horizontal",
+                                  "justify": "between",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "type": "typography",
                                       "variant": "caption",
-                                      "content": "Access Granted"
+                                      "content": "Access Granted",
+                                      "type": "typography"
                                     },
                                     {
                                       "variant": "body",
                                       "content": "@entity.accessGranted",
                                       "type": "typography"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "between"
+                                  ]
                                 }
                               ],
-                              "direction": "vertical"
+                              "gap": "sm",
+                              "direction": "vertical",
+                              "type": "stack"
                             },
                             {
+                              "totalSteps": 4.0,
                               "type": "wizard-navigation",
                               "showComplete": true,
-                              "showBack": true,
+                              "showNext": false,
                               "currentStep": 3.0,
-                              "totalSteps": 4.0,
-                              "showNext": false
+                              "showBack": true
                             }
-                          ],
-                          "gap": "lg",
-                          "direction": "vertical",
-                          "type": "stack"
+                          ]
                         }
                       ],
                       "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "label": "Onboarding",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "label": "Time Off",
+                          "icon": "calendar",
+                          "href": "/timeoff"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Org Chart",
+                          "href": "/org-chart"
+                        }
+                      ],
                       "appName": "HRPortal"
                     }
                   ]
@@ -3362,8 +3362,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "failure": "OnboardingLoadFailed",
-                        "success": "OnboardingLoaded"
+                        "success": "OnboardingLoaded",
+                        "failure": "OnboardingLoadFailed"
                       }
                     }
                   ],
@@ -3371,115 +3371,115 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "users",
-                          "label": "Employees",
-                          "href": "/employees"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "icon": "calendar",
-                          "label": "Time Off",
-                          "href": "/timeoff"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "label": "Org Chart",
-                          "icon": "layout-list"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "children": [
                         {
-                          "type": "container",
                           "maxWidth": "lg",
+                          "type": "container",
                           "padding": "lg",
                           "children": [
                             {
                               "children": [
                                 {
-                                  "direction": "horizontal",
                                   "align": "center",
-                                  "gap": "sm",
                                   "type": "stack",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
-                                      "content": "Employee Onboarding",
                                       "variant": "h2",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "content": "Employee Onboarding"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "count": 3.0,
-                                  "type": "progress-dots",
-                                  "currentIndex": 1.0
+                                  "currentIndex": 1.0,
+                                  "type": "progress-dots"
                                 },
                                 {
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
                                   ],
+                                  "type": "wizard-progress",
                                   "currentStep": 1.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "content": "Manager Assignment",
+                                  "type": "typography",
                                   "variant": "h3",
-                                  "type": "typography"
+                                  "content": "Manager Assignment"
                                 },
                                 {
+                                  "submitEvent": "NEXT",
                                   "fields": [
                                     "manager"
                                   ],
-                                  "cancelEvent": "PREV",
                                   "type": "form-section",
-                                  "submitEvent": "NEXT",
-                                  "mode": "create"
+                                  "mode": "create",
+                                  "cancelEvent": "PREV"
                                 },
                                 {
-                                  "direction": "horizontal",
                                   "gap": "sm",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "label": "Back",
-                                      "icon": "arrow-left",
+                                      "action": "PREV",
                                       "type": "button",
                                       "variant": "ghost",
-                                      "action": "PREV"
+                                      "label": "Back",
+                                      "icon": "arrow-left"
                                     },
                                     {
-                                      "action": "NEXT",
-                                      "label": "Next",
-                                      "icon": "arrow-right",
                                       "variant": "primary",
-                                      "type": "button"
+                                      "type": "button",
+                                      "icon": "arrow-right",
+                                      "label": "Next",
+                                      "action": "NEXT"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "justify": "end"
+                                  "direction": "horizontal",
+                                  "type": "stack"
                                 }
                               ],
-                              "gap": "lg",
+                              "type": "stack",
                               "direction": "vertical",
-                              "type": "stack"
+                              "gap": "lg"
                             }
                           ]
                         }
+                      ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "label": "Employees",
+                          "icon": "users"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "href": "/timeoff",
+                          "icon": "calendar",
+                          "label": "Time Off"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "href": "/org-chart",
+                          "icon": "layout-list"
+                        }
                       ]
                     }
                   ]
@@ -3495,8 +3495,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -3504,42 +3504,62 @@
                     "render-ui",
                     "main",
                     {
-                      "children": [
+                      "navItems": [
                         {
-                          "padding": "lg",
-                          "children": [
-                            {
-                              "gap": "lg",
-                              "children": [
-                                {
+                          "label": "Employees",
+                          "icon": "users",
+                          "href": "/employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "label": "Org Chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "children": [
+                        {
+                          "children": [
+                            {
+                              "children": [
+                                {
                                   "type": "stack",
+                                  "direction": "horizontal",
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "name": "clipboard-check",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "clipboard-check"
                                     },
                                     {
-                                      "variant": "h2",
                                       "type": "typography",
+                                      "variant": "h2",
                                       "content": "Employee Onboarding"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center"
+                                  "gap": "sm"
                                 },
                                 {
                                   "type": "progress-dots",
-                                  "currentIndex": 2.0,
-                                  "count": 3.0
+                                  "count": 3.0,
+                                  "currentIndex": 2.0
                                 },
                                 {
+                                  "currentStep": 2.0,
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
                                   ],
-                                  "currentStep": 2.0,
                                   "type": "wizard-progress"
                                 },
                                 {
@@ -3552,67 +3572,47 @@
                                 },
                                 {
                                   "submitEvent": "NEXT",
+                                  "mode": "create",
                                   "type": "form-section",
+                                  "cancelEvent": "PREV",
                                   "fields": [
                                     "equipmentReady",
                                     "accessGranted"
-                                  ],
-                                  "cancelEvent": "PREV",
-                                  "mode": "create"
+                                  ]
                                 },
                                 {
-                                  "justify": "end",
-                                  "gap": "sm",
                                   "type": "stack",
+                                  "direction": "horizontal",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "variant": "ghost",
-                                      "action": "PREV",
                                       "label": "Back",
+                                      "action": "PREV",
+                                      "type": "button",
                                       "icon": "arrow-left",
-                                      "type": "button"
+                                      "variant": "ghost"
                                     },
                                     {
-                                      "variant": "primary",
                                       "type": "button",
+                                      "label": "Next",
+                                      "variant": "primary",
                                       "action": "NEXT",
-                                      "icon": "arrow-right",
-                                      "label": "Next"
+                                      "icon": "arrow-right"
                                     }
                                   ],
-                                  "direction": "horizontal"
+                                  "gap": "sm"
                                 }
                               ],
-                              "type": "stack",
-                              "direction": "vertical"
+                              "gap": "lg",
+                              "direction": "vertical",
+                              "type": "stack"
                             }
                           ],
                           "type": "container",
+                          "padding": "lg",
                           "maxWidth": "lg"
                         }
                       ],
-                      "navItems": [
-                        {
-                          "label": "Employees",
-                          "icon": "users",
-                          "href": "/employees"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "label": "Time Off",
-                          "icon": "calendar",
-                          "href": "/timeoff"
-                        },
-                        {
-                          "label": "Org Chart",
-                          "icon": "layout-list",
-                          "href": "/org-chart"
-                        }
-                      ],
                       "type": "dashboard-layout",
                       "appName": "HRPortal"
                     }
@@ -3645,32 +3645,8 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Employees",
-                          "icon": "users",
-                          "href": "/employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "href": "/onboarding",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "icon": "calendar",
-                          "label": "Time Off"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Org Chart",
-                          "href": "/org-chart"
-                        }
-                      ],
                       "children": [
                         {
-                          "align": "center",
                           "type": "stack",
                           "children": [
                             {
@@ -3678,28 +3654,52 @@
                               "type": "icon"
                             },
                             {
+                              "type": "typography",
                               "content": "Onboarding Complete!",
-                              "variant": "h2",
-                              "type": "typography"
+                              "variant": "h2"
                             },
                             {
-                              "type": "typography",
+                              "variant": "body",
                               "content": "The new employee has been fully onboarded.",
-                              "variant": "body"
+                              "type": "typography"
                             },
                             {
-                              "variant": "primary",
-                              "icon": "refresh-cw",
                               "label": "Start New",
-                              "action": "RESTART",
-                              "type": "button"
+                              "type": "button",
+                              "icon": "refresh-cw",
+                              "variant": "primary",
+                              "action": "RESTART"
                             }
                           ],
+                          "gap": "lg",
                           "direction": "vertical",
-                          "gap": "lg"
+                          "align": "center"
                         }
                       ],
-                      "appName": "HRPortal"
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/onboarding",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Org Chart",
+                          "href": "/org-chart"
+                        }
+                      ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3714,8 +3714,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -3723,36 +3723,57 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "label": "Employees",
+                          "href": "/employees",
+                          "icon": "users"
+                        },
+                        {
+                          "label": "Onboarding",
+                          "icon": "layout-list",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "icon": "calendar",
+                          "label": "Time Off",
+                          "href": "/timeoff"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Org Chart",
+                          "href": "/org-chart"
+                        }
+                      ],
                       "children": [
                         {
-                          "maxWidth": "lg",
-                          "type": "container",
-                          "padding": "lg",
                           "children": [
                             {
+                              "gap": "lg",
+                              "direction": "vertical",
                               "type": "stack",
                               "children": [
                                 {
-                                  "direction": "horizontal",
-                                  "type": "stack",
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "name": "clipboard-check",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "clipboard-check"
                                     },
                                     {
                                       "content": "Employee Onboarding",
-                                      "type": "typography",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "type": "typography"
                                     }
                                   ],
-                                  "align": "center",
+                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "gap": "sm"
                                 },
                                 {
                                   "count": 3.0,
-                                  "currentIndex": 0.0,
-                                  "type": "progress-dots"
+                                  "type": "progress-dots",
+                                  "currentIndex": 0.0
                                 },
                                 {
                                   "currentStep": 0.0,
@@ -3767,62 +3788,41 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
+                                  "variant": "h3",
                                   "content": "Employee Details",
-                                  "variant": "h3"
+                                  "type": "typography"
                                 },
                                 {
+                                  "type": "form-section",
                                   "fields": [
                                     "employeeName",
                                     "department"
                                   ],
-                                  "mode": "create",
                                   "cancelEvent": "INIT",
-                                  "type": "form-section",
-                                  "submitEvent": "NEXT"
+                                  "submitEvent": "NEXT",
+                                  "mode": "create"
                                 },
                                 {
-                                  "justify": "end",
                                   "direction": "horizontal",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "label": "Next",
-                                      "variant": "primary",
-                                      "icon": "arrow-right",
                                       "type": "button",
-                                      "action": "NEXT"
+                                      "action": "NEXT",
+                                      "icon": "arrow-right",
+                                      "variant": "primary"
                                     }
                                   ],
-                                  "type": "stack",
+                                  "justify": "end",
                                   "gap": "sm"
                                 }
-                              ],
-                              "gap": "lg",
-                              "direction": "vertical"
+                              ]
                             }
-                          ]
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/org-chart",
-                          "label": "Org Chart"
+                          ],
+                          "padding": "lg",
+                          "type": "container",
+                          "maxWidth": "lg"
                         }
                       ],
                       "type": "dashboard-layout",
@@ -3841,8 +3841,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -3850,51 +3850,30 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "label": "Employees",
-                          "href": "/employees",
-                          "icon": "users"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Onboarding",
-                          "href": "/onboarding"
-                        },
-                        {
-                          "label": "Time Off",
-                          "icon": "calendar",
-                          "href": "/timeoff"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "icon": "layout-list",
-                          "label": "Org Chart"
-                        }
-                      ],
                       "children": [
                         {
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "vertical",
+                              "type": "stack",
+                              "gap": "lg",
                               "children": [
                                 {
+                                  "gap": "sm",
                                   "type": "stack",
+                                  "direction": "horizontal",
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
                                       "content": "Employee Onboarding",
                                       "type": "typography",
                                       "variant": "h2"
                                     }
-                                  ],
-                                  "align": "center",
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  ]
                                 },
                                 {
                                   "currentIndex": 0.0,
@@ -3902,58 +3881,79 @@
                                   "count": 3.0
                                 },
                                 {
-                                  "currentStep": 0.0,
                                   "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ]
+                                  ],
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "variant": "h3",
-                                  "type": "typography",
-                                  "content": "Employee Details"
+                                  "content": "Employee Details",
+                                  "type": "typography"
                                 },
                                 {
-                                  "type": "form-section",
                                   "cancelEvent": "INIT",
                                   "fields": [
                                     "employeeName",
                                     "department"
                                   ],
+                                  "mode": "create",
                                   "submitEvent": "NEXT",
-                                  "mode": "create"
+                                  "type": "form-section"
                                 },
                                 {
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "action": "NEXT",
+                                      "variant": "primary",
                                       "icon": "arrow-right",
+                                      "action": "NEXT",
                                       "label": "Next",
-                                      "type": "button",
-                                      "variant": "primary"
+                                      "type": "button"
                                     }
                                   ],
                                   "type": "stack",
-                                  "justify": "end",
                                   "gap": "sm",
-                                  "direction": "horizontal"
+                                  "justify": "end"
                                 }
-                              ],
-                              "gap": "lg"
+                              ]
                             }
                           ],
+                          "type": "container",
                           "padding": "lg",
-                          "maxWidth": "lg",
-                          "type": "container"
+                          "maxWidth": "lg"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal"
+                      "appName": "HRPortal",
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Org Chart",
+                          "href": "/org-chart"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -4271,8 +4271,8 @@
                     "TimeOff",
                     {
                       "emit": {
-                        "success": "TimeOffLoaded",
-                        "failure": "TimeOffLoadFailed"
+                        "failure": "TimeOffLoadFailed",
+                        "success": "TimeOffLoaded"
                       }
                     }
                   ],
@@ -4286,16 +4286,16 @@
                         {
                           "type": "spinner"
                         },
-                        {
-                          "content": "Loading…",
-                          "color": "muted",
+                        {
                           "variant": "caption",
-                          "type": "typography"
+                          "type": "typography",
+                          "content": "Loading…",
+                          "color": "muted"
                         }
                       ],
                       "type": "stack",
-                      "direction": "vertical",
-                      "className": "py-12"
+                      "className": "py-12",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -4309,135 +4309,135 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "label": "Employees",
-                          "href": "/employees",
-                          "icon": "users"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "label": "Onboarding",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "label": "Time Off",
-                          "icon": "calendar",
-                          "href": "/timeoff"
-                        },
-                        {
-                          "label": "Org Chart",
-                          "href": "/org-chart",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "children": [
                         {
                           "children": [
                             {
+                              "direction": "horizontal",
                               "type": "stack",
-                              "gap": "md",
                               "justify": "between",
                               "align": "center",
                               "children": [
                                 {
                                   "direction": "horizontal",
                                   "align": "center",
+                                  "gap": "sm",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "calendar"
                                     },
                                     {
-                                      "content": "Time Off Requests",
                                       "variant": "h2",
+                                      "content": "Time Off Requests",
                                       "type": "typography"
                                     }
                                   ],
-                                  "gap": "sm",
                                   "type": "stack"
                                 },
                                 {
-                                  "gap": "sm",
                                   "type": "stack",
+                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "variant": "primary",
                                       "label": "Request Time Off",
+                                      "icon": "plus",
                                       "action": "CREATE",
-                                      "icon": "plus"
+                                      "type": "button",
+                                      "variant": "primary"
                                     }
                                   ],
                                   "direction": "horizontal"
                                 }
                               ],
-                              "direction": "horizontal"
+                              "gap": "md"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "data-list",
-                              "gap": "sm",
+                              "variant": "card",
+                              "itemActions": [
+                                {
+                                  "variant": "ghost",
+                                  "event": "VIEW",
+                                  "label": "View"
+                                },
+                                {
+                                  "label": "Edit",
+                                  "variant": "ghost",
+                                  "event": "EDIT"
+                                },
+                                {
+                                  "label": "Delete",
+                                  "event": "DELETE",
+                                  "variant": "danger"
+                                }
+                              ],
                               "fields": [
                                 {
+                                  "icon": "calendar",
                                   "name": "employeeName",
-                                  "variant": "h3",
                                   "label": "Employee",
-                                  "icon": "calendar"
+                                  "variant": "h3"
                                 },
                                 {
-                                  "name": "leaveType",
+                                  "variant": "badge",
                                   "label": "Type",
-                                  "variant": "badge"
+                                  "name": "leaveType"
                                 },
                                 {
                                   "variant": "badge",
                                   "name": "status"
                                 },
                                 {
-                                  "name": "startDate",
                                   "variant": "body",
-                                  "label": "From",
-                                  "format": "date"
+                                  "format": "date",
+                                  "name": "startDate",
+                                  "label": "From"
                                 },
                                 {
-                                  "label": "To",
-                                  "variant": "body",
+                                  "format": "date",
                                   "name": "endDate",
-                                  "format": "date"
+                                  "label": "To",
+                                  "variant": "body"
                                 }
                               ],
-                              "variant": "card",
                               "entity": "@payload.data",
-                              "itemActions": [
-                                {
-                                  "event": "VIEW",
-                                  "label": "View",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "label": "Edit",
-                                  "event": "EDIT",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "label": "Delete",
-                                  "variant": "danger",
-                                  "event": "DELETE"
-                                }
-                              ]
+                              "gap": "sm",
+                              "type": "data-list"
                             }
                           ],
-                          "direction": "vertical",
                           "type": "stack",
                           "className": "max-w-5xl mx-auto w-full",
+                          "direction": "vertical",
                           "gap": "lg"
                         }
                       ],
-                      "appName": "HRPortal"
+                      "appName": "HRPortal",
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "icon": "layout-list",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "label": "Org Chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -4451,36 +4451,36 @@
                     "render-ui",
                     "main",
                     {
+                      "align": "center",
+                      "type": "stack",
                       "gap": "md",
+                      "direction": "vertical",
+                      "className": "py-12",
                       "children": [
                         {
-                          "type": "icon",
                           "name": "alert-triangle",
-                          "color": "destructive"
+                          "color": "destructive",
+                          "type": "icon"
                         },
                         {
-                          "type": "typography",
                           "variant": "h3",
+                          "type": "typography",
                           "content": "Failed to load timeoff"
                         },
                         {
-                          "color": "muted",
                           "variant": "body",
+                          "color": "muted",
                           "type": "typography",
                           "content": "@payload.error"
                         },
                         {
-                          "icon": "rotate-ccw",
+                          "action": "INIT",
                           "variant": "primary",
-                          "type": "button",
+                          "icon": "rotate-ccw",
                           "label": "Retry",
-                          "action": "INIT"
+                          "type": "button"
                         }
-                      ],
-                      "className": "py-12",
-                      "direction": "vertical",
-                      "type": "stack",
-                      "align": "center"
+                      ]
                     }
                   ]
                 ]
@@ -4655,8 +4655,8 @@
                     "TimeOff",
                     {
                       "emit": {
-                        "failure": "TimeOffLoadFailed",
-                        "success": "TimeOffLoaded"
+                        "success": "TimeOffLoaded",
+                        "failure": "TimeOffLoadFailed"
                       }
                     }
                   ]
@@ -4681,30 +4681,29 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
-                      "gap": "md",
-                      "type": "stack",
                       "children": [
                         {
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "plus-circle"
+                              "name": "plus-circle",
+                              "type": "icon"
                             },
                             {
+                              "type": "typography",
                               "variant": "h3",
-                              "content": "New Time Off Request",
-                              "type": "typography"
+                              "content": "New Time Off Request"
                             }
                           ],
                           "gap": "sm",
-                          "type": "stack",
                           "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "cancelEvent": "CLOSE",
+                          "type": "form-section",
                           "fields": [
                             "employeeName",
                             "leaveType",
@@ -4713,11 +4712,12 @@
                             "status"
                           ],
                           "submitEvent": "SAVE",
-                          "mode": "create",
-                          "type": "form-section",
-                          "cancelEvent": "CLOSE"
+                          "mode": "create"
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -4985,26 +4985,29 @@
                     "fetch",
                     "TimeOff",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "success": "TimeOffLoaded",
                         "failure": "TimeOffLoadFailed"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
+                      "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
                           "direction": "horizontal",
-                          "type": "stack",
                           "gap": "sm",
+                          "type": "stack",
                           "children": [
                             {
-                              "name": "edit",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "edit"
                             },
                             {
                               "content": "Edit TimeOff",
@@ -5017,9 +5020,8 @@
                           "type": "divider"
                         },
                         {
+                          "submitEvent": "SAVE",
                           "cancelEvent": "CLOSE",
-                          "entity": "@payload.row",
-                          "mode": "edit",
                           "fields": [
                             "employeeName",
                             "leaveType",
@@ -5027,13 +5029,11 @@
                             "endDate",
                             "status"
                           ],
-                          "type": "form-section",
-                          "submitEvent": "SAVE"
+                          "entity": "@payload.row",
+                          "mode": "edit",
+                          "type": "form-section"
                         }
-                      ],
-                      "type": "stack",
-                      "gap": "md",
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -5266,34 +5266,37 @@
                     "fetch",
                     "TimeOff",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "success": "TimeOffLoaded",
                         "failure": "TimeOffLoadFailed"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "gap": "md",
+                      "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
+                          "type": "stack",
                           "gap": "sm",
+                          "align": "center",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "eye"
+                              "name": "eye",
+                              "type": "icon"
                             },
                             {
+                              "content": "@entity.employeeName",
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "@entity.employeeName"
+                              "variant": "h3"
                             }
-                          ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "align": "center"
+                          ]
                         },
                         {
                           "type": "divider"
@@ -5301,39 +5304,38 @@
                         {
                           "type": "stack",
                           "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "Employee Name"
                             },
                             {
-                              "variant": "body",
+                              "content": "@entity.employeeName",
                               "type": "typography",
-                              "content": "@entity.employeeName"
+                              "variant": "body"
                             }
-                          ]
+                          ],
+                          "gap": "md"
                         },
                         {
-                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "Leave Type"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.leaveType",
+                              "variant": "body",
                               "type": "typography"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "md"
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
-                          "type": "stack",
                           "children": [
                             {
                               "content": "Start Date",
@@ -5347,41 +5349,42 @@
                             }
                           ],
                           "gap": "md",
+                          "type": "stack",
                           "direction": "horizontal"
                         },
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "md",
                           "children": [
                             {
+                              "variant": "caption",
                               "content": "End Date",
-                              "type": "typography",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
                               "variant": "body",
-                              "content": "@entity.endDate",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.endDate"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "gap": "md",
+                          "type": "stack"
                         },
                         {
-                          "type": "stack",
                           "children": [
                             {
                               "variant": "caption",
-                              "type": "typography",
-                              "content": "Status"
+                              "content": "Status",
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.status",
                               "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.status"
                             }
                           ],
-                          "direction": "horizontal",
-                          "gap": "md"
+                          "gap": "md",
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
@@ -5389,28 +5392,25 @@
                         {
                           "children": [
                             {
+                              "action": "EDIT",
                               "variant": "primary",
                               "icon": "edit",
-                              "type": "button",
                               "label": "Edit",
-                              "action": "EDIT"
+                              "type": "button"
                             },
                             {
                               "action": "CLOSE",
-                              "variant": "ghost",
+                              "type": "button",
                               "label": "Close",
-                              "type": "button"
+                              "variant": "ghost"
                             }
                           ],
-                          "justify": "end",
-                          "direction": "horizontal",
                           "type": "stack",
-                          "gap": "sm"
+                          "gap": "sm",
+                          "direction": "horizontal",
+                          "justify": "end"
                         }
-                      ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -5655,8 +5655,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "TimeOffLoaded",
-                        "failure": "TimeOffLoadFailed"
+                        "failure": "TimeOffLoadFailed",
+                        "success": "TimeOffLoaded"
                       }
                     }
                   ],
@@ -5664,57 +5664,57 @@
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
-                      "gap": "md",
                       "children": [
                         {
-                          "gap": "sm",
                           "direction": "horizontal",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "alert-triangle"
+                              "name": "alert-triangle",
+                              "type": "icon"
                             },
                             {
                               "content": "Delete TimeOff",
-                              "variant": "h3",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
                           ],
                           "type": "stack",
-                          "align": "center"
+                          "align": "center",
+                          "gap": "sm"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "type": "alert",
                           "variant": "error",
-                          "message": "This action cannot be undone.",
-                          "type": "alert"
+                          "message": "This action cannot be undone."
                         },
                         {
                           "direction": "horizontal",
                           "type": "stack",
                           "justify": "end",
-                          "gap": "sm",
                           "children": [
                             {
-                              "action": "CANCEL",
                               "variant": "ghost",
+                              "type": "button",
                               "label": "Cancel",
-                              "type": "button"
+                              "action": "CANCEL"
                             },
                             {
-                              "label": "Delete",
-                              "variant": "danger",
                               "type": "button",
+                              "icon": "check",
                               "action": "CONFIRM_DELETE",
-                              "icon": "check"
+                              "variant": "danger",
+                              "label": "Delete"
                             }
-                          ]
+                          ],
+                          "gap": "sm"
                         }
                       ],
-                      "direction": "vertical"
+                      "direction": "vertical",
+                      "gap": "md",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -5731,8 +5731,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "TimeOffDeleteFailed",
-                        "success": "TimeOffDeleted"
+                        "success": "TimeOffDeleted",
+                        "failure": "TimeOffDeleteFailed"
                       }
                     }
                   ],
@@ -5753,8 +5753,8 @@
                     "TimeOff",
                     {
                       "emit": {
-                        "failure": "TimeOffLoadFailed",
-                        "success": "TimeOffLoaded"
+                        "success": "TimeOffLoaded",
+                        "failure": "TimeOffLoadFailed"
                       }
                     }
                   ],
@@ -6019,8 +6019,8 @@
                     "OrgChart",
                     {
                       "emit": {
-                        "failure": "OrgChartLoadFailed",
-                        "success": "OrgChartLoaded"
+                        "success": "OrgChartLoaded",
+                        "failure": "OrgChartLoadFailed"
                       }
                     }
                   ],
@@ -6033,9 +6033,6 @@
                         {
                           "children": [
                             {
-                              "gap": "lg",
-                              "direction": "vertical",
-                              "type": "stack",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -6050,12 +6047,14 @@
                                   ]
                                 },
                                 {
-                                  "justify": "between",
-                                  "direction": "horizontal",
                                   "type": "stack",
+                                  "direction": "horizontal",
                                   "gap": "md",
+                                  "justify": "between",
                                   "children": [
                                     {
+                                      "type": "stack",
+                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "name": "git-branch",
@@ -6063,18 +6062,16 @@
                                         },
                                         {
                                           "variant": "h2",
-                                          "content": "Org Chart",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "content": "Org Chart"
                                         }
                                       ],
-                                      "type": "stack",
-                                      "direction": "horizontal",
                                       "gap": "md"
                                     },
                                     {
+                                      "label": "Refresh",
                                       "icon": "refresh-cw",
                                       "type": "button",
-                                      "label": "Refresh",
                                       "action": "REFRESH",
                                       "variant": "secondary"
                                     }
@@ -6084,10 +6081,9 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
+                                      "cols": 3.0,
                                       "type": "simple-grid",
                                       "children": [
                                         {
@@ -6096,62 +6092,63 @@
                                           "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
+                                          "value": "@entity.departments",
                                           "label": "Departments",
-                                          "value": "@entity.departments"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "value": "@entity.openPositions",
                                           "type": "stat-display",
-                                          "label": "OpenPositions"
+                                          "label": "OpenPositions",
+                                          "value": "@entity.openPositions"
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
-                                              "gap": "sm",
+                                              "direction": "vertical",
                                               "children": [
                                                 {
                                                   "content": "AvgTenure",
-                                                  "variant": "caption",
-                                                  "type": "typography"
+                                                  "type": "typography",
+                                                  "variant": "caption"
                                                 },
                                                 {
-                                                  "content": "@entity.avgTenure",
                                                   "variant": "h3",
+                                                  "content": "@entity.avgTenure",
                                                   "type": "typography"
                                                 }
                                               ],
-                                              "direction": "vertical",
-                                              "type": "stack"
+                                              "type": "stack",
+                                              "gap": "sm"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
-                                          "label": "Headcount",
+                                          "type": "stat-display",
                                           "value": "@entity.headcount",
-                                          "type": "stat-display"
+                                          "label": "Headcount"
                                         }
-                                      ],
-                                      "cols": 3.0
+                                      ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "cols": 2.0,
+                                  "type": "grid",
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
-                                          "variant": "caption",
                                           "type": "typography",
-                                          "content": "Chart View"
+                                          "content": "Chart View",
+                                          "variant": "caption"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "type": "card",
@@ -6164,8 +6161,8 @@
                                       ]
                                     }
                                   ],
-                                  "gap": "md",
-                                  "type": "grid"
+                                  "cols": 2.0,
+                                  "gap": "md"
                                 },
                                 {
                                   "data": [
@@ -6174,12 +6171,12 @@
                                       "date": "Jan"
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
                                       "value": 25.0,
@@ -6197,58 +6194,62 @@
                                   "type": "line-chart"
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "color": "primary",
                                       "label": "Current"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
-                                  "width": 400.0,
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
-                                    },
-                                    {
-                                      "source": "b",
-                                      "target": "c"
-                                    }
-                                  ],
-                                  "type": "graph-view",
                                   "nodes": [
                                     {
                                       "label": "Start",
                                       "id": "a"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
-                                      "label": "End",
-                                      "id": "c"
+                                      "id": "c",
+                                      "label": "End"
                                     }
                                   ],
-                                  "height": 200.0
+                                  "type": "graph-view",
+                                  "width": 400.0,
+                                  "height": 200.0,
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "target": "c",
+                                      "source": "b"
+                                    }
+                                  ]
                                 }
-                              ]
+                              ],
+                              "direction": "vertical",
+                              "gap": "lg",
+                              "type": "stack"
                             }
                           ],
                           "type": "scaled-diagram"
                         }
                       ],
+                      "appName": "HRPortal",
                       "navItems": [
                         {
+                          "label": "Employees",
                           "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
+                          "icon": "users"
                         },
                         {
                           "href": "/onboarding",
@@ -6256,17 +6257,16 @@
                           "label": "Onboarding"
                         },
                         {
-                          "href": "/timeoff",
                           "icon": "calendar",
+                          "href": "/timeoff",
                           "label": "Time Off"
                         },
                         {
                           "href": "/org-chart",
-                          "icon": "layout-list",
-                          "label": "Org Chart"
+                          "label": "Org Chart",
+                          "icon": "layout-list"
                         }
-                      ],
-                      "appName": "HRPortal"
+                      ]
                     }
                   ]
                 ]
@@ -6281,8 +6281,8 @@
                     "OrgChart",
                     {
                       "emit": {
-                        "failure": "OrgChartLoadFailed",
-                        "success": "OrgChartLoaded"
+                        "success": "OrgChartLoaded",
+                        "failure": "OrgChartLoadFailed"
                       }
                     }
                   ],
@@ -6290,25 +6290,27 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "navItems": [
                         {
                           "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
+                          "icon": "users",
+                          "label": "Employees"
                         },
                         {
-                          "href": "/onboarding",
+                          "label": "Onboarding",
                           "icon": "layout-list",
-                          "label": "Onboarding"
+                          "href": "/onboarding"
                         },
                         {
-                          "label": "Time Off",
+                          "icon": "calendar",
                           "href": "/timeoff",
-                          "icon": "calendar"
+                          "label": "Time Off"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/org-chart",
+                          "icon": "layout-list",
                           "label": "Org Chart"
                         }
                       ],
@@ -6317,9 +6319,11 @@
                           "type": "scaled-diagram",
                           "children": [
                             {
+                              "type": "stack",
+                              "gap": "lg",
+                              "direction": "vertical",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "label": "Home",
@@ -6328,9 +6332,12 @@
                                     {
                                       "label": "Org Chart"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
+                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "children": [
@@ -6344,112 +6351,109 @@
                                           "variant": "h2"
                                         }
                                       ],
+                                      "type": "stack",
                                       "direction": "horizontal",
-                                      "gap": "md",
-                                      "type": "stack"
+                                      "gap": "md"
                                     },
                                     {
+                                      "action": "REFRESH",
                                       "label": "Refresh",
-                                      "variant": "secondary",
                                       "icon": "refresh-cw",
-                                      "action": "REFRESH",
-                                      "type": "button"
+                                      "type": "button",
+                                      "variant": "secondary"
                                     }
                                   ],
-                                  "gap": "md",
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "justify": "between"
+                                  "justify": "between",
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "padding": "md",
-                                  "type": "box",
                                   "children": [
                                     {
-                                      "cols": 3.0,
                                       "type": "simple-grid",
                                       "children": [
                                         {
                                           "value": "@entity.totalEmployees",
-                                          "type": "stat-display",
-                                          "label": "TotalEmployees"
+                                          "label": "TotalEmployees",
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "label": "Departments",
                                           "value": "@entity.departments",
-                                          "type": "stat-display",
-                                          "label": "Departments"
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "label": "OpenPositions",
                                           "type": "stat-display",
-                                          "value": "@entity.openPositions",
-                                          "label": "OpenPositions"
+                                          "value": "@entity.openPositions"
                                         },
                                         {
+                                          "type": "card",
                                           "children": [
                                             {
+                                              "gap": "sm",
+                                              "type": "stack",
                                               "children": [
                                                 {
+                                                  "content": "AvgTenure",
                                                   "type": "typography",
-                                                  "variant": "caption",
-                                                  "content": "AvgTenure"
+                                                  "variant": "caption"
                                                 },
                                                 {
-                                                  "content": "@entity.avgTenure",
                                                   "variant": "h3",
-                                                  "type": "typography"
+                                                  "type": "typography",
+                                                  "content": "@entity.avgTenure"
                                                 }
                                               ],
-                                              "direction": "vertical",
-                                              "type": "stack",
-                                              "gap": "sm"
+                                              "direction": "vertical"
                                             }
-                                          ],
-                                          "type": "card"
+                                          ]
                                         },
                                         {
                                           "type": "stat-display",
-                                          "label": "Headcount",
-                                          "value": "@entity.headcount"
+                                          "value": "@entity.headcount",
+                                          "label": "Headcount"
                                         }
-                                      ]
+                                      ],
+                                      "cols": 3.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "grid",
-                                  "cols": 2.0,
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
-                                          "content": "Chart View",
-                                          "variant": "caption"
+                                          "variant": "caption",
+                                          "content": "Chart View"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
                                           "variant": "caption",
                                           "content": "Graph View"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
                                   ],
+                                  "cols": 2.0,
                                   "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
@@ -6464,18 +6468,19 @@
                                       "value": 15.0
                                     },
                                     {
-                                      "value": 25.0,
-                                      "date": "Apr"
+                                      "date": "Apr",
+                                      "value": 25.0
                                     },
                                     {
-                                      "value": 22.0,
-                                      "date": "May"
+                                      "date": "May",
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
                                   "type": "chart-legend",
@@ -6485,21 +6490,20 @@
                                       "color": "primary"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
                                   ]
                                 },
                                 {
-                                  "height": 200.0,
                                   "nodes": [
                                     {
-                                      "label": "Start",
-                                      "id": "a"
+                                      "id": "a",
+                                      "label": "Start"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
                                       "id": "c",
@@ -6507,6 +6511,7 @@
                                     }
                                   ],
                                   "type": "graph-view",
+                                  "height": 200.0,
                                   "edges": [
                                     {
                                       "source": "a",
@@ -6519,16 +6524,11 @@
                                   ],
                                   "width": 400.0
                                 }
-                              ],
-                              "type": "stack",
-                              "gap": "lg",
-                              "direction": "vertical"
+                              ]
                             }
                           ]
                         }
-                      ],
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -6543,8 +6543,8 @@
                     "OrgChart",
                     {
                       "emit": {
-                        "failure": "OrgChartLoadFailed",
-                        "success": "OrgChartLoaded"
+                        "success": "OrgChartLoaded",
+                        "failure": "OrgChartLoadFailed"
                       }
                     }
                   ],
@@ -6554,14 +6554,14 @@
                     {
                       "navItems": [
                         {
+                          "href": "/employees",
                           "label": "Employees",
-                          "icon": "users",
-                          "href": "/employees"
+                          "icon": "users"
                         },
                         {
                           "label": "Onboarding",
-                          "href": "/onboarding",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/onboarding"
                         },
                         {
                           "href": "/timeoff",
@@ -6574,30 +6574,33 @@
                           "label": "Org Chart"
                         }
                       ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
+                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
+                              "direction": "vertical",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Org Chart"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
+                                  "justify": "between",
+                                  "direction": "horizontal",
+                                  "gap": "md",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "type": "stack",
-                                      "direction": "horizontal",
                                       "gap": "md",
                                       "children": [
                                         {
@@ -6606,23 +6609,20 @@
                                         },
                                         {
                                           "variant": "h2",
-                                          "type": "typography",
-                                          "content": "Org Chart"
+                                          "content": "Org Chart",
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "direction": "horizontal"
                                     },
                                     {
-                                      "action": "REFRESH",
-                                      "label": "Refresh",
                                       "type": "button",
+                                      "action": "REFRESH",
                                       "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "icon": "refresh-cw",
+                                      "label": "Refresh"
                                     }
-                                  ],
-                                  "justify": "between",
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -6631,18 +6631,18 @@
                                   "type": "box",
                                   "children": [
                                     {
-                                      "cols": 3.0,
                                       "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
-                                          "label": "TotalEmployees",
+                                          "value": "@entity.totalEmployees",
                                           "type": "stat-display",
-                                          "value": "@entity.totalEmployees"
+                                          "label": "TotalEmployees"
                                         },
                                         {
-                                          "value": "@entity.departments",
+                                          "label": "Departments",
                                           "type": "stat-display",
-                                          "label": "Departments"
+                                          "value": "@entity.departments"
                                         },
                                         {
                                           "value": "@entity.openPositions",
@@ -6650,13 +6650,12 @@
                                           "type": "stat-display"
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
                                               "children": [
                                                 {
-                                                  "variant": "caption",
                                                   "content": "AvgTenure",
+                                                  "variant": "caption",
                                                   "type": "typography"
                                                 },
                                                 {
@@ -6666,10 +6665,11 @@
                                                 }
                                               ],
                                               "gap": "sm",
-                                              "direction": "vertical",
-                                              "type": "stack"
+                                              "type": "stack",
+                                              "direction": "vertical"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
                                           "value": "@entity.headcount",
@@ -6691,48 +6691,48 @@
                                       "type": "card",
                                       "children": [
                                         {
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Chart View",
-                                          "type": "typography"
+                                          "content": "Chart View"
                                         }
                                       ]
                                     },
                                     {
                                       "children": [
                                         {
+                                          "variant": "caption",
                                           "type": "typography",
-                                          "content": "Graph View",
-                                          "variant": "caption"
+                                          "content": "Graph View"
                                         }
                                       ],
                                       "type": "card"
                                     }
                                   ],
-                                  "type": "grid",
-                                  "gap": "md"
+                                  "gap": "md",
+                                  "type": "grid"
                                 },
                                 {
                                   "type": "line-chart",
                                   "data": [
                                     {
-                                      "value": 12.0,
-                                      "date": "Jan"
+                                      "date": "Jan",
+                                      "value": 12.0
                                     },
                                     {
                                       "value": 19.0,
                                       "date": "Feb"
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
                                       "date": "Apr",
                                       "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
@@ -6748,16 +6748,28 @@
                                       "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
                                   ]
                                 },
                                 {
+                                  "height": 200.0,
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
+                                  ],
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
-                                      "label": "Start",
-                                      "id": "a"
+                                      "id": "a",
+                                      "label": "Start"
                                     },
                                     {
                                       "label": "Process",
@@ -6768,28 +6780,16 @@
                                       "label": "End"
                                     }
                                   ],
-                                  "type": "graph-view",
-                                  "height": 200.0,
-                                  "width": 400.0,
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
-                                    },
-                                    {
-                                      "source": "b",
-                                      "target": "c"
-                                    }
-                                  ]
+                                  "width": 400.0
                                 }
                               ],
-                              "direction": "vertical",
-                              "gap": "lg"
+                              "gap": "lg",
+                              "type": "stack"
                             }
-                          ],
-                          "type": "scaled-diagram"
+                          ]
                         }
                       ],
+                      "type": "dashboard-layout",
                       "appName": "HRPortal"
                     }
                   ]
@@ -6805,8 +6805,8 @@
                     "OrgChart",
                     {
                       "emit": {
-                        "failure": "OrgChartLoadFailed",
-                        "success": "OrgChartLoaded"
+                        "success": "OrgChartLoaded",
+                        "failure": "OrgChartLoadFailed"
                       }
                     }
                   ],
@@ -6814,29 +6814,6 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "users",
-                          "label": "Employees",
-                          "href": "/employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "icon": "layout-list",
-                          "href": "/onboarding"
-                        },
-                        {
-                          "icon": "calendar",
-                          "href": "/timeoff",
-                          "label": "Time Off"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Org Chart",
-                          "href": "/org-chart"
-                        }
-                      ],
-                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "scaled-diagram",
@@ -6846,8 +6823,8 @@
                                 {
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Org Chart"
@@ -6859,10 +6836,9 @@
                                   "justify": "between",
                                   "type": "stack",
                                   "direction": "horizontal",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "gap": "md",
-                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "name": "git-branch",
@@ -6870,39 +6846,39 @@
                                         },
                                         {
                                           "content": "Org Chart",
-                                          "variant": "h2",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "h2"
                                         }
                                       ],
-                                      "type": "stack"
+                                      "gap": "md",
+                                      "type": "stack",
+                                      "direction": "horizontal"
                                     },
                                     {
-                                      "label": "Refresh",
-                                      "action": "REFRESH",
                                       "variant": "secondary",
+                                      "action": "REFRESH",
                                       "icon": "refresh-cw",
-                                      "type": "button"
+                                      "type": "button",
+                                      "label": "Refresh"
                                     }
-                                  ],
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
+                                      "cols": 3.0,
                                       "children": [
                                         {
-                                          "type": "stat-display",
+                                          "label": "TotalEmployees",
                                           "value": "@entity.totalEmployees",
-                                          "label": "TotalEmployees"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Departments",
+                                          "type": "stat-display",
                                           "value": "@entity.departments"
                                         },
                                         {
@@ -6911,37 +6887,38 @@
                                           "value": "@entity.openPositions"
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
+                                              "gap": "sm",
                                               "type": "stack",
+                                              "direction": "vertical",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "content": "AvgTenure",
+                                                  "type": "typography",
                                                   "variant": "caption"
                                                 },
                                                 {
-                                                  "variant": "h3",
                                                   "type": "typography",
+                                                  "variant": "h3",
                                                   "content": "@entity.avgTenure"
                                                 }
-                                              ],
-                                              "direction": "vertical",
-                                              "gap": "sm"
+                                              ]
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
                                           "label": "Headcount",
-                                          "type": "stat-display",
-                                          "value": "@entity.headcount"
+                                          "value": "@entity.headcount",
+                                          "type": "stat-display"
                                         }
                                       ],
-                                      "type": "simple-grid",
-                                      "cols": 3.0
+                                      "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
@@ -6949,86 +6926,73 @@
                                 {
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
                                           "content": "Chart View",
                                           "variant": "caption"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Graph View",
-                                          "type": "typography"
+                                          "content": "Graph View"
                                         }
                                       ]
                                     }
                                   ],
-                                  "cols": 2.0,
                                   "gap": "md",
+                                  "cols": 2.0,
                                   "type": "grid"
                                 },
                                 {
                                   "type": "line-chart",
                                   "data": [
                                     {
-                                      "value": 12.0,
-                                      "date": "Jan"
+                                      "date": "Jan",
+                                      "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "date": "Mar",
                                       "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "date": "May",
                                       "value": 22.0
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
                                   ]
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
-                                  "width": 400.0,
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
-                                    },
-                                    {
-                                      "target": "c",
-                                      "source": "b"
-                                    }
-                                  ],
-                                  "type": "graph-view",
-                                  "height": 200.0,
                                   "nodes": [
                                     {
                                       "label": "Start",
@@ -7042,16 +7006,52 @@
                                       "id": "c",
                                       "label": "End"
                                     }
+                                  ],
+                                  "type": "graph-view",
+                                  "width": 400.0,
+                                  "height": 200.0,
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
                                   ]
                                 }
                               ],
-                              "gap": "lg",
                               "type": "stack",
-                              "direction": "vertical"
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
                           ]
                         }
                       ],
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "label": "Employees",
+                          "icon": "users"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "icon": "layout-list",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "icon": "calendar",
+                          "href": "/timeoff",
+                          "label": "Time Off"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "label": "Org Chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "type": "dashboard-layout",
                       "appName": "HRPortal"
                     }
                   ]
@@ -7067,8 +7067,8 @@
                     "OrgChart",
                     {
                       "emit": {
-                        "success": "OrgChartLoaded",
-                        "failure": "OrgChartLoadFailed"
+                        "failure": "OrgChartLoadFailed",
+                        "success": "OrgChartLoaded"
                       }
                     }
                   ],
@@ -7076,57 +7076,32 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Onboarding",
-                          "href": "/onboarding"
-                        },
-                        {
-                          "label": "Time Off",
-                          "href": "/timeoff",
-                          "icon": "calendar"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "icon": "layout-list",
-                          "label": "Org Chart"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "children": [
                         {
                           "children": [
                             {
+                              "type": "stack",
                               "gap": "lg",
                               "direction": "vertical",
-                              "type": "stack",
                               "children": [
                                 {
+                                  "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Org Chart"
                                     }
-                                  ],
-                                  "type": "breadcrumb"
+                                  ]
                                 },
                                 {
-                                  "justify": "between",
-                                  "gap": "md",
-                                  "type": "stack",
                                   "children": [
                                     {
+                                      "gap": "md",
                                       "direction": "horizontal",
+                                      "type": "stack",
                                       "children": [
                                         {
                                           "type": "icon",
@@ -7134,21 +7109,22 @@
                                         },
                                         {
                                           "type": "typography",
-                                          "variant": "h2",
-                                          "content": "Org Chart"
+                                          "content": "Org Chart",
+                                          "variant": "h2"
                                         }
-                                      ],
-                                      "type": "stack",
-                                      "gap": "md"
+                                      ]
                                     },
                                     {
-                                      "label": "Refresh",
                                       "action": "REFRESH",
+                                      "variant": "secondary",
                                       "type": "button",
-                                      "icon": "refresh-cw",
-                                      "variant": "secondary"
+                                      "label": "Refresh",
+                                      "icon": "refresh-cw"
                                     }
                                   ],
+                                  "type": "stack",
+                                  "gap": "md",
+                                  "justify": "between",
                                   "direction": "horizontal"
                                 },
                                 {
@@ -7159,17 +7135,15 @@
                                   "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "cols": 3.0,
                                       "children": [
                                         {
                                           "label": "TotalEmployees",
-                                          "value": "@entity.totalEmployees",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "value": "@entity.totalEmployees"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Departments",
+                                          "type": "stat-display",
                                           "value": "@entity.departments"
                                         },
                                         {
@@ -7180,19 +7154,19 @@
                                         {
                                           "children": [
                                             {
+                                              "type": "stack",
                                               "children": [
                                                 {
-                                                  "content": "AvgTenure",
                                                   "type": "typography",
-                                                  "variant": "caption"
+                                                  "variant": "caption",
+                                                  "content": "AvgTenure"
                                                 },
                                                 {
-                                                  "variant": "h3",
                                                   "content": "@entity.avgTenure",
+                                                  "variant": "h3",
                                                   "type": "typography"
                                                 }
                                               ],
-                                              "type": "stack",
                                               "direction": "vertical",
                                               "gap": "sm"
                                             }
@@ -7200,11 +7174,13 @@
                                           "type": "card"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Headcount",
+                                          "type": "stat-display",
                                           "value": "@entity.headcount"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid",
+                                      "cols": 3.0
                                     }
                                   ]
                                 },
@@ -7212,29 +7188,29 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "gap": "md",
                                   "type": "grid",
                                   "cols": 2.0,
+                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
+                                          "variant": "caption",
                                           "content": "Chart View",
-                                          "type": "typography",
-                                          "variant": "caption"
+                                          "type": "typography"
                                         }
                                       ]
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "variant": "caption",
                                           "type": "typography",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "variant": "caption"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
                                   ]
                                 },
@@ -7246,20 +7222,20 @@
                                       "date": "Jan"
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "date": "Mar",
                                       "value": 15.0
                                     },
                                     {
-                                      "value": 25.0,
-                                      "date": "Apr"
+                                      "date": "Apr",
+                                      "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
@@ -7268,53 +7244,77 @@
                                   ]
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
                                       "color": "primary"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
+                                  "height": 200.0,
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
+                                  ],
                                   "width": 400.0,
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
                                       "id": "a",
                                       "label": "Start"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
                                       "label": "End",
                                       "id": "c"
                                     }
-                                  ],
-                                  "height": 200.0,
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
-                                    },
-                                    {
-                                      "target": "c",
-                                      "source": "b"
-                                    }
-                                  ],
-                                  "type": "graph-view"
+                                  ]
                                 }
                               ]
                             }
                           ],
                           "type": "scaled-diagram"
                         }
-                      ]
+                      ],
+                      "navItems": [
+                        {
+                          "label": "Employees",
+                          "icon": "users",
+                          "href": "/employees"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "icon": "layout-list",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "href": "/org-chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]