@almadar/std 8.2.0 → 8.3.0

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

@@ -548,8 +548,8 @@
                     "Employee",
                     {
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
                       }
                     }
                   ],
@@ -557,22 +557,22 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "stack",
                       "align": "center",
                       "gap": "md",
                       "direction": "vertical",
+                      "className": "py-12",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
                           "type": "typography",
-                          "color": "muted",
                           "content": "Loading…",
-                          "variant": "caption"
+                          "variant": "caption",
+                          "color": "muted"
                         }
-                      ],
-                      "className": "py-12",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -586,44 +586,42 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "navItems": [
                         {
-                          "icon": "users",
                           "label": "Employees",
-                          "href": "/employees"
+                          "href": "/employees",
+                          "icon": "users"
                         },
                         {
+                          "href": "/onboarding",
                           "icon": "layout-list",
-                          "label": "Onboarding",
-                          "href": "/onboarding"
+                          "label": "Onboarding"
                         },
                         {
                           "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
+                          "icon": "calendar",
+                          "label": "Time Off"
                         },
                         {
-                          "label": "Org Chart",
+                          "icon": "layout-list",
                           "href": "/org-chart",
-                          "icon": "layout-list"
+                          "label": "Org Chart"
                         }
                       ],
                       "children": [
                         {
-                          "direction": "vertical",
+                          "className": "max-w-5xl mx-auto w-full",
                           "children": [
                             {
+                              "justify": "between",
                               "align": "center",
                               "direction": "horizontal",
                               "gap": "md",
-                              "justify": "between",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "align": "center",
-                                  "type": "stack",
                                   "direction": "horizontal",
+                                  "align": "center",
                                   "gap": "sm",
                                   "children": [
                                     {
@@ -631,66 +629,47 @@
                                       "name": "users"
                                     },
                                     {
-                                      "variant": "h2",
                                       "type": "typography",
+                                      "variant": "h2",
                                       "content": "Employees"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "stack",
-                                  "gap": "sm",
                                   "direction": "horizontal",
+                                  "gap": "sm",
                                   "children": [
                                     {
+                                      "icon": "plus",
+                                      "variant": "primary",
                                       "type": "button",
                                       "label": "Add Employee",
-                                      "action": "CREATE",
-                                      "variant": "primary",
-                                      "icon": "plus"
+                                      "action": "CREATE"
                                     }
                                   ]
                                 }
-                              ],
-                              "type": "stack"
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "gap": "sm",
-                              "itemActions": [
-                                {
-                                  "variant": "ghost",
-                                  "label": "View",
-                                  "event": "VIEW"
-                                },
-                                {
-                                  "event": "EDIT",
-                                  "label": "Edit",
-                                  "variant": "ghost"
-                                },
-                                {
-                                  "event": "DELETE",
-                                  "label": "Delete",
-                                  "variant": "danger"
-                                }
-                              ],
                               "fields": [],
-                              "type": "data-list",
                               "columns": [
                                 {
                                   "name": "name",
-                                  "icon": "user",
-                                  "variant": "h3"
+                                  "variant": "h3",
+                                  "icon": "user"
                                 },
                                 {
-                                  "variant": "badge",
-                                  "name": "department"
+                                  "name": "department",
+                                  "variant": "badge"
                                 },
                                 {
-                                  "name": "role",
-                                  "variant": "body"
+                                  "variant": "body",
+                                  "name": "role"
                                 },
                                 {
                                   "variant": "caption",
@@ -698,20 +677,41 @@
                                 },
                                 {
                                   "variant": "caption",
-                                  "name": "startDate",
+                                  "label": "Joined",
                                   "format": "date",
-                                  "label": "Joined"
+                                  "name": "startDate"
                                 }
                               ],
+                              "entity": "@payload.data",
                               "variant": "card",
-                              "entity": "@payload.data"
+                              "gap": "sm",
+                              "type": "data-list",
+                              "itemActions": [
+                                {
+                                  "label": "View",
+                                  "event": "VIEW",
+                                  "variant": "ghost"
+                                },
+                                {
+                                  "variant": "ghost",
+                                  "event": "EDIT",
+                                  "label": "Edit"
+                                },
+                                {
+                                  "variant": "danger",
+                                  "label": "Delete",
+                                  "event": "DELETE"
+                                }
+                              ]
                             }
                           ],
-                          "className": "max-w-5xl mx-auto w-full",
-                          "gap": "lg",
-                          "type": "stack"
+                          "type": "stack",
+                          "direction": "vertical",
+                          "gap": "lg"
                         }
-                      ]
+                      ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -725,12 +725,11 @@
                     "render-ui",
                     "main",
                     {
-                      "direction": "vertical",
                       "children": [
                         {
-                          "color": "destructive",
                           "type": "icon",
-                          "name": "alert-triangle"
+                          "name": "alert-triangle",
+                          "color": "destructive"
                         },
                         {
                           "type": "typography",
@@ -738,23 +737,24 @@
                           "content": "Failed to load employee"
                         },
                         {
-                          "type": "typography",
                           "variant": "body",
-                          "color": "muted",
-                          "content": "@payload.error"
+                          "content": "@payload.error",
+                          "type": "typography",
+                          "color": "muted"
                         },
                         {
+                          "label": "Retry",
+                          "action": "INIT",
                           "variant": "primary",
                           "type": "button",
-                          "label": "Retry",
-                          "icon": "rotate-ccw",
-                          "action": "INIT"
+                          "icon": "rotate-ccw"
                         }
                       ],
-                      "gap": "md",
+                      "align": "center",
                       "className": "py-12",
                       "type": "stack",
-                      "align": "center"
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -947,10 +947,9 @@
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
                           "direction": "horizontal",
                           "children": [
                             {
@@ -958,11 +957,12 @@
                               "name": "plus-circle"
                             },
                             {
+                              "type": "typography",
                               "content": "New Employee",
-                              "variant": "h3",
-                              "type": "typography"
+                              "variant": "h3"
                             }
                           ],
+                          "type": "stack",
                           "gap": "sm"
                         },
                         {
@@ -970,6 +970,7 @@
                         },
                         {
                           "mode": "create",
+                          "type": "form-section",
                           "fields": [
                             "name",
                             "email",
@@ -977,12 +978,11 @@
                             "role",
                             "startDate"
                           ],
-                          "cancelEvent": "CLOSE",
-                          "type": "form-section",
-                          "submitEvent": "SAVE"
+                          "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE"
                         }
                       ],
-                      "gap": "md",
+                      "type": "stack",
                       "direction": "vertical"
                     }
                   ]
@@ -1024,8 +1024,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "EmployeeSaveFailed",
-                        "success": "EmployeeSaved"
+                        "success": "EmployeeSaved",
+                        "failure": "EmployeeSaveFailed"
                       }
                     }
                   ],
@@ -1236,42 +1236,42 @@
                     "fetch",
                     "Employee",
                     {
+                      "id": "@payload.id",
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
-                      },
-                      "id": "@payload.id"
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
+                      }
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
+                      "type": "stack",
                       "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
                           "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
                               "name": "edit",
                               "type": "icon"
                             },
                             {
-                              "content": "Edit Employee",
                               "type": "typography",
+                              "content": "Edit Employee",
                               "variant": "h3"
                             }
-                          ],
-                          "gap": "sm"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "form-section",
-                          "mode": "edit",
-                          "submitEvent": "SAVE",
+                          "entity": "@payload.row",
                           "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
@@ -1280,11 +1280,11 @@
                             "role",
                             "startDate"
                           ],
-                          "entity": "@payload.row"
+                          "type": "form-section",
+                          "submitEvent": "SAVE",
+                          "mode": "edit"
                         }
-                      ],
-                      "direction": "vertical",
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -1325,8 +1325,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "EmployeeUpdated",
-                        "failure": "EmployeeUpdateFailed"
+                        "failure": "EmployeeUpdateFailed",
+                        "success": "EmployeeUpdated"
                       }
                     }
                   ],
@@ -1482,10 +1482,9 @@
                     "render-ui",
                     "modal",
                     {
-                      "gap": "md",
-                      "type": "stack",
                       "children": [
                         {
+                          "align": "center",
                           "gap": "sm",
                           "children": [
                             {
@@ -1493,13 +1492,12 @@
                               "name": "eye"
                             },
                             {
+                              "content": "@entity.name",
                               "type": "typography",
-                              "variant": "h3",
-                              "content": "@entity.name"
+                              "variant": "h3"
                             }
                           ],
                           "direction": "horizontal",
-                          "align": "center",
                           "type": "stack"
                         },
                         {
@@ -1508,7 +1506,6 @@
                         {
                           "type": "stack",
                           "direction": "horizontal",
-                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
@@ -1516,47 +1513,50 @@
                               "content": "Name"
                             },
                             {
-                              "content": "@entity.name",
                               "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "@entity.name"
                             }
-                          ]
+                          ],
+                          "gap": "md"
                         },
                         {
                           "gap": "md",
-                          "type": "stack",
                           "children": [
                             {
+                              "variant": "caption",
                               "content": "Email",
-                              "type": "typography",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
+                              "type": "typography",
                               "content": "@entity.email"
                             }
                           ],
+                          "type": "stack",
                           "direction": "horizontal"
                         },
                         {
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             {
-                              "content": "Department",
                               "variant": "caption",
+                              "content": "Department",
                               "type": "typography"
                             },
                             {
                               "content": "@entity.department",
-                              "variant": "body",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
-                          ],
-                          "type": "stack",
-                          "gap": "md",
-                          "direction": "horizontal"
+                          ]
                         },
                         {
+                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
@@ -1564,58 +1564,58 @@
                               "content": "Role"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.role",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md"
+                          "direction": "horizontal"
                         },
                         {
+                          "type": "stack",
+                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Start Date",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
                               "type": "typography",
                               "content": "@entity.startDate",
                               "variant": "body"
                             }
-                          ],
-                          "direction": "horizontal",
-                          "gap": "md",
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "gap": "sm",
-                          "justify": "end",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "primary",
                               "icon": "edit",
+                              "variant": "primary",
                               "type": "button",
                               "action": "EDIT",
                               "label": "Edit"
                             },
                             {
-                              "type": "button",
-                              "action": "CLOSE",
+                              "label": "Close",
                               "variant": "ghost",
-                              "label": "Close"
+                              "action": "CLOSE",
+                              "type": "button"
                             }
                           ],
+                          "gap": "sm",
                           "type": "stack",
-                          "direction": "horizontal"
+                          "justify": "end"
                         }
                       ],
-                      "direction": "vertical"
+                      "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -1850,11 +1850,11 @@
                     "fetch",
                     "Employee",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "failure": "EmployeeLoadFailed",
                         "success": "EmployeeLoaded"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
@@ -1864,8 +1864,9 @@
                       "direction": "vertical",
                       "children": [
                         {
-                          "gap": "sm",
+                          "type": "stack",
                           "direction": "horizontal",
+                          "gap": "sm",
                           "align": "center",
                           "children": [
                             {
@@ -1873,12 +1874,11 @@
                               "name": "alert-triangle"
                             },
                             {
-                              "content": "Delete Employee",
                               "type": "typography",
+                              "content": "Delete Employee",
                               "variant": "h3"
                             }
-                          ],
-                          "type": "stack"
+                          ]
                         },
                         {
                           "type": "divider"
@@ -1889,29 +1889,29 @@
                           "type": "alert"
                         },
                         {
-                          "direction": "horizontal",
-                          "gap": "sm",
-                          "justify": "end",
-                          "type": "stack",
                           "children": [
                             {
-                              "action": "CANCEL",
                               "type": "button",
-                              "variant": "ghost",
-                              "label": "Cancel"
+                              "label": "Cancel",
+                              "action": "CANCEL",
+                              "variant": "ghost"
                             },
                             {
-                              "label": "Delete",
                               "variant": "danger",
-                              "action": "CONFIRM_DELETE",
                               "type": "button",
-                              "icon": "check"
-                            }
-                          ]
+                              "icon": "check",
+                              "label": "Delete",
+                              "action": "CONFIRM_DELETE"
+                            }
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "sm",
+                          "justify": "end"
                         }
                       ],
-                      "type": "stack",
-                      "gap": "md"
+                      "gap": "md",
+                      "type": "stack"
                     }
                   ]
                 ]
@@ -2236,8 +2236,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "failure": "OnboardingLoadFailed",
-                        "success": "OnboardingLoaded"
+                        "success": "OnboardingLoaded",
+                        "failure": "OnboardingLoadFailed"
                       }
                     }
                   ],
@@ -2245,108 +2245,108 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "icon": "layout-list",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "icon": "calendar",
+                          "href": "/timeoff",
+                          "label": "Time Off"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "icon": "layout-list",
+                          "href": "/org-chart"
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
+                          "maxWidth": "lg",
                           "children": [
                             {
-                              "gap": "lg",
                               "type": "stack",
-                              "direction": "vertical",
+                              "gap": "lg",
                               "children": [
                                 {
                                   "direction": "horizontal",
-                                  "gap": "sm",
-                                  "type": "stack",
-                                  "align": "center",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "clipboard-check"
                                     },
                                     {
-                                      "content": "Employee Onboarding",
+                                      "type": "typography",
                                       "variant": "h2",
-                                      "type": "typography"
+                                      "content": "Employee Onboarding"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "gap": "sm",
+                                  "align": "center"
                                 },
                                 {
-                                  "count": 3.0,
                                   "type": "progress-dots",
+                                  "count": 3.0,
                                   "currentIndex": 0.0
                                 },
                                 {
+                                  "currentStep": 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"
+                                  "variant": "h3",
+                                  "type": "typography"
                                 },
                                 {
-                                  "mode": "create",
+                                  "cancelEvent": "INIT",
                                   "fields": [
                                     "employeeName",
                                     "department"
                                   ],
-                                  "type": "form-section",
+                                  "mode": "create",
                                   "submitEvent": "NEXT",
-                                  "cancelEvent": "INIT"
+                                  "type": "form-section"
                                 },
                                 {
-                                  "gap": "sm",
-                                  "justify": "end",
-                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "label": "Next",
-                                      "action": "NEXT",
+                                      "variant": "primary",
                                       "icon": "arrow-right",
                                       "type": "button",
-                                      "variant": "primary"
+                                      "action": "NEXT",
+                                      "label": "Next"
                                     }
                                   ],
-                                  "direction": "horizontal"
+                                  "gap": "sm",
+                                  "type": "stack",
+                                  "justify": "end"
                                 }
-                              ]
+                              ],
+                              "direction": "vertical"
                             }
                           ],
-                          "padding": "lg",
                           "type": "container",
-                          "maxWidth": "lg"
-                        }
-                      ],
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "icon": "users",
-                          "href": "/employees",
-                          "label": "Employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "icon": "layout-list",
-                          "href": "/onboarding"
-                        },
-                        {
-                          "label": "Time Off",
-                          "href": "/timeoff",
-                          "icon": "calendar"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "icon": "layout-list",
-                          "label": "Org Chart"
+                          "padding": "lg"
                         }
                       ]
                     }
@@ -2363,8 +2363,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -2375,36 +2375,36 @@
                       "navItems": [
                         {
                           "icon": "users",
-                          "label": "Employees",
-                          "href": "/employees"
+                          "href": "/employees",
+                          "label": "Employees"
                         },
                         {
+                          "href": "/onboarding",
                           "icon": "layout-list",
-                          "label": "Onboarding",
-                          "href": "/onboarding"
+                          "label": "Onboarding"
                         },
                         {
-                          "label": "Time Off",
                           "href": "/timeoff",
-                          "icon": "calendar"
+                          "icon": "calendar",
+                          "label": "Time Off"
                         },
                         {
                           "label": "Org Chart",
-                          "icon": "layout-list",
-                          "href": "/org-chart"
+                          "href": "/org-chart",
+                          "icon": "layout-list"
                         }
                       ],
-                      "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
                           "children": [
                             {
-                              "gap": "lg",
-                              "type": "stack",
                               "direction": "vertical",
                               "children": [
                                 {
-                                  "type": "stack",
+                                  "gap": "sm",
+                                  "align": "center",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "type": "icon",
@@ -2412,13 +2412,11 @@
                                     },
                                     {
                                       "content": "Employee Onboarding",
-                                      "type": "typography",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "type": "typography"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center"
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "progress-dots",
@@ -2438,50 +2436,52 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "h3",
+                                  "type": "typography",
                                   "content": "Manager Assignment"
                                 },
                                 {
-                                  "mode": "create",
                                   "cancelEvent": "PREV",
                                   "fields": [
                                     "manager"
                                   ],
-                                  "submitEvent": "NEXT",
-                                  "type": "form-section"
+                                  "type": "form-section",
+                                  "mode": "create",
+                                  "submitEvent": "NEXT"
                                 },
                                 {
-                                  "gap": "sm",
-                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "icon": "arrow-left",
                                       "label": "Back",
                                       "action": "PREV",
                                       "variant": "ghost",
-                                      "type": "button"
+                                      "type": "button",
+                                      "icon": "arrow-left"
                                     },
                                     {
+                                      "type": "button",
                                       "variant": "primary",
-                                      "icon": "arrow-right",
                                       "action": "NEXT",
-                                      "type": "button",
-                                      "label": "Next"
+                                      "label": "Next",
+                                      "icon": "arrow-right"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "justify": "end"
+                                  "type": "stack",
+                                  "gap": "sm"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "gap": "lg"
                             }
                           ],
                           "type": "container",
-                          "padding": "lg",
-                          "maxWidth": "lg"
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ],
-                      "appName": "HRPortal"
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2496,8 +2496,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -2505,6 +2505,7 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "HRPortal",
                       "navItems": [
                         {
                           "icon": "users",
@@ -2512,60 +2513,60 @@
                           "label": "Employees"
                         },
                         {
-                          "href": "/onboarding",
                           "icon": "layout-list",
-                          "label": "Onboarding"
+                          "label": "Onboarding",
+                          "href": "/onboarding"
                         },
                         {
-                          "icon": "calendar",
                           "label": "Time Off",
-                          "href": "/timeoff"
+                          "href": "/timeoff",
+                          "icon": "calendar"
                         },
                         {
-                          "label": "Org Chart",
                           "href": "/org-chart",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Org Chart"
                         }
                       ],
                       "children": [
                         {
+                          "type": "container",
                           "maxWidth": "lg",
                           "children": [
                             {
                               "direction": "vertical",
                               "gap": "lg",
-                              "type": "stack",
                               "children": [
                                 {
-                                  "align": "center",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
                                       "variant": "h2",
-                                      "content": "Employee Onboarding",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "content": "Employee Onboarding"
                                     }
                                   ],
-                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "sm"
+                                  "gap": "sm",
+                                  "align": "center"
                                 },
                                 {
-                                  "type": "progress-dots",
+                                  "currentIndex": 2.0,
                                   "count": 3.0,
-                                  "currentIndex": 2.0
+                                  "type": "progress-dots"
                                 },
                                 {
-                                  "currentStep": 2.0,
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ]
+                                  ],
+                                  "currentStep": 2.0,
+                                  "type": "wizard-progress"
                                 },
                                 {
                                   "type": "divider"
@@ -2577,44 +2578,43 @@
                                 },
                                 {
                                   "submitEvent": "NEXT",
-                                  "cancelEvent": "PREV",
-                                  "mode": "create",
-                                  "type": "form-section",
                                   "fields": [
                                     "equipmentReady",
                                     "accessGranted"
-                                  ]
+                                  ],
+                                  "cancelEvent": "PREV",
+                                  "type": "form-section",
+                                  "mode": "create"
                                 },
                                 {
+                                  "gap": "sm",
                                   "type": "stack",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "action": "PREV",
                                       "type": "button",
-                                      "variant": "ghost",
                                       "icon": "arrow-left",
-                                      "label": "Back"
+                                      "action": "PREV",
+                                      "label": "Back",
+                                      "variant": "ghost"
                                     },
                                     {
+                                      "type": "button",
                                       "icon": "arrow-right",
+                                      "variant": "primary",
                                       "action": "NEXT",
-                                      "type": "button",
-                                      "label": "Next",
-                                      "variant": "primary"
+                                      "label": "Next"
                                     }
                                   ],
-                                  "justify": "end",
-                                  "gap": "sm",
                                   "direction": "horizontal"
                                 }
-                              ]
+                              ],
+                              "type": "stack"
                             }
                           ],
-                          "padding": "lg",
-                          "type": "container"
+                          "padding": "lg"
                         }
                       ],
-                      "appName": "HRPortal",
                       "type": "dashboard-layout"
                     }
                   ]
@@ -2630,8 +2630,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "failure": "OnboardingLoadFailed",
-                        "success": "OnboardingLoaded"
+                        "success": "OnboardingLoaded",
+                        "failure": "OnboardingLoadFailed"
                       }
                     }
                   ],
@@ -2640,43 +2640,17 @@
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/onboarding",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "icon": "calendar",
-                          "label": "Time Off",
-                          "href": "/timeoff"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "label": "Org Chart",
-                          "icon": "layout-list"
-                        }
-                      ],
-                      "appName": "HRPortal",
                       "children": [
                         {
-                          "type": "container",
-                          "padding": "lg",
                           "children": [
                             {
-                              "type": "stack",
-                              "gap": "lg",
                               "children": [
                                 {
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
                                       "content": "Employee Onboarding",
@@ -2684,64 +2658,90 @@
                                       "type": "typography"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "align": "center",
                                   "type": "stack",
-                                  "gap": "sm"
+                                  "gap": "sm",
+                                  "align": "center"
                                 },
                                 {
+                                  "type": "progress-dots",
                                   "count": 3.0,
-                                  "currentIndex": 0.0,
-                                  "type": "progress-dots"
+                                  "currentIndex": 0.0
                                 },
                                 {
+                                  "type": "wizard-progress",
+                                  "currentStep": 0.0,
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ],
-                                  "currentStep": 0.0,
-                                  "type": "wizard-progress"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "typography",
-                                  "variant": "h3",
-                                  "content": "Employee Details"
+                                  "content": "Employee Details",
+                                  "variant": "h3"
                                 },
                                 {
-                                  "cancelEvent": "INIT",
+                                  "mode": "create",
                                   "type": "form-section",
-                                  "submitEvent": "NEXT",
                                   "fields": [
                                     "employeeName",
                                     "department"
                                   ],
-                                  "mode": "create"
+                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "INIT"
                                 },
                                 {
-                                  "justify": "end",
+                                  "direction": "horizontal",
                                   "type": "stack",
                                   "children": [
                                     {
                                       "label": "Next",
-                                      "type": "button",
                                       "variant": "primary",
-                                      "icon": "arrow-right",
-                                      "action": "NEXT"
+                                      "action": "NEXT",
+                                      "type": "button",
+                                      "icon": "arrow-right"
                                     }
                                   ],
                                   "gap": "sm",
-                                  "direction": "horizontal"
+                                  "justify": "end"
                                 }
                               ],
-                              "direction": "vertical"
+                              "direction": "vertical",
+                              "gap": "lg",
+                              "type": "stack"
                             }
                           ],
+                          "type": "container",
+                          "padding": "lg",
                           "maxWidth": "lg"
                         }
+                      ],
+                      "appName": "HRPortal",
+                      "navItems": [
+                        {
+                          "icon": "users",
+                          "label": "Employees",
+                          "href": "/employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "icon": "calendar",
+                          "href": "/timeoff",
+                          "label": "Time Off"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "icon": "layout-list",
+                          "label": "Org Chart"
+                        }
                       ]
                     }
                   ]
@@ -2766,27 +2766,25 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "horizontal",
                               "gap": "sm",
                               "children": [
                                 {
-                                  "type": "icon",
-                                  "name": "clipboard-check"
+                                  "name": "clipboard-check",
+                                  "type": "icon"
                                 },
                                 {
-                                  "type": "typography",
                                   "variant": "h2",
+                                  "type": "typography",
                                   "content": "Employee Onboarding"
                                 }
                               ],
+                              "direction": "horizontal",
+                              "type": "stack",
                               "align": "center"
                             },
                             {
@@ -2794,8 +2792,8 @@
                               "type": "badge"
                             },
                             {
-                              "type": "wizard-progress",
                               "currentStep": 3.0,
+                              "type": "wizard-progress",
                               "steps": [
                                 "Employee Details",
                                 "Manager Assignment",
@@ -2806,26 +2804,30 @@
                               "type": "divider"
                             },
                             {
+                              "gap": "sm",
                               "children": [
                                 {
-                                  "direction": "horizontal",
+                                  "justify": "between",
                                   "gap": "md",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "typography",
                                       "content": "Employee Name",
-                                      "variant": "caption"
+                                      "variant": "caption",
+                                      "type": "typography"
                                     },
                                     {
                                       "type": "typography",
-                                      "content": "@entity.employeeName",
-                                      "variant": "body"
+                                      "variant": "body",
+                                      "content": "@entity.employeeName"
                                     }
                                   ],
-                                  "justify": "between",
                                   "type": "stack"
                                 },
                                 {
+                                  "gap": "md",
+                                  "justify": "between",
+                                  "type": "stack",
                                   "direction": "horizontal",
                                   "children": [
                                     {
@@ -2835,33 +2837,34 @@
                                     },
                                     {
                                       "content": "@entity.department",
-                                      "type": "typography",
-                                      "variant": "body"
+                                      "variant": "body",
+                                      "type": "typography"
                                     }
-                                  ],
-                                  "type": "stack",
-                                  "justify": "between",
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
                                   "direction": "horizontal",
-                                  "gap": "md",
+                                  "justify": "between",
                                   "children": [
                                     {
-                                      "type": "typography",
+                                      "content": "Manager",
                                       "variant": "caption",
-                                      "content": "Manager"
+                                      "type": "typography"
                                     },
                                     {
-                                      "content": "@entity.manager",
                                       "type": "typography",
-                                      "variant": "body"
+                                      "variant": "body",
+                                      "content": "@entity.manager"
                                     }
                                   ],
-                                  "justify": "between",
+                                  "gap": "md",
                                   "type": "stack"
                                 },
                                 {
+                                  "gap": "md",
+                                  "direction": "horizontal",
+                                  "justify": "between",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "variant": "caption",
@@ -2869,74 +2872,71 @@
                                       "type": "typography"
                                     },
                                     {
-                                      "content": "@entity.equipmentReady",
+                                      "type": "typography",
                                       "variant": "body",
-                                      "type": "typography"
+                                      "content": "@entity.equipmentReady"
                                     }
-                                  ],
-                                  "gap": "md",
-                                  "type": "stack",
-                                  "justify": "between",
-                                  "direction": "horizontal"
+                                  ]
                                 },
                                 {
+                                  "type": "stack",
+                                  "justify": "between",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "content": "Access Granted",
+                                      "variant": "caption",
                                       "type": "typography",
-                                      "variant": "caption"
+                                      "content": "Access Granted"
                                     },
                                     {
-                                      "variant": "body",
+                                      "type": "typography",
                                       "content": "@entity.accessGranted",
-                                      "type": "typography"
+                                      "variant": "body"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "gap": "md",
-                                  "direction": "horizontal",
-                                  "justify": "between"
+                                  "direction": "horizontal"
                                 }
                               ],
-                              "type": "stack",
-                              "gap": "sm",
-                              "direction": "vertical"
+                              "direction": "vertical",
+                              "type": "stack"
                             },
                             {
-                              "totalSteps": 4.0,
-                              "showBack": true,
-                              "currentStep": 3.0,
                               "showNext": false,
                               "showComplete": true,
-                              "type": "wizard-navigation"
+                              "type": "wizard-navigation",
+                              "totalSteps": 4.0,
+                              "currentStep": 3.0,
+                              "showBack": true
                             }
                           ],
-                          "gap": "lg"
+                          "gap": "lg",
+                          "type": "stack",
+                          "direction": "vertical"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "href": "/employees",
                           "icon": "users",
-                          "label": "Employees"
+                          "label": "Employees",
+                          "href": "/employees"
                         },
                         {
-                          "href": "/onboarding",
                           "label": "Onboarding",
+                          "href": "/onboarding",
                           "icon": "layout-list"
                         },
                         {
-                          "icon": "calendar",
                           "href": "/timeoff",
-                          "label": "Time Off"
+                          "label": "Time Off",
+                          "icon": "calendar"
                         },
                         {
-                          "icon": "layout-list",
+                          "label": "Org Chart",
                           "href": "/org-chart",
-                          "label": "Org Chart"
+                          "icon": "layout-list"
                         }
-                      ],
-                      "appName": "HRPortal"
+                      ]
                     }
                   ]
                 ]
@@ -2960,61 +2960,35 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "label": "Time Off",
-                          "href": "/timeoff",
-                          "icon": "calendar"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "icon": "layout-list",
-                          "label": "Org Chart"
-                        }
-                      ],
                       "children": [
                         {
-                          "type": "container",
                           "maxWidth": "lg",
                           "padding": "lg",
                           "children": [
                             {
                               "type": "stack",
-                              "direction": "vertical",
                               "children": [
                                 {
                                   "gap": "sm",
-                                  "direction": "horizontal",
                                   "align": "center",
                                   "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "clipboard-check"
                                     },
                                     {
-                                      "type": "typography",
                                       "variant": "h2",
+                                      "type": "typography",
                                       "content": "Employee Onboarding"
                                     }
                                   ]
                                 },
                                 {
+                                  "count": 3.0,
                                   "currentIndex": 1.0,
-                                  "type": "progress-dots",
-                                  "count": 3.0
+                                  "type": "progress-dots"
                                 },
                                 {
                                   "type": "wizard-progress",
@@ -3029,47 +3003,73 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "variant": "h3",
                                   "type": "typography",
-                                  "content": "Manager Assignment",
-                                  "variant": "h3"
+                                  "content": "Manager Assignment"
                                 },
                                 {
-                                  "type": "form-section",
-                                  "mode": "create",
-                                  "submitEvent": "NEXT",
-                                  "cancelEvent": "PREV",
                                   "fields": [
                                     "manager"
-                                  ]
+                                  ],
+                                  "mode": "create",
+                                  "type": "form-section",
+                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "PREV"
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "justify": "end",
                                   "type": "stack",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "variant": "ghost",
                                       "icon": "arrow-left",
                                       "action": "PREV",
+                                      "type": "button",
                                       "label": "Back",
-                                      "type": "button"
+                                      "variant": "ghost"
                                     },
                                     {
-                                      "icon": "arrow-right",
-                                      "variant": "primary",
-                                      "action": "NEXT",
+                                      "label": "Next",
                                       "type": "button",
-                                      "label": "Next"
+                                      "action": "NEXT",
+                                      "variant": "primary",
+                                      "icon": "arrow-right"
                                     }
                                   ],
+                                  "direction": "horizontal",
                                   "gap": "sm"
                                 }
                               ],
+                              "direction": "vertical",
                               "gap": "lg"
                             }
-                          ]
+                          ],
+                          "type": "container"
                         }
-                      ]
+                      ],
+                      "appName": "HRPortal",
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "href": "/timeoff",
+                          "icon": "calendar",
+                          "label": "Time Off"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "href": "/org-chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3093,21 +3093,15 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "children": [
                         {
-                          "type": "container",
+                          "padding": "lg",
                           "children": [
                             {
-                              "gap": "lg",
                               "direction": "vertical",
                               "type": "stack",
                               "children": [
                                 {
-                                  "gap": "sm",
-                                  "align": "center",
-                                  "type": "stack",
-                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "type": "icon",
@@ -3115,15 +3109,19 @@
                                     },
                                     {
                                       "variant": "h2",
-                                      "type": "typography",
-                                      "content": "Employee Onboarding"
+                                      "content": "Employee Onboarding",
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm",
+                                  "direction": "horizontal",
+                                  "align": "center",
+                                  "type": "stack"
                                 },
                                 {
+                                  "count": 3.0,
                                   "currentIndex": 2.0,
-                                  "type": "progress-dots",
-                                  "count": 3.0
+                                  "type": "progress-dots"
                                 },
                                 {
                                   "type": "wizard-progress",
@@ -3138,72 +3136,74 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "typography",
                                   "content": "Setup Checklist",
-                                  "variant": "h3",
-                                  "type": "typography"
+                                  "variant": "h3"
                                 },
                                 {
+                                  "cancelEvent": "PREV",
+                                  "type": "form-section",
+                                  "submitEvent": "NEXT",
                                   "fields": [
                                     "equipmentReady",
                                     "accessGranted"
                                   ],
-                                  "mode": "create",
-                                  "type": "form-section",
-                                  "cancelEvent": "PREV",
-                                  "submitEvent": "NEXT"
+                                  "mode": "create"
                                 },
                                 {
+                                  "gap": "sm",
                                   "justify": "end",
-                                  "direction": "horizontal",
-                                  "type": "stack",
                                   "children": [
                                     {
+                                      "action": "PREV",
+                                      "variant": "ghost",
                                       "label": "Back",
                                       "type": "button",
-                                      "variant": "ghost",
-                                      "icon": "arrow-left",
-                                      "action": "PREV"
+                                      "icon": "arrow-left"
                                     },
                                     {
-                                      "icon": "arrow-right",
-                                      "variant": "primary",
-                                      "type": "button",
                                       "label": "Next",
-                                      "action": "NEXT"
+                                      "action": "NEXT",
+                                      "type": "button",
+                                      "variant": "primary",
+                                      "icon": "arrow-right"
                                     }
                                   ],
-                                  "gap": "sm"
+                                  "direction": "horizontal",
+                                  "type": "stack"
                                 }
-                              ]
+                              ],
+                              "gap": "lg"
                             }
                           ],
                           "maxWidth": "lg",
-                          "padding": "lg"
+                          "type": "container"
                         }
                       ],
-                      "appName": "HRPortal",
                       "navItems": [
                         {
-                          "label": "Employees",
                           "href": "/employees",
-                          "icon": "users"
+                          "icon": "users",
+                          "label": "Employees"
                         },
                         {
-                          "href": "/onboarding",
                           "icon": "layout-list",
-                          "label": "Onboarding"
+                          "label": "Onboarding",
+                          "href": "/onboarding"
                         },
                         {
-                          "href": "/timeoff",
                           "label": "Time Off",
-                          "icon": "calendar"
+                          "icon": "calendar",
+                          "href": "/timeoff"
                         },
                         {
                           "label": "Org Chart",
-                          "href": "/org-chart",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/org-chart"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "HRPortal"
                     }
                   ]
                 ]
@@ -3220,8 +3220,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "failure": "OnboardingSaveFailed",
-                        "success": "OnboardingSaved"
+                        "success": "OnboardingSaved",
+                        "failure": "OnboardingSaveFailed"
                       }
                     }
                   ],
@@ -3234,60 +3234,60 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "label": "Time Off",
-                          "href": "/timeoff",
-                          "icon": "calendar"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Org Chart",
-                          "href": "/org-chart"
-                        }
-                      ],
                       "children": [
                         {
+                          "align": "center",
                           "type": "stack",
                           "direction": "vertical",
-                          "align": "center",
                           "children": [
                             {
-                              "name": "check-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "check-circle"
                             },
                             {
                               "variant": "h2",
-                              "content": "Onboarding Complete!",
-                              "type": "typography"
+                              "type": "typography",
+                              "content": "Onboarding Complete!"
                             },
                             {
                               "type": "typography",
-                              "variant": "body",
-                              "content": "The new employee has been fully onboarded."
+                              "content": "The new employee has been fully onboarded.",
+                              "variant": "body"
                             },
                             {
-                              "icon": "refresh-cw",
-                              "variant": "primary",
                               "action": "RESTART",
+                              "icon": "refresh-cw",
                               "type": "button",
+                              "variant": "primary",
                               "label": "Start New"
                             }
                           ],
                           "gap": "lg"
                         }
                       ],
+                      "appName": "HRPortal",
+                      "navItems": [
+                        {
+                          "icon": "users",
+                          "label": "Employees",
+                          "href": "/employees"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "label": "Onboarding",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "icon": "layout-list",
+                          "label": "Org Chart"
+                        }
+                      ],
                       "type": "dashboard-layout"
                     }
                   ]
@@ -3303,8 +3303,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -3312,26 +3312,27 @@
                     "render-ui",
                     "main",
                     {
+                      "appName": "HRPortal",
                       "navItems": [
                         {
-                          "href": "/employees",
                           "label": "Employees",
-                          "icon": "users"
+                          "icon": "users",
+                          "href": "/employees"
                         },
                         {
-                          "href": "/onboarding",
+                          "icon": "layout-list",
                           "label": "Onboarding",
-                          "icon": "layout-list"
+                          "href": "/onboarding"
                         },
                         {
-                          "icon": "calendar",
+                          "href": "/timeoff",
                           "label": "Time Off",
-                          "href": "/timeoff"
+                          "icon": "calendar"
                         },
                         {
                           "href": "/org-chart",
-                          "label": "Org Chart",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Org Chart"
                         }
                       ],
                       "children": [
@@ -3339,22 +3340,23 @@
                           "type": "container",
                           "children": [
                             {
+                              "direction": "vertical",
                               "children": [
                                 {
+                                  "type": "stack",
+                                  "direction": "horizontal",
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
                                       "variant": "h2",
-                                      "content": "Employee Onboarding",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "content": "Employee Onboarding"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "align": "center",
-                                  "direction": "horizontal",
                                   "gap": "sm"
                                 },
                                 {
@@ -3375,47 +3377,45 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "content": "Employee Details",
                                   "variant": "h3",
-                                  "type": "typography",
-                                  "content": "Employee Details"
+                                  "type": "typography"
                                 },
                                 {
-                                  "mode": "create",
-                                  "cancelEvent": "INIT",
-                                  "submitEvent": "NEXT",
                                   "type": "form-section",
                                   "fields": [
                                     "employeeName",
                                     "department"
-                                  ]
+                                  ],
+                                  "mode": "create",
+                                  "submitEvent": "NEXT",
+                                  "cancelEvent": "INIT"
                                 },
                                 {
                                   "gap": "sm",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "variant": "primary",
-                                      "action": "NEXT",
+                                      "type": "button",
                                       "label": "Next",
+                                      "variant": "primary",
                                       "icon": "arrow-right",
-                                      "type": "button"
+                                      "action": "NEXT"
                                     }
                                   ],
                                   "type": "stack",
-                                  "justify": "end",
                                   "direction": "horizontal"
                                 }
                               ],
-                              "gap": "lg",
                               "type": "stack",
-                              "direction": "vertical"
+                              "gap": "lg"
                             }
                           ],
-                          "padding": "lg",
-                          "maxWidth": "lg"
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal"
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -3430,8 +3430,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "failure": "OnboardingLoadFailed",
-                        "success": "OnboardingLoaded"
+                        "success": "OnboardingLoaded",
+                        "failure": "OnboardingLoadFailed"
                       }
                     }
                   ],
@@ -3439,34 +3439,61 @@
                     "render-ui",
                     "main",
                     {
-                      "children": [
+                      "navItems": [
                         {
-                          "padding": "lg",
-                          "type": "container",
-                          "children": [
-                            {
-                              "children": [
-                                {
-                                  "children": [
-                                    {
-                                      "name": "clipboard-check",
-                                      "type": "icon"
-                                    },
-                                    {
-                                      "type": "typography",
-                                      "content": "Employee Onboarding",
-                                      "variant": "h2"
-                                    }
-                                  ],
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "align": "center",
-                                  "gap": "sm"
+                          "label": "Employees",
+                          "icon": "users",
+                          "href": "/employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "href": "/timeoff",
+                          "icon": "calendar",
+                          "label": "Time Off"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "icon": "layout-list",
+                          "label": "Org Chart"
+                        }
+                      ],
+                      "type": "dashboard-layout",
+                      "children": [
+                        {
+                          "padding": "lg",
+                          "type": "container",
+                          "maxWidth": "lg",
+                          "children": [
+                            {
+                              "direction": "vertical",
+                              "type": "stack",
+                              "gap": "lg",
+                              "children": [
+                                {
+                                  "children": [
+                                    {
+                                      "type": "icon",
+                                      "name": "clipboard-check"
+                                    },
+                                    {
+                                      "content": "Employee Onboarding",
+                                      "variant": "h2",
+                                      "type": "typography"
+                                    }
+                                  ],
+                                  "gap": "sm",
+                                  "align": "center",
+                                  "type": "stack",
+                                  "direction": "horizontal"
                                 },
                                 {
-                                  "type": "progress-dots",
                                   "count": 3.0,
-                                  "currentIndex": 0.0
+                                  "currentIndex": 0.0,
+                                  "type": "progress-dots"
                                 },
                                 {
                                   "steps": [
@@ -3474,21 +3501,21 @@
                                     "Manager Assignment",
                                     "Setup Checklist"
                                   ],
-                                  "type": "wizard-progress",
-                                  "currentStep": 0.0
+                                  "currentStep": 0.0,
+                                  "type": "wizard-progress"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "variant": "h3",
-                                  "content": "Employee Details",
-                                  "type": "typography"
+                                  "type": "typography",
+                                  "content": "Employee Details"
                                 },
                                 {
+                                  "submitEvent": "NEXT",
                                   "type": "form-section",
                                   "mode": "create",
-                                  "submitEvent": "NEXT",
                                   "cancelEvent": "INIT",
                                   "fields": [
                                     "employeeName",
@@ -3496,53 +3523,26 @@
                                   ]
                                 },
                                 {
-                                  "gap": "sm",
-                                  "type": "stack",
                                   "justify": "end",
+                                  "direction": "horizontal",
+                                  "type": "stack",
+                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "icon": "arrow-right",
-                                      "label": "Next",
                                       "type": "button",
+                                      "action": "NEXT",
+                                      "label": "Next",
                                       "variant": "primary",
-                                      "action": "NEXT"
+                                      "icon": "arrow-right"
                                     }
-                                  ],
-                                  "direction": "horizontal"
+                                  ]
                                 }
-                              ],
-                              "direction": "vertical",
-                              "gap": "lg",
-                              "type": "stack"
+                              ]
                             }
-                          ],
-                          "maxWidth": "lg"
+                          ]
                         }
                       ],
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "icon": "users",
-                          "href": "/employees",
-                          "label": "Employees"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/org-chart",
-                          "label": "Org Chart"
-                        }
-                      ]
+                      "appName": "HRPortal"
                     }
                   ]
                 ]
@@ -3733,22 +3733,22 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "stack",
+                      "align": "center",
                       "children": [
                         {
                           "type": "spinner"
                         },
                         {
-                          "content": "Loading…",
-                          "variant": "caption",
+                          "type": "typography",
                           "color": "muted",
-                          "type": "typography"
+                          "variant": "caption",
+                          "content": "Loading…"
                         }
                       ],
                       "className": "py-12",
                       "gap": "md",
-                      "direction": "vertical",
-                      "align": "center",
-                      "type": "stack"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -3763,65 +3763,65 @@
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "children": [
                         {
+                          "type": "stack",
+                          "direction": "vertical",
                           "children": [
                             {
-                              "direction": "horizontal",
-                              "justify": "between",
-                              "align": "center",
-                              "gap": "md",
                               "children": [
                                 {
                                   "gap": "sm",
+                                  "type": "stack",
+                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "calendar"
+                                      "name": "calendar",
+                                      "type": "icon"
                                     },
                                     {
-                                      "type": "typography",
                                       "content": "Time Off Requests",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "type": "typography"
                                     }
                                   ],
-                                  "align": "center",
-                                  "direction": "horizontal",
-                                  "type": "stack"
+                                  "direction": "horizontal"
                                 },
                                 {
+                                  "type": "stack",
+                                  "gap": "sm",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "label": "Request Time Off",
+                                      "type": "button",
                                       "variant": "primary",
                                       "icon": "plus",
-                                      "action": "CREATE",
-                                      "type": "button"
+                                      "label": "Request Time Off",
+                                      "action": "CREATE"
                                     }
-                                  ],
-                                  "gap": "sm",
-                                  "type": "stack",
-                                  "direction": "horizontal"
+                                  ]
                                 }
                               ],
-                              "type": "stack"
+                              "direction": "horizontal",
+                              "type": "stack",
+                              "gap": "md",
+                              "justify": "between",
+                              "align": "center"
                             },
                             {
                               "type": "divider"
                             },
                             {
                               "type": "data-list",
-                              "entity": "@payload.data",
                               "itemActions": [
                                 {
+                                  "event": "VIEW",
                                   "variant": "ghost",
-                                  "label": "View",
-                                  "event": "VIEW"
+                                  "label": "View"
                                 },
                                 {
-                                  "variant": "ghost",
                                   "label": "Edit",
+                                  "variant": "ghost",
                                   "event": "EDIT"
                                 },
                                 {
@@ -3830,44 +3830,43 @@
                                   "event": "DELETE"
                                 }
                               ],
+                              "variant": "card",
+                              "gap": "sm",
                               "fields": [],
                               "columns": [
                                 {
-                                  "label": "Employee",
                                   "name": "employeeName",
+                                  "label": "Employee",
                                   "variant": "h3",
                                   "icon": "calendar"
                                 },
                                 {
+                                  "label": "Type",
                                   "variant": "badge",
-                                  "name": "leaveType",
-                                  "label": "Type"
+                                  "name": "leaveType"
                                 },
                                 {
                                   "name": "status",
                                   "variant": "badge"
                                 },
                                 {
-                                  "variant": "body",
                                   "format": "date",
+                                  "variant": "body",
                                   "label": "From",
                                   "name": "startDate"
                                 },
                                 {
+                                  "label": "To",
                                   "name": "endDate",
                                   "variant": "body",
-                                  "format": "date",
-                                  "label": "To"
+                                  "format": "date"
                                 }
                               ],
-                              "gap": "sm",
-                              "variant": "card"
+                              "entity": "@payload.data"
                             }
                           ],
                           "gap": "lg",
-                          "direction": "vertical",
-                          "className": "max-w-5xl mx-auto w-full",
-                          "type": "stack"
+                          "className": "max-w-5xl mx-auto w-full"
                         }
                       ],
                       "navItems": [
@@ -3891,7 +3890,8 @@
                           "label": "Org Chart",
                           "icon": "layout-list"
                         }
-                      ]
+                      ],
+                      "appName": "HRPortal"
                     }
                   ]
                 ]
@@ -3905,6 +3905,8 @@
                     "render-ui",
                     "main",
                     {
+                      "gap": "md",
+                      "type": "stack",
                       "className": "py-12",
                       "children": [
                         {
@@ -3918,23 +3920,21 @@
                           "type": "typography"
                         },
                         {
-                          "type": "typography",
+                          "color": "muted",
                           "variant": "body",
                           "content": "@payload.error",
-                          "color": "muted"
+                          "type": "typography"
                         },
                         {
                           "type": "button",
-                          "label": "Retry",
-                          "action": "INIT",
                           "variant": "primary",
-                          "icon": "rotate-ccw"
+                          "label": "Retry",
+                          "icon": "rotate-ccw",
+                          "action": "INIT"
                         }
                       ],
-                      "gap": "md",
-                      "type": "stack",
-                      "direction": "vertical",
-                      "align": "center"
+                      "align": "center",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -4110,8 +4110,8 @@
                     "TimeOff",
                     {
                       "emit": {
-                        "success": "TimeOffLoaded",
-                        "failure": "TimeOffLoadFailed"
+                        "failure": "TimeOffLoadFailed",
+                        "success": "TimeOffLoaded"
                       }
                     }
                   ],
@@ -4119,22 +4119,19 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
-                      "type": "stack",
-                      "gap": "md",
                       "children": [
                         {
-                          "direction": "horizontal",
                           "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "plus-circle"
+                              "name": "plus-circle",
+                              "type": "icon"
                             },
                             {
+                              "type": "typography",
                               "content": "New Time Off Request",
-                              "variant": "h3",
-                              "type": "typography"
+                              "variant": "h3"
                             }
                           ],
                           "gap": "sm"
@@ -4143,6 +4140,8 @@
                           "type": "divider"
                         },
                         {
+                          "mode": "create",
+                          "submitEvent": "SAVE",
                           "type": "form-section",
                           "cancelEvent": "CLOSE",
                           "fields": [
@@ -4151,11 +4150,12 @@
                             "startDate",
                             "endDate",
                             "status"
-                          ],
-                          "submitEvent": "SAVE",
-                          "mode": "create"
+                          ]
                         }
-                      ]
+                      ],
+                      "type": "stack",
+                      "direction": "vertical",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -4196,8 +4196,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "TimeOffSaved",
-                        "failure": "TimeOffSaveFailed"
+                        "failure": "TimeOffSaveFailed",
+                        "success": "TimeOffSaved"
                       }
                     }
                   ],
@@ -4412,10 +4412,10 @@
                     {
                       "gap": "md",
                       "direction": "vertical",
+                      "type": "stack",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
                               "name": "edit",
@@ -4423,17 +4423,21 @@
                             },
                             {
                               "type": "typography",
-                              "content": "Edit TimeOff",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "Edit TimeOff"
                             }
                           ],
-                          "gap": "sm"
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "entity": "@payload.row",
+                          "submitEvent": "SAVE",
                           "cancelEvent": "CLOSE",
+                          "type": "form-section",
                           "fields": [
                             "employeeName",
                             "leaveType",
@@ -4441,13 +4445,9 @@
                             "endDate",
                             "status"
                           ],
-                          "type": "form-section",
-                          "mode": "edit",
-                          "entity": "@payload.row",
-                          "submitEvent": "SAVE"
+                          "mode": "edit"
                         }
-                      ],
-                      "type": "stack"
+                      ]
                     }
                   ]
                 ]
@@ -4488,8 +4488,8 @@
                     "@payload.data",
                     {
                       "emit": {
-                        "success": "TimeOffUpdated",
-                        "failure": "TimeOffUpdateFailed"
+                        "failure": "TimeOffUpdateFailed",
+                        "success": "TimeOffUpdated"
                       }
                     }
                   ],
@@ -4627,8 +4627,8 @@
                     "TimeOff",
                     {
                       "emit": {
-                        "success": "TimeOffLoaded",
-                        "failure": "TimeOffLoadFailed"
+                        "failure": "TimeOffLoadFailed",
+                        "success": "TimeOffLoaded"
                       },
                       "id": "@payload.id"
                     }
@@ -4641,27 +4641,25 @@
                       "children": [
                         {
                           "align": "center",
-                          "direction": "horizontal",
-                          "gap": "sm",
+                          "type": "stack",
                           "children": [
                             {
-                              "name": "eye",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "eye"
                             },
                             {
-                              "variant": "h3",
                               "content": "@entity.employeeName",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "h3"
                             }
                           ],
-                          "type": "stack"
+                          "gap": "sm",
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "type": "stack",
-                          "gap": "md",
                           "children": [
                             {
                               "variant": "caption",
@@ -4669,29 +4667,31 @@
                               "type": "typography"
                             },
                             {
-                              "content": "@entity.employeeName",
+                              "type": "typography",
                               "variant": "body",
-                              "type": "typography"
+                              "content": "@entity.employeeName"
                             }
                           ],
+                          "type": "stack",
+                          "gap": "md",
                           "direction": "horizontal"
                         },
                         {
                           "gap": "md",
                           "type": "stack",
-                          "direction": "horizontal",
                           "children": [
                             {
+                              "variant": "caption",
                               "content": "Leave Type",
-                              "type": "typography",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
-                              "content": "@entity.leaveType",
                               "type": "typography",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.leaveType"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal"
                         },
                         {
                           "gap": "md",
@@ -4699,78 +4699,78 @@
                           "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "Start Date"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.startDate",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ]
                         },
                         {
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             {
-                              "content": "End Date",
                               "type": "typography",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "content": "End Date"
                             },
                             {
                               "type": "typography",
                               "variant": "body",
                               "content": "@entity.endDate"
                             }
-                          ],
-                          "gap": "md",
-                          "direction": "horizontal",
-                          "type": "stack"
+                          ]
                         },
                         {
+                          "gap": "md",
+                          "direction": "horizontal",
                           "type": "stack",
                           "children": [
                             {
-                              "content": "Status",
                               "variant": "caption",
+                              "content": "Status",
                               "type": "typography"
                             },
                             {
                               "type": "typography",
-                              "content": "@entity.status",
-                              "variant": "body"
+                              "variant": "body",
+                              "content": "@entity.status"
                             }
-                          ],
-                          "direction": "horizontal",
-                          "gap": "md"
+                          ]
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "justify": "end",
-                          "gap": "sm",
-                          "type": "stack",
                           "direction": "horizontal",
+                          "type": "stack",
+                          "justify": "end",
                           "children": [
                             {
+                              "icon": "edit",
                               "action": "EDIT",
                               "type": "button",
                               "label": "Edit",
-                              "variant": "primary",
-                              "icon": "edit"
+                              "variant": "primary"
                             },
                             {
-                              "variant": "ghost",
                               "type": "button",
-                              "action": "CLOSE",
-                              "label": "Close"
+                              "label": "Close",
+                              "variant": "ghost",
+                              "action": "CLOSE"
                             }
-                          ]
+                          ],
+                          "gap": "sm"
                         }
                       ],
-                      "direction": "vertical",
-                      "gap": "md"
+                      "gap": "md",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -4997,11 +4997,11 @@
                     "fetch",
                     "TimeOff",
                     {
+                      "id": "@payload.id",
                       "emit": {
                         "success": "TimeOffLoaded",
                         "failure": "TimeOffLoadFailed"
-                      },
-                      "id": "@payload.id"
+                      }
                     }
                   ],
                   [
@@ -5009,56 +5009,56 @@
                     "modal",
                     {
                       "type": "stack",
-                      "direction": "vertical",
                       "gap": "md",
                       "children": [
                         {
-                          "direction": "horizontal",
                           "gap": "sm",
                           "align": "center",
-                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "name": "alert-triangle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "alert-triangle"
                             },
                             {
+                              "type": "typography",
                               "content": "Delete TimeOff",
-                              "variant": "h3",
-                              "type": "typography"
+                              "variant": "h3"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "type": "alert",
-                          "message": "This action cannot be undone.",
-                          "variant": "error"
+                          "variant": "error",
+                          "message": "This action cannot be undone."
                         },
                         {
-                          "justify": "end",
                           "children": [
                             {
                               "type": "button",
-                              "action": "CANCEL",
+                              "label": "Cancel",
                               "variant": "ghost",
-                              "label": "Cancel"
+                              "action": "CANCEL"
                             },
                             {
+                              "type": "button",
+                              "variant": "danger",
                               "action": "CONFIRM_DELETE",
                               "icon": "check",
-                              "type": "button",
-                              "label": "Delete",
-                              "variant": "danger"
+                              "label": "Delete"
                             }
                           ],
                           "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm"
+                          "gap": "sm",
+                          "justify": "end",
+                          "type": "stack"
                         }
-                      ]
+                      ],
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -5075,8 +5075,8 @@
                     "@entity.pendingId",
                     {
                       "emit": {
-                        "failure": "TimeOffDeleteFailed",
-                        "success": "TimeOffDeleted"
+                        "success": "TimeOffDeleted",
+                        "failure": "TimeOffDeleteFailed"
                       }
                     }
                   ],
@@ -5327,10 +5327,34 @@
                     "render-ui",
                     "main",
                     {
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "label": "Onboarding",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "href": "/timeoff",
+                          "icon": "calendar",
+                          "label": "Time Off"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "href": "/org-chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "appName": "HRPortal",
                       "children": [
                         {
                           "children": [
                             {
+                              "type": "stack",
                               "gap": "lg",
                               "children": [
                                 {
@@ -5346,35 +5370,35 @@
                                   ]
                                 },
                                 {
+                                  "direction": "horizontal",
+                                  "type": "stack",
                                   "gap": "md",
+                                  "justify": "between",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "direction": "horizontal",
+                                      "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "git-branch"
+                                          "name": "git-branch",
+                                          "type": "icon"
                                         },
                                         {
                                           "type": "typography",
-                                          "content": "Org Chart",
-                                          "variant": "h2"
+                                          "variant": "h2",
+                                          "content": "Org Chart"
                                         }
                                       ],
-                                      "gap": "md"
+                                      "type": "stack",
+                                      "direction": "horizontal"
                                     },
                                     {
-                                      "icon": "refresh-cw",
                                       "type": "button",
-                                      "action": "REFRESH",
                                       "label": "Refresh",
-                                      "variant": "secondary"
+                                      "variant": "secondary",
+                                      "icon": "refresh-cw",
+                                      "action": "REFRESH"
                                     }
-                                  ],
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "justify": "between"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
@@ -5382,21 +5406,23 @@
                                 {
                                   "children": [
                                     {
+                                      "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
-                                          "label": "TotalEmployees",
                                           "value": "@entity.totalEmployees",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "TotalEmployees"
                                         },
                                         {
-                                          "label": "Departments",
                                           "type": "stat-display",
+                                          "label": "Departments",
                                           "value": "@entity.departments"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "value": "@entity.openPositions",
-                                          "label": "OpenPositions"
+                                          "label": "OpenPositions",
+                                          "value": "@entity.openPositions"
                                         },
                                         {
                                           "type": "card",
@@ -5404,8 +5430,8 @@
                                             {
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "content": "AvgTenure",
+                                                  "type": "typography",
                                                   "variant": "caption"
                                                 },
                                                 {
@@ -5414,20 +5440,18 @@
                                                   "type": "typography"
                                                 }
                                               ],
+                                              "gap": "sm",
                                               "direction": "vertical",
-                                              "type": "stack",
-                                              "gap": "sm"
+                                              "type": "stack"
                                             }
                                           ]
                                         },
                                         {
                                           "type": "stat-display",
-                                          "label": "Headcount",
-                                          "value": "@entity.headcount"
+                                          "value": "@entity.headcount",
+                                          "label": "Headcount"
                                         }
-                                      ],
-                                      "type": "simple-grid",
-                                      "cols": 3.0
+                                      ]
                                     }
                                   ],
                                   "padding": "md",
@@ -5438,8 +5462,6 @@
                                 },
                                 {
                                   "cols": 2.0,
-                                  "type": "grid",
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "children": [
@@ -5455,55 +5477,57 @@
                                       "children": [
                                         {
                                           "variant": "caption",
-                                          "type": "typography",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "type": "typography"
                                         }
                                       ],
                                       "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
                                       "value": 19.0,
                                       "date": "Feb"
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
                                       "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
                                       "value": 30.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
                                       "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
                                   "nodes": [
@@ -5521,6 +5545,8 @@
                                     }
                                   ],
                                   "height": 200.0,
+                                  "width": 400.0,
+                                  "type": "graph-view",
                                   "edges": [
                                     {
                                       "source": "a",
@@ -5530,41 +5556,15 @@
                                       "target": "c",
                                       "source": "b"
                                     }
-                                  ],
-                                  "type": "graph-view",
-                                  "width": 400.0
+                                  ]
                                 }
                               ],
-                              "direction": "vertical",
-                              "type": "stack"
+                              "direction": "vertical"
                             }
                           ],
                           "type": "scaled-diagram"
                         }
                       ],
-                      "appName": "HRPortal",
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "href": "/onboarding",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "icon": "calendar",
-                          "label": "Time Off",
-                          "href": "/timeoff"
-                        },
-                        {
-                          "label": "Org Chart",
-                          "href": "/org-chart",
-                          "icon": "layout-list"
-                        }
-                      ],
                       "type": "dashboard-layout"
                     }
                   ]
@@ -5591,40 +5591,39 @@
                     {
                       "navItems": [
                         {
-                          "label": "Employees",
                           "href": "/employees",
+                          "label": "Employees",
                           "icon": "users"
                         },
                         {
+                          "label": "Onboarding",
                           "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
+                          "icon": "layout-list"
                         },
                         {
-                          "icon": "calendar",
                           "label": "Time Off",
+                          "icon": "calendar",
                           "href": "/timeoff"
                         },
                         {
-                          "label": "Org Chart",
+                          "href": "/org-chart",
                           "icon": "layout-list",
-                          "href": "/org-chart"
+                          "label": "Org Chart"
                         }
                       ],
+                      "appName": "HRPortal",
                       "type": "dashboard-layout",
                       "children": [
                         {
                           "children": [
                             {
-                              "gap": "lg",
-                              "direction": "vertical",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Org Chart"
@@ -5632,12 +5631,11 @@
                                   ]
                                 },
                                 {
+                                  "direction": "horizontal",
                                   "type": "stack",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "gap": "md",
-                                      "type": "stack",
-                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "name": "git-branch",
@@ -5648,91 +5646,90 @@
                                           "variant": "h2",
                                           "type": "typography"
                                         }
-                                      ]
-                                    },
-                                    {
-                                      "label": "Refresh",
+                                      ],
+                                      "type": "stack",
+                                      "direction": "horizontal",
+                                      "gap": "md"
+                                    },
+                                    {
                                       "type": "button",
-                                      "action": "REFRESH",
                                       "icon": "refresh-cw",
-                                      "variant": "secondary"
+                                      "label": "Refresh",
+                                      "variant": "secondary",
+                                      "action": "REFRESH"
                                     }
                                   ],
-                                  "justify": "between",
-                                  "direction": "horizontal",
-                                  "gap": "md"
+                                  "justify": "between"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "padding": "md",
+                                  "type": "box",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
                                       "cols": 3.0,
                                       "children": [
                                         {
-                                          "value": "@entity.totalEmployees",
+                                          "label": "TotalEmployees",
                                           "type": "stat-display",
-                                          "label": "TotalEmployees"
+                                          "value": "@entity.totalEmployees"
                                         },
                                         {
+                                          "label": "Departments",
                                           "value": "@entity.departments",
-                                          "type": "stat-display",
-                                          "label": "Departments"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "OpenPositions",
-                                          "value": "@entity.openPositions"
+                                          "value": "@entity.openPositions",
+                                          "type": "stat-display"
                                         },
                                         {
                                           "children": [
                                             {
-                                              "gap": "sm",
                                               "type": "stack",
                                               "direction": "vertical",
                                               "children": [
                                                 {
+                                                  "type": "typography",
                                                   "variant": "caption",
-                                                  "content": "AvgTenure",
-                                                  "type": "typography"
+                                                  "content": "AvgTenure"
                                                 },
                                                 {
                                                   "type": "typography",
                                                   "variant": "h3",
                                                   "content": "@entity.avgTenure"
                                                 }
-                                              ]
+                                              ],
+                                              "gap": "sm"
                                             }
                                           ],
                                           "type": "card"
                                         },
                                         {
-                                          "value": "@entity.headcount",
                                           "type": "stat-display",
-                                          "label": "Headcount"
+                                          "label": "Headcount",
+                                          "value": "@entity.headcount"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
-                                  ],
-                                  "type": "box"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "gap": "md",
-                                  "type": "grid",
                                   "cols": 2.0,
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "content": "Chart View",
                                           "variant": "caption",
+                                          "content": "Chart View",
                                           "type": "typography"
                                         }
                                       ]
@@ -5740,46 +5737,47 @@
                                     {
                                       "children": [
                                         {
-                                          "content": "Graph View",
                                           "type": "typography",
-                                          "variant": "caption"
+                                          "variant": "caption",
+                                          "content": "Graph View"
                                         }
                                       ],
                                       "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "value": 12.0,
                                       "date": "Jan"
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "date": "May",
                                       "value": 22.0
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
-                                  ],
-                                  "type": "line-chart"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "color": "primary",
@@ -5789,45 +5787,47 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "edges": [
-                                    {
-                                      "target": "b",
-                                      "source": "a"
-                                    },
-                                    {
-                                      "source": "b",
-                                      "target": "c"
-                                    }
-                                  ],
                                   "type": "graph-view",
-                                  "width": 400.0,
                                   "nodes": [
                                     {
                                       "label": "Start",
                                       "id": "a"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
-                                      "id": "c",
-                                      "label": "End"
+                                      "label": "End",
+                                      "id": "c"
+                                    }
+                                  ],
+                                  "width": 400.0,
+                                  "edges": [
+                                    {
+                                      "target": "b",
+                                      "source": "a"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
                                     }
                                   ],
                                   "height": 200.0
                                 }
                               ],
+                              "gap": "lg",
+                              "direction": "vertical",
                               "type": "stack"
                             }
                           ],
                           "type": "scaled-diagram"
                         }
-                      ],
-                      "appName": "HRPortal"
+                      ]
                     }
                   ]
                 ]
@@ -5842,8 +5842,8 @@
                     "OrgChart",
                     {
                       "emit": {
-                        "failure": "OrgChartLoadFailed",
-                        "success": "OrgChartLoaded"
+                        "success": "OrgChartLoaded",
+                        "failure": "OrgChartLoadFailed"
                       }
                     }
                   ],
@@ -5851,8 +5851,6 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "icon": "users",
@@ -5860,14 +5858,14 @@
                           "href": "/employees"
                         },
                         {
-                          "label": "Onboarding",
                           "href": "/onboarding",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "label": "Onboarding"
                         },
                         {
                           "label": "Time Off",
-                          "href": "/timeoff",
-                          "icon": "calendar"
+                          "icon": "calendar",
+                          "href": "/timeoff"
                         },
                         {
                           "label": "Org Chart",
@@ -5877,12 +5875,13 @@
                       ],
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
+                              "direction": "vertical",
+                              "gap": "lg",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "href": "/",
@@ -5891,17 +5890,15 @@
                                     {
                                       "label": "Org Chart"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
                                   "direction": "horizontal",
                                   "type": "stack",
-                                  "gap": "md",
-                                  "justify": "between",
                                   "children": [
                                     {
                                       "gap": "md",
-                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "type": "icon",
@@ -5909,20 +5906,23 @@
                                         },
                                         {
                                           "type": "typography",
-                                          "variant": "h2",
-                                          "content": "Org Chart"
+                                          "content": "Org Chart",
+                                          "variant": "h2"
                                         }
                                       ],
-                                      "type": "stack"
+                                      "type": "stack",
+                                      "direction": "horizontal"
                                     },
                                     {
-                                      "variant": "secondary",
                                       "type": "button",
-                                      "icon": "refresh-cw",
+                                      "variant": "secondary",
                                       "label": "Refresh",
+                                      "icon": "refresh-cw",
                                       "action": "REFRESH"
                                     }
-                                  ]
+                                  ],
+                                  "justify": "between",
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "divider"
@@ -5932,32 +5932,32 @@
                                   "children": [
                                     {
                                       "cols": 3.0,
-                                      "type": "simple-grid",
                                       "children": [
                                         {
+                                          "label": "TotalEmployees",
                                           "value": "@entity.totalEmployees",
-                                          "type": "stat-display",
-                                          "label": "TotalEmployees"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "label": "Departments",
                                           "value": "@entity.departments",
+                                          "label": "Departments",
                                           "type": "stat-display"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "value": "@entity.openPositions",
-                                          "label": "OpenPositions"
+                                          "label": "OpenPositions",
+                                          "value": "@entity.openPositions"
                                         },
                                         {
+                                          "type": "card",
                                           "children": [
                                             {
                                               "type": "stack",
                                               "children": [
                                                 {
-                                                  "variant": "caption",
+                                                  "content": "AvgTenure",
                                                   "type": "typography",
-                                                  "content": "AvgTenure"
+                                                  "variant": "caption"
                                                 },
                                                 {
                                                   "type": "typography",
@@ -5968,15 +5968,15 @@
                                               "gap": "sm",
                                               "direction": "vertical"
                                             }
-                                          ],
-                                          "type": "card"
+                                          ]
                                         },
                                         {
-                                          "label": "Headcount",
+                                          "type": "stat-display",
                                           "value": "@entity.headcount",
-                                          "type": "stat-display"
+                                          "label": "Headcount"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
                                   ],
                                   "type": "box"
@@ -5985,60 +5985,60 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "gap": "md",
+                                  "type": "grid",
                                   "cols": 2.0,
                                   "children": [
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
                                           "variant": "caption",
-                                          "content": "Chart View",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "content": "Chart View"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "content": "Graph View",
+                                          "type": "typography",
                                           "variant": "caption",
-                                          "type": "typography"
+                                          "content": "Graph View"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
                                   ],
-                                  "type": "grid"
+                                  "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
-                                      "value": 19.0,
-                                      "date": "Feb"
+                                      "date": "Feb",
+                                      "value": 19.0
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
                                   "type": "chart-legend",
@@ -6048,48 +6048,48 @@
                                       "label": "Current"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
                                   ]
                                 },
                                 {
-                                  "type": "graph-view",
+                                  "height": 200.0,
                                   "nodes": [
                                     {
                                       "id": "a",
                                       "label": "Start"
                                     },
                                     {
-                                      "id": "b",
-                                      "label": "Process"
+                                      "label": "Process",
+                                      "id": "b"
                                     },
                                     {
                                       "id": "c",
                                       "label": "End"
                                     }
                                   ],
-                                  "width": 400.0,
-                                  "height": 200.0,
+                                  "type": "graph-view",
                                   "edges": [
                                     {
                                       "target": "b",
                                       "source": "a"
                                     },
                                     {
-                                      "target": "c",
-                                      "source": "b"
+                                      "source": "b",
+                                      "target": "c"
                                     }
-                                  ]
+                                  ],
+                                  "width": 400.0
                                 }
-                              ],
-                              "gap": "lg",
-                              "direction": "vertical",
-                              "type": "stack"
+                              ]
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout",
+                      "appName": "HRPortal"
                     }
                   ]
                 ]
@@ -6113,12 +6113,38 @@
                     "render-ui",
                     "main",
                     {
-                      "children": [
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout",
+                      "navItems": [
                         {
+                          "label": "Employees",
+                          "icon": "users",
+                          "href": "/employees"
+                        },
+                        {
+                          "href": "/onboarding",
+                          "icon": "layout-list",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "icon": "calendar",
+                          "label": "Time Off",
+                          "href": "/timeoff"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "href": "/org-chart",
+                          "icon": "layout-list"
+                        }
+                      ],
+                      "children": [
+                        {
+                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "vertical",
+                              "gap": "lg",
+                              "type": "stack",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -6133,90 +6159,90 @@
                                   ]
                                 },
                                 {
-                                  "gap": "md",
-                                  "justify": "between",
                                   "type": "stack",
+                                  "justify": "between",
                                   "children": [
                                     {
                                       "gap": "md",
-                                      "type": "stack",
                                       "direction": "horizontal",
                                       "children": [
                                         {
-                                          "name": "git-branch",
-                                          "type": "icon"
+                                          "type": "icon",
+                                          "name": "git-branch"
                                         },
                                         {
                                           "variant": "h2",
                                           "content": "Org Chart",
                                           "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "type": "stack"
                                     },
                                     {
                                       "variant": "secondary",
                                       "icon": "refresh-cw",
+                                      "action": "REFRESH",
                                       "label": "Refresh",
-                                      "type": "button",
-                                      "action": "REFRESH"
+                                      "type": "button"
                                     }
                                   ],
+                                  "gap": "md",
                                   "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
                                   "padding": "md",
+                                  "type": "box",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "cols": 3.0,
                                       "children": [
                                         {
+                                          "value": "@entity.totalEmployees",
                                           "type": "stat-display",
-                                          "label": "TotalEmployees",
-                                          "value": "@entity.totalEmployees"
+                                          "label": "TotalEmployees"
                                         },
                                         {
-                                          "label": "Departments",
                                           "value": "@entity.departments",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "Departments"
                                         },
                                         {
-                                          "label": "OpenPositions",
                                           "value": "@entity.openPositions",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "OpenPositions"
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
-                                              "direction": "vertical",
                                               "children": [
                                                 {
                                                   "type": "typography",
-                                                  "variant": "caption",
-                                                  "content": "AvgTenure"
+                                                  "content": "AvgTenure",
+                                                  "variant": "caption"
                                                 },
                                                 {
-                                                  "type": "typography",
                                                   "variant": "h3",
-                                                  "content": "@entity.avgTenure"
+                                                  "content": "@entity.avgTenure",
+                                                  "type": "typography"
                                                 }
                                               ],
+                                              "gap": "sm",
                                               "type": "stack",
-                                              "gap": "sm"
+                                              "direction": "vertical"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "value": "@entity.headcount",
+                                          "type": "stat-display",
                                           "label": "Headcount"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid",
+                                      "cols": 3.0
                                     }
                                   ]
                                 },
@@ -6224,62 +6250,63 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "cols": 2.0,
+                                  "type": "grid",
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
+                                          "type": "typography",
                                           "content": "Chart View"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "children": [
                                         {
+                                          "content": "Graph View",
                                           "variant": "caption",
-                                          "type": "typography",
-                                          "content": "Graph View"
+                                          "type": "typography"
                                         }
                                       ],
                                       "type": "card"
                                     }
                                   ],
-                                  "cols": 2.0,
-                                  "type": "grid",
                                   "gap": "md"
                                 },
                                 {
                                   "data": [
                                     {
-                                      "value": 12.0,
-                                      "date": "Jan"
+                                      "date": "Jan",
+                                      "value": 12.0
                                     },
                                     {
                                       "value": 19.0,
                                       "date": "Feb"
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
                                       "value": 25.0
                                     },
                                     {
-                                      "value": 22.0,
-                                      "date": "May"
+                                      "date": "May",
+                                      "value": 22.0
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
                                   ],
                                   "type": "line-chart"
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
@@ -6289,31 +6316,30 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
+                                  "width": 400.0,
                                   "edges": [
                                     {
-                                      "target": "b",
-                                      "source": "a"
+                                      "source": "a",
+                                      "target": "b"
                                     },
                                     {
-                                      "target": "c",
-                                      "source": "b"
+                                      "source": "b",
+                                      "target": "c"
                                     }
                                   ],
-                                  "type": "graph-view",
-                                  "width": 400.0,
                                   "height": 200.0,
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
                                       "label": "Start",
                                       "id": "a"
                                     },
                                     {
-                                      "label": "Process",
-                                      "id": "b"
+                                      "id": "b",
+                                      "label": "Process"
                                     },
                                     {
                                       "label": "End",
@@ -6321,37 +6347,11 @@
                                     }
                                   ]
                                 }
-                              ],
-                              "gap": "lg"
+                              ]
                             }
-                          ],
-                          "type": "scaled-diagram"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
-                        },
-                        {
-                          "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"
+                      ]
                     }
                   ]
                 ]
@@ -6375,17 +6375,40 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
                       "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "icon": "users",
+                          "label": "Employees",
+                          "href": "/employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "icon": "layout-list",
+                          "href": "/org-chart"
+                        }
+                      ],
+                      "appName": "HRPortal",
                       "children": [
                         {
+                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "gap": "lg",
                               "direction": "vertical",
-                              "type": "stack",
+                              "gap": "lg",
                               "children": [
                                 {
+                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "href": "/",
@@ -6394,37 +6417,36 @@
                                     {
                                       "label": "Org Chart"
                                     }
-                                  ],
-                                  "type": "breadcrumb"
+                                  ]
                                 },
                                 {
+                                  "type": "stack",
+                                  "justify": "between",
                                   "children": [
                                     {
+                                      "direction": "horizontal",
+                                      "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "git-branch"
+                                          "name": "git-branch",
+                                          "type": "icon"
                                         },
                                         {
+                                          "type": "typography",
                                           "content": "Org Chart",
-                                          "variant": "h2",
-                                          "type": "typography"
+                                          "variant": "h2"
                                         }
                                       ],
-                                      "gap": "md",
-                                      "type": "stack",
-                                      "direction": "horizontal"
+                                      "type": "stack"
                                     },
                                     {
+                                      "label": "Refresh",
                                       "action": "REFRESH",
-                                      "icon": "refresh-cw",
                                       "type": "button",
-                                      "variant": "secondary",
-                                      "label": "Refresh"
+                                      "icon": "refresh-cw",
+                                      "variant": "secondary"
                                     }
                                   ],
-                                  "justify": "between",
-                                  "type": "stack",
                                   "direction": "horizontal",
                                   "gap": "md"
                                 },
@@ -6432,10 +6454,11 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "padding": "md",
                                   "children": [
                                     {
-                                      "cols": 3.0,
                                       "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
                                           "type": "stat-display",
@@ -6443,104 +6466,103 @@
                                           "label": "TotalEmployees"
                                         },
                                         {
+                                          "type": "stat-display",
                                           "label": "Departments",
-                                          "value": "@entity.departments",
-                                          "type": "stat-display"
+                                          "value": "@entity.departments"
                                         },
                                         {
-                                          "label": "OpenPositions",
                                           "value": "@entity.openPositions",
-                                          "type": "stat-display"
+                                          "type": "stat-display",
+                                          "label": "OpenPositions"
                                         },
                                         {
                                           "children": [
                                             {
-                                              "direction": "vertical",
                                               "gap": "sm",
                                               "type": "stack",
                                               "children": [
                                                 {
-                                                  "type": "typography",
+                                                  "content": "AvgTenure",
                                                   "variant": "caption",
-                                                  "content": "AvgTenure"
+                                                  "type": "typography"
                                                 },
                                                 {
-                                                  "content": "@entity.avgTenure",
                                                   "type": "typography",
-                                                  "variant": "h3"
+                                                  "variant": "h3",
+                                                  "content": "@entity.avgTenure"
                                                 }
-                                              ]
+                                              ],
+                                              "direction": "vertical"
                                             }
                                           ],
                                           "type": "card"
                                         },
                                         {
-                                          "label": "Headcount",
+                                          "value": "@entity.headcount",
                                           "type": "stat-display",
-                                          "value": "@entity.headcount"
+                                          "label": "Headcount"
                                         }
                                       ]
                                     }
                                   ],
-                                  "type": "box",
-                                  "padding": "md"
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "cols": 2.0,
-                                  "gap": "md",
-                                  "type": "grid",
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
-                                          "content": "Chart View",
                                           "variant": "caption",
+                                          "content": "Chart View",
                                           "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
+                                          "variant": "caption",
                                           "content": "Graph View",
-                                          "type": "typography",
-                                          "variant": "caption"
+                                          "type": "typography"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "cols": 2.0,
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "line-chart",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12.0
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
                                       "value": 19.0,
                                       "date": "Feb"
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25.0
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
-                                      "value": 22.0,
-                                      "date": "May"
+                                      "date": "May",
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
                                   ]
                                 },
@@ -6548,70 +6570,48 @@
                                   "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
                                   ]
                                 },
                                 {
-                                  "edges": [
-                                    {
-                                      "source": "a",
-                                      "target": "b"
-                                    },
-                                    {
-                                      "target": "c",
-                                      "source": "b"
-                                    }
-                                  ],
                                   "type": "graph-view",
+                                  "height": 200.0,
                                   "width": 400.0,
                                   "nodes": [
                                     {
-                                      "id": "a",
-                                      "label": "Start"
+                                      "label": "Start",
+                                      "id": "a"
                                     },
                                     {
-                                      "id": "b",
-                                      "label": "Process"
+                                      "label": "Process",
+                                      "id": "b"
                                     },
                                     {
                                       "label": "End",
                                       "id": "c"
                                     }
                                   ],
-                                  "height": 200.0
+                                  "edges": [
+                                    {
+                                      "source": "a",
+                                      "target": "b"
+                                    },
+                                    {
+                                      "source": "b",
+                                      "target": "c"
+                                    }
+                                  ]
                                 }
-                              ]
+                              ],
+                              "type": "stack"
                             }
-                          ],
-                          "type": "scaled-diagram"
-                        }
-                      ],
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "icon": "layout-list",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "icon": "calendar",
-                          "label": "Time Off"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "label": "Org Chart",
-                          "icon": "layout-list"
+                          ]
                         }
                       ]
                     }
@@ -6636,4 +6636,4 @@
       ]
     }
   ]
-}
+}