@almadar/std 7.4.7 → 7.4.8

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

@@ -257,130 +257,130 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
                       "type": "dashboard-layout",
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "icon": "layout-list",
-                          "href": "/onboarding"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "icon": "calendar",
-                          "label": "Time Off"
-                        },
-                        {
-                          "label": "Org Chart",
-                          "icon": "layout-list",
-                          "href": "/org-chart"
-                        }
-                      ],
                       "children": [
                         {
                           "type": "stack",
                           "className": "max-w-5xl mx-auto w-full",
-                          "gap": "lg",
-                          "direction": "vertical",
                           "children": [
                             {
-                              "gap": "md",
-                              "direction": "horizontal",
-                              "align": "center",
                               "type": "stack",
-                              "justify": "between",
+                              "direction": "horizontal",
                               "children": [
                                 {
-                                  "direction": "horizontal",
                                   "type": "stack",
                                   "align": "center",
                                   "gap": "sm",
                                   "children": [
                                     {
-                                      "name": "users",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "users"
                                     },
                                     {
+                                      "type": "typography",
                                       "content": "Employees",
-                                      "variant": "h2",
-                                      "type": "typography"
+                                      "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "stack",
                                   "children": [
                                     {
-                                      "label": "Add Employee",
-                                      "type": "button",
                                       "icon": "plus",
+                                      "label": "Add Employee",
                                       "action": "CREATE",
+                                      "type": "button",
                                       "variant": "primary"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  "gap": "sm",
+                                  "direction": "horizontal"
                                 }
-                              ]
+                              ],
+                              "gap": "md",
+                              "justify": "between",
+                              "align": "center"
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "fields": [],
                               "type": "data-list",
+                              "gap": "sm",
+                              "itemActions": [
+                                {
+                                  "event": "VIEW",
+                                  "variant": "ghost",
+                                  "label": "View"
+                                },
+                                {
+                                  "variant": "ghost",
+                                  "event": "EDIT",
+                                  "label": "Edit"
+                                },
+                                {
+                                  "label": "Delete",
+                                  "event": "DELETE",
+                                  "variant": "danger"
+                                }
+                              ],
+                              "entity": "Employee",
                               "columns": [
                                 {
-                                  "name": "name",
                                   "variant": "h3",
-                                  "icon": "user"
+                                  "icon": "user",
+                                  "name": "name"
                                 },
                                 {
-                                  "variant": "badge",
-                                  "name": "department"
+                                  "name": "department",
+                                  "variant": "badge"
                                 },
                                 {
-                                  "variant": "body",
-                                  "name": "role"
+                                  "name": "role",
+                                  "variant": "body"
                                 },
                                 {
-                                  "variant": "caption",
-                                  "name": "email"
+                                  "name": "email",
+                                  "variant": "caption"
                                 },
                                 {
-                                  "name": "startDate",
                                   "variant": "caption",
                                   "format": "date",
+                                  "name": "startDate",
                                   "label": "Joined"
                                 }
                               ],
-                              "variant": "card",
-                              "gap": "sm",
-                              "fields": [],
-                              "itemActions": [
-                                {
-                                  "label": "View",
-                                  "variant": "ghost",
-                                  "event": "VIEW"
-                                },
-                                {
-                                  "event": "EDIT",
-                                  "variant": "ghost",
-                                  "label": "Edit"
-                                },
-                                {
-                                  "variant": "danger",
-                                  "event": "DELETE",
-                                  "label": "Delete"
-                                }
-                              ],
-                              "entity": "Employee"
+                              "variant": "card"
                             }
-                          ]
+                          ],
+                          "gap": "lg",
+                          "direction": "vertical"
+                        }
+                      ],
+                      "appName": "HRPortal",
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "label": "Employees",
+                          "icon": "users"
+                        },
+                        {
+                          "label": "Onboarding",
+                          "href": "/onboarding",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "href": "/org-chart",
+                          "icon": "layout-list"
                         }
                       ]
                     }
@@ -569,23 +569,20 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
-                      "gap": "md",
-                      "type": "stack",
                       "children": [
                         {
+                          "type": "stack",
                           "children": [
                             {
-                              "name": "plus-circle",
-                              "type": "icon"
+                              "type": "icon",
+                              "name": "plus-circle"
                             },
                             {
                               "content": "New Employee",
-                              "type": "typography",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "type": "typography"
                             }
                           ],
-                          "type": "stack",
                           "direction": "horizontal",
                           "gap": "sm"
                         },
@@ -593,10 +590,9 @@
                           "type": "divider"
                         },
                         {
-                          "type": "form-section",
+                          "entity": "Employee",
                           "mode": "create",
                           "submitEvent": "SAVE",
-                          "entity": "Employee",
                           "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
@@ -604,9 +600,13 @@
                             "department",
                             "role",
                             "startDate"
-                          ]
+                          ],
+                          "type": "form-section"
                         }
-                      ]
+                      ],
+                      "direction": "vertical",
+                      "type": "stack",
+                      "gap": "md"
                     }
                   ]
                 ]
@@ -845,8 +845,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "EmployeeLoaded",
-                        "failure": "EmployeeLoadFailed"
+                        "failure": "EmployeeLoadFailed",
+                        "success": "EmployeeLoaded"
                       }
                     }
                   ],
@@ -855,42 +855,42 @@
                     "modal",
                     {
                       "type": "stack",
-                      "direction": "vertical",
                       "gap": "md",
+                      "direction": "vertical",
                       "children": [
                         {
                           "direction": "horizontal",
                           "gap": "sm",
-                          "type": "stack",
                           "children": [
                             {
                               "type": "icon",
                               "name": "edit"
                             },
                             {
-                              "type": "typography",
                               "content": "Edit Employee",
+                              "type": "typography",
                               "variant": "h3"
                             }
-                          ]
+                          ],
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "entityId": "@entity.id",
                           "mode": "edit",
                           "entity": "Employee",
+                          "type": "form-section",
                           "submitEvent": "SAVE",
+                          "cancelEvent": "CLOSE",
                           "fields": [
                             "name",
                             "email",
                             "department",
                             "role",
                             "startDate"
-                          ],
-                          "cancelEvent": "CLOSE",
-                          "entityId": "@entity.id",
-                          "type": "form-section"
+                          ]
                         }
                       ]
                     }
@@ -1115,151 +1115,151 @@
                     "fetch",
                     "Employee",
                     {
-                      "id": "@payload.id",
                       "emit": {
                         "failure": "EmployeeLoadFailed",
                         "success": "EmployeeLoaded"
-                      }
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
+                      "gap": "md",
                       "type": "stack",
                       "children": [
                         {
-                          "gap": "sm",
-                          "direction": "horizontal",
+                          "type": "stack",
                           "children": [
                             {
                               "name": "eye",
                               "type": "icon"
                             },
                             {
-                              "type": "typography",
                               "variant": "h3",
-                              "content": "@entity.name"
+                              "content": "@entity.name",
+                              "type": "typography"
                             }
                           ],
-                          "type": "stack",
+                          "gap": "sm",
+                          "direction": "horizontal",
                           "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
+                          "gap": "md",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "type": "typography",
+                              "content": "Name",
                               "variant": "caption",
-                              "content": "Name"
+                              "type": "typography"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.name",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "body"
                             }
                           ],
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "md"
+                          "type": "stack"
                         },
                         {
                           "type": "stack",
                           "gap": "md",
-                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
+                              "type": "typography",
                               "content": "Email",
-                              "type": "typography"
+                              "variant": "caption"
                             },
                             {
-                              "type": "typography",
                               "variant": "body",
-                              "content": "@entity.email"
+                              "content": "@entity.email",
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal"
                         },
                         {
-                          "type": "stack",
-                          "gap": "md",
                           "children": [
                             {
-                              "variant": "caption",
                               "content": "Department",
+                              "variant": "caption",
                               "type": "typography"
                             },
                             {
-                              "type": "typography",
                               "content": "@entity.department",
+                              "type": "typography",
                               "variant": "body"
                             }
                           ],
-                          "direction": "horizontal"
+                          "direction": "horizontal",
+                          "gap": "md",
+                          "type": "stack"
                         },
                         {
+                          "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
+                              "variant": "caption",
                               "type": "typography",
-                              "content": "Role",
-                              "variant": "caption"
+                              "content": "Role"
                             },
                             {
+                              "variant": "body",
                               "type": "typography",
-                              "content": "@entity.role",
-                              "variant": "body"
+                              "content": "@entity.role"
                             }
                           ],
-                          "gap": "md",
-                          "type": "stack",
-                          "direction": "horizontal"
+                          "gap": "md"
                         },
                         {
-                          "gap": "md",
-                          "direction": "horizontal",
-                          "type": "stack",
                           "children": [
                             {
+                              "variant": "caption",
                               "content": "Start Date",
-                              "type": "typography",
-                              "variant": "caption"
+                              "type": "typography"
                             },
                             {
                               "type": "typography",
                               "content": "@entity.startDate",
                               "variant": "body"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "type": "stack",
+                          "gap": "md"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "gap": "sm",
                           "justify": "end",
                           "children": [
                             {
-                              "variant": "primary",
+                              "type": "button",
+                              "action": "EDIT",
                               "icon": "edit",
                               "label": "Edit",
-                              "action": "EDIT",
-                              "type": "button"
+                              "variant": "primary"
                             },
                             {
-                              "variant": "ghost",
-                              "type": "button",
                               "label": "Close",
-                              "action": "CLOSE"
+                              "type": "button",
+                              "action": "CLOSE",
+                              "variant": "ghost"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal"
+                          "gap": "sm",
+                          "direction": "horizontal",
+                          "type": "stack"
                         }
                       ],
-                      "gap": "md"
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -1499,57 +1499,57 @@
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
+                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
-                          "align": "center",
-                          "gap": "sm",
                           "children": [
                             {
                               "type": "icon",
                               "name": "alert-triangle"
                             },
                             {
-                              "content": "Delete Employee",
                               "type": "typography",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "Delete Employee"
                             }
                           ],
-                          "direction": "horizontal"
+                          "gap": "sm",
+                          "direction": "horizontal",
+                          "align": "center",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "variant": "error",
                           "type": "alert",
-                          "message": "This action cannot be undone."
+                          "message": "This action cannot be undone.",
+                          "variant": "error"
                         },
                         {
-                          "justify": "end",
-                          "gap": "sm",
                           "type": "stack",
+                          "justify": "end",
                           "direction": "horizontal",
+                          "gap": "sm",
                           "children": [
                             {
-                              "label": "Cancel",
                               "type": "button",
                               "variant": "ghost",
-                              "action": "CANCEL"
+                              "action": "CANCEL",
+                              "label": "Cancel"
                             },
                             {
-                              "variant": "danger",
-                              "type": "button",
+                              "action": "CONFIRM_DELETE",
                               "label": "Delete",
                               "icon": "check",
-                              "action": "CONFIRM_DELETE"
+                              "type": "button",
+                              "variant": "danger"
                             }
                           ]
                         }
-                      ],
-                      "type": "stack",
-                      "direction": "vertical",
-                      "gap": "md"
+                      ]
                     }
                   ]
                 ]
@@ -1864,59 +1864,56 @@
                     "main",
                     {
                       "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "navItems": [
                         {
+                          "icon": "users",
                           "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
+                          "label": "Employees"
                         },
                         {
                           "icon": "layout-list",
-                          "href": "/onboarding",
-                          "label": "Onboarding"
+                          "label": "Onboarding",
+                          "href": "/onboarding"
                         },
                         {
-                          "icon": "calendar",
+                          "href": "/timeoff",
                           "label": "Time Off",
-                          "href": "/timeoff"
+                          "icon": "calendar"
                         },
                         {
-                          "label": "Org Chart",
                           "icon": "layout-list",
+                          "label": "Org Chart",
                           "href": "/org-chart"
                         }
                       ],
+                      "appName": "HRPortal",
                       "children": [
                         {
                           "type": "container",
-                          "padding": "lg",
-                          "maxWidth": "lg",
                           "children": [
                             {
-                              "type": "stack",
                               "children": [
                                 {
                                   "type": "stack",
-                                  "align": "center",
-                                  "direction": "horizontal",
                                   "gap": "sm",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
+                                      "variant": "h2",
                                       "content": "Employee Onboarding",
-                                      "type": "typography",
-                                      "variant": "h2"
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "align": "center"
                                 },
                                 {
-                                  "count": 3.0,
+                                  "type": "progress-dots",
                                   "currentIndex": 0.0,
-                                  "type": "progress-dots"
+                                  "count": 3.0
                                 },
                                 {
                                   "type": "wizard-progress",
@@ -1937,35 +1934,38 @@
                                 },
                                 {
                                   "type": "form-section",
+                                  "submitEvent": "NEXT",
+                                  "entity": "Onboarding",
+                                  "mode": "create",
+                                  "cancelEvent": "INIT",
                                   "fields": [
                                     "employeeName",
                                     "department"
-                                  ],
-                                  "submitEvent": "NEXT",
-                                  "cancelEvent": "INIT",
-                                  "entity": "Onboarding",
-                                  "mode": "create"
+                                  ]
                                 },
                                 {
-                                  "justify": "end",
                                   "children": [
                                     {
-                                      "label": "Next",
+                                      "action": "NEXT",
                                       "icon": "arrow-right",
-                                      "type": "button",
                                       "variant": "primary",
-                                      "action": "NEXT"
+                                      "label": "Next",
+                                      "type": "button"
                                     }
                                   ],
-                                  "direction": "horizontal",
+                                  "justify": "end",
+                                  "gap": "sm",
                                   "type": "stack",
-                                  "gap": "sm"
+                                  "direction": "horizontal"
                                 }
                               ],
-                              "direction": "vertical",
-                              "gap": "lg"
+                              "type": "stack",
+                              "gap": "lg",
+                              "direction": "vertical"
                             }
-                          ]
+                          ],
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ]
                     }
@@ -1994,112 +1994,112 @@
                       "navItems": [
                         {
                           "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
+                          "label": "Employees",
+                          "icon": "users"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/onboarding",
-                          "label": "Onboarding"
+                          "label": "Onboarding",
+                          "icon": "layout-list"
                         },
                         {
+                          "label": "Time Off",
                           "href": "/timeoff",
-                          "icon": "calendar",
-                          "label": "Time Off"
+                          "icon": "calendar"
                         },
                         {
                           "label": "Org Chart",
-                          "href": "/org-chart",
-                          "icon": "layout-list"
+                          "icon": "layout-list",
+                          "href": "/org-chart"
                         }
                       ],
-                      "appName": "HRPortal",
                       "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
+                          "type": "container",
+                          "padding": "lg",
                           "children": [
                             {
-                              "direction": "vertical",
-                              "type": "stack",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "direction": "horizontal",
+                                  "type": "stack",
+                                  "align": "center",
+                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "name": "clipboard-check",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "clipboard-check"
                                     },
                                     {
                                       "variant": "h2",
                                       "content": "Employee Onboarding",
                                       "type": "typography"
                                     }
-                                  ],
-                                  "gap": "sm",
-                                  "align": "center",
-                                  "type": "stack"
+                                  ]
                                 },
                                 {
-                                  "count": 3.0,
                                   "currentIndex": 1.0,
-                                  "type": "progress-dots"
+                                  "type": "progress-dots",
+                                  "count": 3.0
                                 },
                                 {
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
                                   ],
-                                  "currentStep": 1.0
+                                  "currentStep": 1.0,
+                                  "type": "wizard-progress"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Manager Assignment",
+                                  "type": "typography",
                                   "variant": "h3"
                                 },
                                 {
-                                  "cancelEvent": "PREV",
-                                  "type": "form-section",
                                   "entity": "Onboarding",
-                                  "mode": "create",
-                                  "submitEvent": "NEXT",
+                                  "type": "form-section",
                                   "fields": [
                                     "manager"
-                                  ]
+                                  ],
+                                  "cancelEvent": "PREV",
+                                  "submitEvent": "NEXT",
+                                  "mode": "create"
                                 },
                                 {
-                                  "gap": "sm",
                                   "type": "stack",
+                                  "direction": "horizontal",
+                                  "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
-                                      "action": "PREV",
-                                      "label": "Back",
                                       "variant": "ghost",
-                                      "icon": "arrow-left"
+                                      "icon": "arrow-left",
+                                      "label": "Back",
+                                      "action": "PREV",
+                                      "type": "button"
                                     },
                                     {
-                                      "action": "NEXT",
-                                      "icon": "arrow-right",
-                                      "type": "button",
                                       "variant": "primary",
-                                      "label": "Next"
+                                      "icon": "arrow-right",
+                                      "label": "Next",
+                                      "action": "NEXT",
+                                      "type": "button"
                                     }
                                   ],
-                                  "justify": "end",
-                                  "direction": "horizontal"
+                                  "gap": "sm"
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "direction": "vertical",
+                              "gap": "lg"
                             }
                           ],
-                          "type": "container",
-                          "maxWidth": "lg",
-                          "padding": "lg"
+                          "maxWidth": "lg"
                         }
                       ]
                     }
@@ -2116,8 +2116,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "success": "OnboardingLoaded",
-                        "failure": "OnboardingLoadFailed"
+                        "failure": "OnboardingLoadFailed",
+                        "success": "OnboardingLoaded"
                       }
                     }
                   ],
@@ -2125,62 +2125,38 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
-                        },
-                        {
-                          "href": "/onboarding",
-                          "label": "Onboarding",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "label": "Org Chart",
-                          "icon": "layout-list"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "children": [
                         {
+                          "type": "container",
                           "padding": "lg",
                           "maxWidth": "lg",
-                          "type": "container",
                           "children": [
                             {
+                              "direction": "vertical",
                               "type": "stack",
                               "gap": "lg",
-                              "direction": "vertical",
                               "children": [
                                 {
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "align": "center",
-                                  "type": "stack",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "clipboard-check"
                                     },
                                     {
-                                      "content": "Employee Onboarding",
                                       "type": "typography",
+                                      "content": "Employee Onboarding",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "align": "center",
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "progress-dots",
-                                  "count": 3.0,
-                                  "currentIndex": 2.0
+                                  "currentIndex": 2.0,
+                                  "count": 3.0
                                 },
                                 {
                                   "steps": [
@@ -2195,55 +2171,79 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "variant": "h3",
                                   "type": "typography",
+                                  "variant": "h3",
                                   "content": "Setup Checklist"
                                 },
                                 {
-                                  "entity": "Onboarding",
-                                  "cancelEvent": "PREV",
                                   "type": "form-section",
+                                  "submitEvent": "NEXT",
+                                  "entity": "Onboarding",
+                                  "mode": "create",
                                   "fields": [
                                     "equipmentReady",
                                     "accessGranted"
                                   ],
-                                  "submitEvent": "NEXT",
-                                  "mode": "create"
+                                  "cancelEvent": "PREV"
                                 },
                                 {
                                   "type": "stack",
+                                  "gap": "sm",
                                   "justify": "end",
                                   "children": [
                                     {
-                                      "type": "button",
                                       "label": "Back",
+                                      "type": "button",
                                       "icon": "arrow-left",
                                       "action": "PREV",
                                       "variant": "ghost"
                                     },
                                     {
+                                      "variant": "primary",
                                       "type": "button",
+                                      "label": "Next",
                                       "icon": "arrow-right",
-                                      "variant": "primary",
-                                      "action": "NEXT",
-                                      "label": "Next"
+                                      "action": "NEXT"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  "direction": "horizontal"
                                 }
                               ]
                             }
                           ]
                         }
-                      ]
-                    }
-                  ]
-                ]
-              },
-              {
-                "from": "step2",
-                "to": "step1",
+                      ],
+                      "navItems": [
+                        {
+                          "label": "Employees",
+                          "icon": "users",
+                          "href": "/employees"
+                        },
+                        {
+                          "label": "Onboarding",
+                          "href": "/onboarding",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "calendar",
+                          "href": "/timeoff",
+                          "label": "Time Off"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "icon": "layout-list",
+                          "href": "/org-chart"
+                        }
+                      ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout"
+                    }
+                  ]
+                ]
+              },
+              {
+                "from": "step2",
+                "to": "step1",
                 "event": "PREV",
                 "effects": [
                   [
@@ -2260,12 +2260,11 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "label": "Employees",
                           "icon": "users",
-                          "href": "/employees"
+                          "href": "/employees",
+                          "label": "Employees"
                         },
                         {
                           "label": "Onboarding",
@@ -2273,98 +2272,99 @@
                           "icon": "layout-list"
                         },
                         {
-                          "icon": "calendar",
+                          "label": "Time Off",
                           "href": "/timeoff",
-                          "label": "Time Off"
+                          "icon": "calendar"
                         },
                         {
-                          "label": "Org Chart",
                           "icon": "layout-list",
-                          "href": "/org-chart"
+                          "href": "/org-chart",
+                          "label": "Org Chart"
                         }
                       ],
+                      "appName": "HRPortal",
                       "children": [
                         {
+                          "type": "container",
                           "children": [
                             {
                               "children": [
                                 {
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "name": "clipboard-check",
                                       "type": "icon"
                                     },
                                     {
-                                      "variant": "h2",
                                       "content": "Employee Onboarding",
+                                      "variant": "h2",
                                       "type": "typography"
                                     }
                                   ],
-                                  "direction": "horizontal",
                                   "type": "stack",
                                   "gap": "sm",
                                   "align": "center"
                                 },
                                 {
-                                  "type": "progress-dots",
                                   "count": 3.0,
-                                  "currentIndex": 0.0
+                                  "currentIndex": 0.0,
+                                  "type": "progress-dots"
                                 },
                                 {
-                                  "currentStep": 0.0,
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ]
+                                  ],
+                                  "type": "wizard-progress",
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
+                                  "content": "Employee Details",
                                   "variant": "h3",
-                                  "content": "Employee Details"
+                                  "type": "typography"
                                 },
                                 {
+                                  "cancelEvent": "INIT",
                                   "fields": [
                                     "employeeName",
                                     "department"
                                   ],
-                                  "entity": "Onboarding",
                                   "type": "form-section",
-                                  "submitEvent": "NEXT",
                                   "mode": "create",
-                                  "cancelEvent": "INIT"
+                                  "entity": "Onboarding",
+                                  "submitEvent": "NEXT"
                                 },
                                 {
+                                  "direction": "horizontal",
                                   "justify": "end",
+                                  "type": "stack",
                                   "children": [
                                     {
+                                      "variant": "primary",
+                                      "label": "Next",
                                       "action": "NEXT",
-                                      "icon": "arrow-right",
                                       "type": "button",
-                                      "variant": "primary",
-                                      "label": "Next"
+                                      "icon": "arrow-right"
                                     }
                                   ],
-                                  "gap": "sm",
-                                  "type": "stack",
-                                  "direction": "horizontal"
+                                  "gap": "sm"
                                 }
                               ],
+                              "gap": "lg",
                               "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg"
+                              "direction": "vertical"
                             }
                           ],
-                          "padding": "lg",
-                          "type": "container",
-                          "maxWidth": "lg"
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ],
-                      "appName": "HRPortal"
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2388,77 +2388,79 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
                           "direction": "vertical",
-                          "gap": "lg",
                           "type": "stack",
+                          "gap": "lg",
                           "children": [
                             {
+                              "type": "stack",
                               "children": [
                                 {
                                   "name": "clipboard-check",
                                   "type": "icon"
                                 },
                                 {
+                                  "variant": "h2",
                                   "type": "typography",
-                                  "content": "Employee Onboarding",
-                                  "variant": "h2"
+                                  "content": "Employee Onboarding"
                                 }
                               ],
-                              "direction": "horizontal",
-                              "type": "stack",
                               "gap": "sm",
-                              "align": "center"
+                              "align": "center",
+                              "direction": "horizontal"
                             },
                             {
-                              "label": "Review",
-                              "type": "badge"
+                              "type": "badge",
+                              "label": "Review"
                             },
                             {
+                              "type": "wizard-progress",
                               "steps": [
                                 "Employee Details",
                                 "Manager Assignment",
                                 "Setup Checklist"
                               ],
-                              "type": "wizard-progress",
                               "currentStep": 3.0
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "direction": "vertical",
                               "type": "stack",
+                              "gap": "sm",
                               "children": [
                                 {
-                                  "gap": "md",
-                                  "justify": "between",
-                                  "type": "stack",
                                   "children": [
                                     {
-                                      "content": "Employee Name",
                                       "type": "typography",
+                                      "content": "Employee Name",
                                       "variant": "caption"
                                     },
                                     {
-                                      "type": "typography",
                                       "content": "@entity.employeeName",
-                                      "variant": "body"
+                                      "variant": "body",
+                                      "type": "typography"
                                     }
                                   ],
+                                  "gap": "md",
+                                  "type": "stack",
+                                  "justify": "between",
                                   "direction": "horizontal"
                                 },
                                 {
+                                  "justify": "between",
+                                  "gap": "md",
                                   "direction": "horizontal",
                                   "type": "stack",
-                                  "gap": "md",
-                                  "justify": "between",
                                   "children": [
                                     {
-                                      "content": "Department",
                                       "type": "typography",
-                                      "variant": "caption"
+                                      "variant": "caption",
+                                      "content": "Department"
                                     },
                                     {
                                       "content": "@entity.department",
@@ -2470,26 +2472,26 @@
                                 {
                                   "direction": "horizontal",
                                   "gap": "md",
+                                  "type": "stack",
                                   "justify": "between",
                                   "children": [
                                     {
+                                      "variant": "caption",
                                       "content": "Manager",
-                                      "type": "typography",
-                                      "variant": "caption"
+                                      "type": "typography"
                                     },
                                     {
-                                      "variant": "body",
                                       "type": "typography",
+                                      "variant": "body",
                                       "content": "@entity.manager"
                                     }
-                                  ],
-                                  "type": "stack"
+                                  ]
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "justify": "between",
+                                  "gap": "md",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "variant": "caption",
@@ -2504,61 +2506,59 @@
                                   ]
                                 },
                                 {
+                                  "gap": "md",
                                   "type": "stack",
+                                  "justify": "between",
                                   "direction": "horizontal",
                                   "children": [
                                     {
-                                      "variant": "caption",
                                       "content": "Access Granted",
-                                      "type": "typography"
+                                      "type": "typography",
+                                      "variant": "caption"
                                     },
                                     {
                                       "content": "@entity.accessGranted",
                                       "type": "typography",
                                       "variant": "body"
                                     }
-                                  ],
-                                  "gap": "md",
-                                  "justify": "between"
+                                  ]
                                 }
-                              ],
-                              "direction": "vertical",
-                              "gap": "sm"
+                              ]
                             },
                             {
                               "type": "wizard-navigation",
-                              "showNext": false,
-                              "totalSteps": 4.0,
                               "showBack": true,
                               "showComplete": true,
-                              "currentStep": 3.0
+                              "currentStep": 3.0,
+                              "showNext": false,
+                              "totalSteps": 4.0
                             }
                           ]
                         }
                       ],
-                      "appName": "HRPortal",
                       "navItems": [
                         {
+                          "label": "Employees",
                           "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
+                          "icon": "users"
                         },
                         {
+                          "href": "/onboarding",
                           "icon": "layout-list",
-                          "label": "Onboarding",
-                          "href": "/onboarding"
+                          "label": "Onboarding"
                         },
                         {
+                          "label": "Time Off",
                           "icon": "calendar",
-                          "href": "/timeoff",
-                          "label": "Time Off"
+                          "href": "/timeoff"
                         },
                         {
                           "label": "Org Chart",
-                          "icon": "layout-list",
-                          "href": "/org-chart"
+                          "href": "/org-chart",
+                          "icon": "layout-list"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2573,8 +2573,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "failure": "OnboardingLoadFailed",
-                        "success": "OnboardingLoaded"
+                        "success": "OnboardingLoaded",
+                        "failure": "OnboardingLoadFailed"
                       }
                     }
                   ],
@@ -2582,38 +2582,22 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "href": "/onboarding",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "icon": "calendar",
-                          "label": "Time Off"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Org Chart",
-                          "href": "/org-chart"
-                        }
-                      ],
+                      "appName": "HRPortal",
                       "children": [
                         {
+                          "maxWidth": "lg",
+                          "padding": "lg",
                           "type": "container",
                           "children": [
                             {
-                              "direction": "vertical",
-                              "gap": "lg",
                               "type": "stack",
+                              "gap": "lg",
                               "children": [
                                 {
+                                  "direction": "horizontal",
+                                  "type": "stack",
+                                  "gap": "sm",
+                                  "align": "center",
                                   "children": [
                                     {
                                       "name": "clipboard-check",
@@ -2621,14 +2605,10 @@
                                     },
                                     {
                                       "type": "typography",
-                                      "variant": "h2",
-                                      "content": "Employee Onboarding"
+                                      "content": "Employee Onboarding",
+                                      "variant": "h2"
                                     }
-                                  ],
-                                  "type": "stack",
-                                  "align": "center",
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  ]
                                 },
                                 {
                                   "count": 3.0,
@@ -2636,62 +2616,82 @@
                                   "type": "progress-dots"
                                 },
                                 {
+                                  "currentStep": 1.0,
+                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ],
-                                  "currentStep": 1.0,
-                                  "type": "wizard-progress"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "content": "Manager Assignment",
                                   "variant": "h3",
-                                  "type": "typography"
+                                  "type": "typography",
+                                  "content": "Manager Assignment"
                                 },
                                 {
-                                  "entity": "Onboarding",
-                                  "mode": "create",
+                                  "cancelEvent": "PREV",
                                   "submitEvent": "NEXT",
                                   "fields": [
                                     "manager"
                                   ],
-                                  "cancelEvent": "PREV",
-                                  "type": "form-section"
+                                  "entity": "Onboarding",
+                                  "type": "form-section",
+                                  "mode": "create"
                                 },
                                 {
+                                  "gap": "sm",
+                                  "justify": "end",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "label": "Back",
+                                      "type": "button",
                                       "action": "PREV",
-                                      "icon": "arrow-left",
+                                      "label": "Back",
                                       "variant": "ghost",
-                                      "type": "button"
+                                      "icon": "arrow-left"
                                     },
                                     {
-                                      "variant": "primary",
-                                      "icon": "arrow-right",
-                                      "action": "NEXT",
                                       "label": "Next",
-                                      "type": "button"
+                                      "action": "NEXT",
+                                      "icon": "arrow-right",
+                                      "type": "button",
+                                      "variant": "primary"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "justify": "end",
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  "type": "stack"
                                 }
-                              ]
+                              ],
+                              "direction": "vertical"
                             }
-                          ],
-                          "padding": "lg",
-                          "maxWidth": "lg"
+                          ]
+                        }
+                      ],
+                      "navItems": [
+                        {
+                          "icon": "users",
+                          "href": "/employees",
+                          "label": "Employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "href": "/timeoff",
+                          "icon": "calendar"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Org Chart",
+                          "href": "/org-chart"
                         }
                       ],
-                      "appName": "HRPortal",
                       "type": "dashboard-layout"
                     }
                   ]
@@ -2718,51 +2718,49 @@
                     {
                       "children": [
                         {
-                          "padding": "lg",
-                          "maxWidth": "lg",
-                          "type": "container",
                           "children": [
                             {
-                              "gap": "lg",
                               "type": "stack",
+                              "gap": "lg",
+                              "direction": "vertical",
                               "children": [
                                 {
-                                  "type": "stack",
+                                  "gap": "sm",
                                   "align": "center",
+                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "sm",
                                   "children": [
                                     {
                                       "type": "icon",
                                       "name": "clipboard-check"
                                     },
                                     {
-                                      "content": "Employee Onboarding",
+                                      "variant": "h2",
                                       "type": "typography",
-                                      "variant": "h2"
+                                      "content": "Employee Onboarding"
                                     }
                                   ]
                                 },
                                 {
-                                  "count": 3.0,
                                   "currentIndex": 2.0,
-                                  "type": "progress-dots"
+                                  "type": "progress-dots",
+                                  "count": 3.0
                                 },
                                 {
-                                  "currentStep": 2.0,
-                                  "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ]
+                                  ],
+                                  "type": "wizard-progress",
+                                  "currentStep": 2.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "typography",
                                   "content": "Setup Checklist",
+                                  "type": "typography",
                                   "variant": "h3"
                                 },
                                 {
@@ -2770,42 +2768,42 @@
                                     "equipmentReady",
                                     "accessGranted"
                                   ],
-                                  "submitEvent": "NEXT",
                                   "entity": "Onboarding",
                                   "type": "form-section",
                                   "mode": "create",
-                                  "cancelEvent": "PREV"
+                                  "cancelEvent": "PREV",
+                                  "submitEvent": "NEXT"
                                 },
                                 {
+                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "justify": "end",
                                   "children": [
                                     {
                                       "type": "button",
-                                      "action": "PREV",
-                                      "label": "Back",
                                       "variant": "ghost",
-                                      "icon": "arrow-left"
+                                      "action": "PREV",
+                                      "icon": "arrow-left",
+                                      "label": "Back"
                                     },
                                     {
-                                      "variant": "primary",
+                                      "type": "button",
                                       "action": "NEXT",
-                                      "label": "Next",
                                       "icon": "arrow-right",
-                                      "type": "button"
+                                      "label": "Next",
+                                      "variant": "primary"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "gap": "sm",
-                                  "type": "stack"
+                                  "gap": "sm"
                                 }
-                              ],
-                              "direction": "vertical"
+                              ]
                             }
-                          ]
+                          ],
+                          "type": "container",
+                          "maxWidth": "lg",
+                          "padding": "lg"
                         }
                       ],
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
                           "href": "/employees",
@@ -2813,13 +2811,13 @@
                           "label": "Employees"
                         },
                         {
-                          "label": "Onboarding",
                           "href": "/onboarding",
+                          "label": "Onboarding",
                           "icon": "layout-list"
                         },
                         {
-                          "label": "Time Off",
                           "icon": "calendar",
+                          "label": "Time Off",
                           "href": "/timeoff"
                         },
                         {
@@ -2827,7 +2825,9 @@
                           "icon": "layout-list",
                           "href": "/org-chart"
                         }
-                      ]
+                      ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -2852,33 +2852,35 @@
                     "render-ui",
                     "main",
                     {
+                      "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "navItems": [
                         {
-                          "icon": "users",
                           "label": "Employees",
+                          "icon": "users",
                           "href": "/employees"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/onboarding",
+                          "icon": "layout-list",
                           "label": "Onboarding"
                         },
                         {
-                          "label": "Time Off",
+                          "href": "/timeoff",
                           "icon": "calendar",
-                          "href": "/timeoff"
+                          "label": "Time Off"
                         },
                         {
-                          "icon": "layout-list",
+                          "href": "/org-chart",
                           "label": "Org Chart",
-                          "href": "/org-chart"
+                          "icon": "layout-list"
                         }
                       ],
                       "children": [
                         {
-                          "gap": "lg",
-                          "direction": "vertical",
                           "type": "stack",
+                          "direction": "vertical",
+                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
@@ -2887,26 +2889,24 @@
                             },
                             {
                               "type": "typography",
-                              "variant": "h2",
-                              "content": "Onboarding Complete!"
+                              "content": "Onboarding Complete!",
+                              "variant": "h2"
                             },
                             {
-                              "variant": "body",
+                              "content": "The new employee has been fully onboarded.",
                               "type": "typography",
-                              "content": "The new employee has been fully onboarded."
+                              "variant": "body"
                             },
                             {
+                              "variant": "primary",
+                              "action": "RESTART",
                               "label": "Start New",
                               "icon": "refresh-cw",
-                              "type": "button",
-                              "action": "RESTART",
-                              "variant": "primary"
+                              "type": "button"
                             }
                           ]
                         }
-                      ],
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout"
+                      ]
                     }
                   ]
                 ]
@@ -2930,67 +2930,45 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "label": "Employees",
-                          "icon": "users"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/onboarding",
-                          "label": "Onboarding"
-                        },
-                        {
-                          "icon": "calendar",
-                          "label": "Time Off",
-                          "href": "/timeoff"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "href": "/org-chart",
-                          "label": "Org Chart"
-                        }
-                      ],
-                      "appName": "HRPortal",
                       "children": [
                         {
-                          "maxWidth": "lg",
-                          "padding": "lg",
                           "type": "container",
+                          "maxWidth": "lg",
                           "children": [
                             {
+                              "type": "stack",
+                              "direction": "vertical",
                               "children": [
                                 {
-                                  "direction": "horizontal",
-                                  "align": "center",
                                   "children": [
                                     {
-                                      "type": "icon",
-                                      "name": "clipboard-check"
+                                      "name": "clipboard-check",
+                                      "type": "icon"
                                     },
                                     {
-                                      "type": "typography",
                                       "content": "Employee Onboarding",
-                                      "variant": "h2"
+                                      "variant": "h2",
+                                      "type": "typography"
                                     }
                                   ],
+                                  "type": "stack",
                                   "gap": "sm",
-                                  "type": "stack"
+                                  "direction": "horizontal",
+                                  "align": "center"
                                 },
                                 {
-                                  "currentIndex": 0.0,
                                   "type": "progress-dots",
-                                  "count": 3.0
+                                  "count": 3.0,
+                                  "currentIndex": 0.0
                                 },
                                 {
                                   "type": "wizard-progress",
-                                  "currentStep": 0.0,
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ]
+                                  ],
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
@@ -3003,38 +2981,60 @@
                                 {
                                   "type": "form-section",
                                   "submitEvent": "NEXT",
-                                  "mode": "create",
+                                  "entity": "Onboarding",
                                   "cancelEvent": "INIT",
+                                  "mode": "create",
                                   "fields": [
                                     "employeeName",
                                     "department"
-                                  ],
-                                  "entity": "Onboarding"
+                                  ]
                                 },
                                 {
-                                  "direction": "horizontal",
-                                  "type": "stack",
                                   "gap": "sm",
                                   "justify": "end",
+                                  "type": "stack",
                                   "children": [
                                     {
                                       "label": "Next",
-                                      "icon": "arrow-right",
+                                      "action": "NEXT",
                                       "type": "button",
                                       "variant": "primary",
-                                      "action": "NEXT"
+                                      "icon": "arrow-right"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal"
                                 }
                               ],
-                              "type": "stack",
-                              "gap": "lg",
-                              "direction": "vertical"
+                              "gap": "lg"
                             }
-                          ]
+                          ],
+                          "padding": "lg"
                         }
                       ],
-                      "type": "dashboard-layout"
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "label": "Employees",
+                          "icon": "users"
+                        },
+                        {
+                          "label": "Onboarding",
+                          "href": "/onboarding",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "calendar",
+                          "label": "Time Off",
+                          "href": "/timeoff"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "href": "/org-chart",
+                          "icon": "layout-list"
+                        }
+                      ]
                     }
                   ]
                 ]
@@ -3049,8 +3049,8 @@
                     "Onboarding",
                     {
                       "emit": {
-                        "failure": "OnboardingLoadFailed",
-                        "success": "OnboardingLoaded"
+                        "success": "OnboardingLoaded",
+                        "failure": "OnboardingLoadFailed"
                       }
                     }
                   ],
@@ -3059,22 +3059,21 @@
                     "main",
                     {
                       "appName": "HRPortal",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "label": "Employees",
                           "href": "/employees",
+                          "label": "Employees",
                           "icon": "users"
                         },
                         {
+                          "icon": "layout-list",
                           "label": "Onboarding",
-                          "href": "/onboarding",
-                          "icon": "layout-list"
+                          "href": "/onboarding"
                         },
                         {
                           "icon": "calendar",
-                          "label": "Time Off",
-                          "href": "/timeoff"
+                          "href": "/timeoff",
+                          "label": "Time Off"
                         },
                         {
                           "label": "Org Chart",
@@ -3082,12 +3081,15 @@
                           "icon": "layout-list"
                         }
                       ],
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "maxWidth": "lg",
-                          "padding": "lg",
                           "children": [
                             {
+                              "direction": "vertical",
+                              "type": "stack",
+                              "gap": "lg",
                               "children": [
                                 {
                                   "children": [
@@ -3096,15 +3098,15 @@
                                       "name": "clipboard-check"
                                     },
                                     {
+                                      "variant": "h2",
                                       "type": "typography",
-                                      "content": "Employee Onboarding",
-                                      "variant": "h2"
+                                      "content": "Employee Onboarding"
                                     }
                                   ],
+                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "align": "center",
                                   "gap": "sm",
-                                  "type": "stack"
+                                  "align": "center"
                                 },
                                 {
                                   "type": "progress-dots",
@@ -3112,55 +3114,53 @@
                                   "currentIndex": 0.0
                                 },
                                 {
-                                  "currentStep": 0.0,
                                   "type": "wizard-progress",
                                   "steps": [
                                     "Employee Details",
                                     "Manager Assignment",
                                     "Setup Checklist"
-                                  ]
+                                  ],
+                                  "currentStep": 0.0
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "variant": "h3",
                                   "type": "typography",
+                                  "variant": "h3",
                                   "content": "Employee Details"
                                 },
                                 {
-                                  "entity": "Onboarding",
                                   "type": "form-section",
-                                  "mode": "create",
+                                  "cancelEvent": "INIT",
+                                  "entity": "Onboarding",
                                   "submitEvent": "NEXT",
+                                  "mode": "create",
                                   "fields": [
                                     "employeeName",
                                     "department"
-                                  ],
-                                  "cancelEvent": "INIT"
+                                  ]
                                 },
                                 {
+                                  "direction": "horizontal",
+                                  "gap": "sm",
+                                  "justify": "end",
                                   "children": [
                                     {
                                       "type": "button",
-                                      "label": "Next",
-                                      "variant": "primary",
                                       "action": "NEXT",
+                                      "variant": "primary",
+                                      "label": "Next",
                                       "icon": "arrow-right"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "justify": "end",
-                                  "direction": "horizontal",
-                                  "gap": "sm"
+                                  "type": "stack"
                                 }
-                              ],
-                              "gap": "lg",
-                              "direction": "vertical",
-                              "type": "stack"
+                              ]
                             }
                           ],
-                          "type": "container"
+                          "type": "container",
+                          "padding": "lg"
                         }
                       ]
                     }
@@ -3389,134 +3389,134 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
-                      "navItems": [
-                        {
-                          "href": "/employees",
-                          "icon": "users",
-                          "label": "Employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "icon": "layout-list",
-                          "href": "/onboarding"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
-                        },
-                        {
-                          "href": "/org-chart",
-                          "icon": "layout-list",
-                          "label": "Org Chart"
-                        }
-                      ],
                       "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
-                          "type": "stack",
                           "gap": "lg",
                           "children": [
                             {
                               "type": "stack",
+                              "align": "center",
+                              "justify": "between",
                               "direction": "horizontal",
                               "gap": "md",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "gap": "sm",
-                                  "direction": "horizontal",
                                   "align": "center",
                                   "children": [
                                     {
-                                      "name": "calendar",
-                                      "type": "icon"
+                                      "type": "icon",
+                                      "name": "calendar"
                                     },
                                     {
                                       "type": "typography",
                                       "content": "Time Off Requests",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "type": "stack",
+                                  "gap": "sm"
                                 },
                                 {
+                                  "gap": "sm",
                                   "children": [
                                     {
-                                      "action": "CREATE",
                                       "icon": "plus",
+                                      "action": "CREATE",
                                       "variant": "primary",
-                                      "label": "Request Time Off",
-                                      "type": "button"
+                                      "type": "button",
+                                      "label": "Request Time Off"
                                     }
                                   ],
-                                  "type": "stack",
-                                  "gap": "sm",
-                                  "direction": "horizontal"
+                                  "direction": "horizontal",
+                                  "type": "stack"
                                 }
-                              ],
-                              "align": "center",
-                              "justify": "between"
+                              ]
                             },
                             {
                               "type": "divider"
                             },
                             {
+                              "type": "data-list",
+                              "itemActions": [
+                                {
+                                  "label": "View",
+                                  "variant": "ghost",
+                                  "event": "VIEW"
+                                },
+                                {
+                                  "variant": "ghost",
+                                  "label": "Edit",
+                                  "event": "EDIT"
+                                },
+                                {
+                                  "label": "Delete",
+                                  "variant": "danger",
+                                  "event": "DELETE"
+                                }
+                              ],
                               "columns": [
                                 {
-                                  "variant": "h3",
+                                  "name": "employeeName",
                                   "label": "Employee",
                                   "icon": "calendar",
-                                  "name": "employeeName"
+                                  "variant": "h3"
                                 },
                                 {
-                                  "name": "leaveType",
                                   "variant": "badge",
+                                  "name": "leaveType",
                                   "label": "Type"
                                 },
                                 {
                                   "name": "status",
-                                  "variant": "badge"
-                                },
-                                {
-                                  "name": "startDate",
-                                  "label": "From",
-                                  "format": "date",
-                                  "variant": "body"
-                                },
-                                {
-                                  "format": "date",
-                                  "label": "To",
-                                  "variant": "body",
-                                  "name": "endDate"
-                                }
-                              ],
-                              "type": "data-list",
-                              "fields": [],
-                              "gap": "sm",
-                              "variant": "card",
-                              "itemActions": [
-                                {
-                                  "variant": "ghost",
-                                  "label": "View",
-                                  "event": "VIEW"
+                                  "variant": "badge"
                                 },
                                 {
-                                  "label": "Edit",
-                                  "event": "EDIT",
-                                  "variant": "ghost"
+                                  "variant": "body",
+                                  "format": "date",
+                                  "name": "startDate",
+                                  "label": "From"
                                 },
                                 {
-                                  "event": "DELETE",
-                                  "variant": "danger",
-                                  "label": "Delete"
+                                  "label": "To",
+                                  "variant": "body",
+                                  "name": "endDate",
+                                  "format": "date"
                                 }
                               ],
-                              "entity": "TimeOff"
+                              "variant": "card",
+                              "fields": [],
+                              "entity": "TimeOff",
+                              "gap": "sm"
                             }
                           ],
+                          "direction": "vertical",
                           "className": "max-w-5xl mx-auto w-full",
-                          "direction": "vertical"
+                          "type": "stack"
+                        }
+                      ],
+                      "navItems": [
+                        {
+                          "icon": "users",
+                          "href": "/employees",
+                          "label": "Employees"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "label": "Onboarding",
+                          "href": "/onboarding"
+                        },
+                        {
+                          "href": "/timeoff",
+                          "label": "Time Off",
+                          "icon": "calendar"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "label": "Org Chart",
+                          "icon": "layout-list"
                         }
                       ]
                     }
@@ -3688,8 +3688,8 @@
                     "TimeOff",
                     {
                       "emit": {
-                        "success": "TimeOffLoaded",
-                        "failure": "TimeOffLoadFailed"
+                        "failure": "TimeOffLoadFailed",
+                        "success": "TimeOffLoaded"
                       }
                     }
                   ],
@@ -3698,42 +3698,42 @@
                     "modal",
                     {
                       "type": "stack",
-                      "gap": "md",
                       "children": [
                         {
+                          "gap": "sm",
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "plus-circle"
+                              "name": "plus-circle",
+                              "type": "icon"
                             },
                             {
-                              "variant": "h3",
                               "type": "typography",
+                              "variant": "h3",
                               "content": "New Time Off Request"
                             }
                           ],
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "sm"
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "submitEvent": "SAVE",
                           "cancelEvent": "CLOSE",
-                          "entity": "TimeOff",
-                          "type": "form-section",
-                          "mode": "create",
                           "fields": [
                             "employeeName",
                             "leaveType",
                             "startDate",
                             "endDate",
                             "status"
-                          ]
+                          ],
+                          "mode": "create",
+                          "entity": "TimeOff",
+                          "submitEvent": "SAVE",
+                          "type": "form-section"
                         }
                       ],
+                      "gap": "md",
                       "direction": "vertical"
                     }
                   ]
@@ -3964,8 +3964,8 @@
                     {
                       "id": "@payload.id",
                       "emit": {
-                        "success": "TimeOffLoaded",
-                        "failure": "TimeOffLoadFailed"
+                        "failure": "TimeOffLoadFailed",
+                        "success": "TimeOffLoaded"
                       }
                     }
                   ],
@@ -3973,13 +3973,13 @@
                     "render-ui",
                     "modal",
                     {
+                      "direction": "vertical",
                       "gap": "md",
                       "type": "stack",
                       "children": [
                         {
-                          "gap": "sm",
-                          "direction": "horizontal",
                           "type": "stack",
+                          "gap": "sm",
                           "children": [
                             {
                               "name": "edit",
@@ -3987,31 +3987,31 @@
                             },
                             {
                               "type": "typography",
-                              "content": "Edit TimeOff",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "Edit TimeOff"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal"
                         },
                         {
                           "type": "divider"
                         },
                         {
                           "entityId": "@entity.id",
+                          "entity": "TimeOff",
+                          "mode": "edit",
+                          "submitEvent": "SAVE",
+                          "type": "form-section",
+                          "cancelEvent": "CLOSE",
                           "fields": [
                             "employeeName",
                             "leaveType",
                             "startDate",
                             "endDate",
                             "status"
-                          ],
-                          "type": "form-section",
-                          "cancelEvent": "CLOSE",
-                          "mode": "edit",
-                          "submitEvent": "SAVE",
-                          "entity": "TimeOff"
+                          ]
                         }
-                      ],
-                      "direction": "vertical"
+                      ]
                     }
                   ]
                 ]
@@ -4227,8 +4227,8 @@
                     "TimeOff",
                     {
                       "emit": {
-                        "success": "TimeOffLoaded",
-                        "failure": "TimeOffLoadFailed"
+                        "failure": "TimeOffLoadFailed",
+                        "success": "TimeOffLoaded"
                       },
                       "id": "@payload.id"
                     }
@@ -4237,32 +4237,31 @@
                     "render-ui",
                     "modal",
                     {
-                      "direction": "vertical",
                       "type": "stack",
+                      "direction": "vertical",
                       "children": [
                         {
-                          "type": "stack",
-                          "gap": "sm",
                           "direction": "horizontal",
-                          "align": "center",
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "icon",
-                              "name": "eye"
+                              "name": "eye",
+                              "type": "icon"
                             },
                             {
-                              "type": "typography",
+                              "variant": "h3",
                               "content": "@entity.employeeName",
-                              "variant": "h3"
+                              "type": "typography"
                             }
-                          ]
+                          ],
+                          "gap": "sm",
+                          "align": "center"
                         },
                         {
                           "type": "divider"
                         },
                         {
-                          "direction": "horizontal",
-                          "type": "stack",
+                          "gap": "md",
                           "children": [
                             {
                               "type": "typography",
@@ -4270,80 +4269,81 @@
                               "content": "Employee Name"
                             },
                             {
-                              "content": "@entity.employeeName",
                               "type": "typography",
+                              "content": "@entity.employeeName",
                               "variant": "body"
                             }
                           ],
-                          "gap": "md"
+                          "type": "stack",
+                          "direction": "horizontal"
                         },
                         {
-                          "gap": "md",
                           "type": "stack",
+                          "direction": "horizontal",
                           "children": [
                             {
-                              "variant": "caption",
                               "type": "typography",
+                              "variant": "caption",
                               "content": "Leave Type"
                             },
                             {
-                              "type": "typography",
+                              "variant": "body",
                               "content": "@entity.leaveType",
-                              "variant": "body"
+                              "type": "typography"
                             }
                           ],
-                          "direction": "horizontal"
+                          "gap": "md"
                         },
                         {
+                          "direction": "horizontal",
+                          "gap": "md",
                           "children": [
                             {
-                              "content": "Start Date",
                               "type": "typography",
-                              "variant": "caption"
+                              "variant": "caption",
+                              "content": "Start Date"
                             },
                             {
-                              "content": "@entity.startDate",
                               "variant": "body",
+                              "content": "@entity.startDate",
                               "type": "typography"
                             }
                           ],
-                          "type": "stack",
-                          "direction": "horizontal",
-                          "gap": "md"
+                          "type": "stack"
                         },
                         {
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "typography",
                               "variant": "caption",
+                              "type": "typography",
                               "content": "End Date"
                             },
                             {
-                              "content": "@entity.endDate",
                               "type": "typography",
+                              "content": "@entity.endDate",
                               "variant": "body"
                             }
                           ],
                           "direction": "horizontal",
-                          "gap": "md",
-                          "type": "stack"
+                          "gap": "md"
                         },
                         {
+                          "direction": "horizontal",
+                          "gap": "md",
+                          "type": "stack",
                           "children": [
                             {
                               "content": "Status",
-                              "variant": "caption",
-                              "type": "typography"
+                              "type": "typography",
+                              "variant": "caption"
                             },
                             {
-                              "variant": "body",
                               "content": "@entity.status",
+                              "variant": "body",
                               "type": "typography"
                             }
-                          ],
-                          "direction": "horizontal",
-                          "type": "stack",
-                          "gap": "md"
+                          ]
                         },
                         {
                           "type": "divider"
@@ -4351,23 +4351,23 @@
                         {
                           "children": [
                             {
-                              "type": "button",
-                              "label": "Edit",
                               "variant": "primary",
+                              "type": "button",
                               "icon": "edit",
+                              "label": "Edit",
                               "action": "EDIT"
                             },
                             {
                               "action": "CLOSE",
-                              "label": "Close",
                               "type": "button",
-                              "variant": "ghost"
+                              "variant": "ghost",
+                              "label": "Close"
                             }
                           ],
-                          "type": "stack",
-                          "justify": "end",
+                          "direction": "horizontal",
                           "gap": "sm",
-                          "direction": "horizontal"
+                          "justify": "end",
+                          "type": "stack"
                         }
                       ],
                       "gap": "md"
@@ -4591,24 +4591,20 @@
                     "fetch",
                     "TimeOff",
                     {
-                      "id": "@payload.id",
                       "emit": {
-                        "failure": "TimeOffLoadFailed",
-                        "success": "TimeOffLoaded"
-                      }
+                        "success": "TimeOffLoaded",
+                        "failure": "TimeOffLoadFailed"
+                      },
+                      "id": "@payload.id"
                     }
                   ],
                   [
                     "render-ui",
                     "modal",
                     {
-                      "type": "stack",
+                      "gap": "md",
                       "children": [
                         {
-                          "type": "stack",
-                          "align": "center",
-                          "gap": "sm",
-                          "direction": "horizontal",
                           "children": [
                             {
                               "name": "alert-triangle",
@@ -4616,10 +4612,14 @@
                             },
                             {
                               "type": "typography",
-                              "content": "Delete TimeOff",
-                              "variant": "h3"
+                              "variant": "h3",
+                              "content": "Delete TimeOff"
                             }
-                          ]
+                          ],
+                          "direction": "horizontal",
+                          "align": "center",
+                          "gap": "sm",
+                          "type": "stack"
                         },
                         {
                           "type": "divider"
@@ -4631,28 +4631,28 @@
                         },
                         {
                           "direction": "horizontal",
-                          "justify": "end",
-                          "type": "stack",
-                          "gap": "sm",
                           "children": [
                             {
                               "type": "button",
-                              "action": "CANCEL",
                               "label": "Cancel",
-                              "variant": "ghost"
+                              "variant": "ghost",
+                              "action": "CANCEL"
                             },
                             {
                               "action": "CONFIRM_DELETE",
-                              "variant": "danger",
                               "label": "Delete",
-                              "icon": "check",
-                              "type": "button"
+                              "type": "button",
+                              "variant": "danger",
+                              "icon": "check"
                             }
-                          ]
+                          ],
+                          "justify": "end",
+                          "type": "stack",
+                          "gap": "sm"
                         }
                       ],
-                      "direction": "vertical",
-                      "gap": "md"
+                      "type": "stack",
+                      "direction": "vertical"
                     }
                   ]
                 ]
@@ -4938,55 +4938,29 @@
                   [
                     "fetch",
                     "OrgChart",
-                    {
-                      "emit": {
-                        "success": "OrgChartLoaded",
-                        "failure": "OrgChartLoadFailed"
-                      }
-                    }
-                  ],
-                  [
-                    "render-ui",
-                    "main",
-                    {
-                      "appName": "HRPortal",
-                      "navItems": [
-                        {
-                          "icon": "users",
-                          "label": "Employees",
-                          "href": "/employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "href": "/onboarding",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "icon": "calendar",
-                          "href": "/timeoff",
-                          "label": "Time Off"
-                        },
-                        {
-                          "icon": "layout-list",
-                          "label": "Org Chart",
-                          "href": "/org-chart"
-                        }
-                      ],
-                      "type": "dashboard-layout",
+                    {
+                      "emit": {
+                        "failure": "OrgChartLoadFailed",
+                        "success": "OrgChartLoaded"
+                      }
+                    }
+                  ],
+                  [
+                    "render-ui",
+                    "main",
+                    {
+                      "appName": "HRPortal",
                       "children": [
                         {
                           "type": "scaled-diagram",
                           "children": [
                             {
-                              "gap": "lg",
-                              "direction": "vertical",
-                              "type": "stack",
                               "children": [
                                 {
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Org Chart"
@@ -4995,33 +4969,33 @@
                                   "type": "breadcrumb"
                                 },
                                 {
+                                  "type": "stack",
                                   "justify": "between",
                                   "children": [
                                     {
+                                      "gap": "md",
+                                      "type": "stack",
+                                      "direction": "horizontal",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "git-branch"
+                                          "name": "git-branch",
+                                          "type": "icon"
                                         },
                                         {
+                                          "type": "typography",
                                           "variant": "h2",
-                                          "content": "Org Chart",
-                                          "type": "typography"
+                                          "content": "Org Chart"
                                         }
-                                      ],
-                                      "gap": "md",
-                                      "type": "stack",
-                                      "direction": "horizontal"
+                                      ]
                                     },
                                     {
-                                      "action": "REFRESH",
-                                      "variant": "secondary",
                                       "type": "button",
+                                      "action": "REFRESH",
+                                      "label": "Refresh",
                                       "icon": "refresh-cw",
-                                      "label": "Refresh"
+                                      "variant": "secondary"
                                     }
                                   ],
-                                  "type": "stack",
                                   "gap": "md",
                                   "direction": "horizontal"
                                 },
@@ -5032,8 +5006,6 @@
                                   "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "cols": 3.0,
                                       "children": [
                                         {
                                           "value": [
@@ -5048,6 +5020,7 @@
                                           "type": "stat-display"
                                         },
                                         {
+                                          "label": "Departments",
                                           "value": [
                                             "object/get",
                                             [
@@ -5056,12 +5029,9 @@
                                             ],
                                             "departments"
                                           ],
-                                          "type": "stat-display",
-                                          "label": "Departments"
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "label": "OpenPositions",
-                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -5069,23 +5039,22 @@
                                               "@entity"
                                             ],
                                             "openPositions"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "OpenPositions"
                                         },
                                         {
-                                          "type": "card",
                                           "children": [
                                             {
-                                              "gap": "sm",
-                                              "direction": "vertical",
                                               "type": "stack",
+                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "type": "typography",
                                                   "variant": "caption",
-                                                  "content": "AvgTenure"
+                                                  "content": "AvgTenure",
+                                                  "type": "typography"
                                                 },
                                                 {
-                                                  "variant": "h3",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -5094,11 +5063,14 @@
                                                     ],
                                                     "avgTenure"
                                                   ],
+                                                  "variant": "h3",
                                                   "type": "typography"
                                                 }
-                                              ]
+                                              ],
+                                              "direction": "vertical"
                                             }
-                                          ]
+                                          ],
+                                          "type": "card"
                                         },
                                         {
                                           "type": "stat-display",
@@ -5112,7 +5084,9 @@
                                             "headcount"
                                           ]
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid",
+                                      "cols": 3.0
                                     }
                                   ],
                                   "type": "box"
@@ -5121,15 +5095,16 @@
                                   "type": "divider"
                                 },
                                 {
+                                  "cols": 2.0,
                                   "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
+                                          "type": "typography",
                                           "content": "Chart View",
-                                          "variant": "caption",
-                                          "type": "typography"
+                                          "variant": "caption"
                                         }
                                       ]
                                     },
@@ -5137,18 +5112,16 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
+                                          "type": "typography",
                                           "content": "Graph View"
                                         }
                                       ]
                                     }
                                   ],
-                                  "type": "grid",
-                                  "cols": 2.0
+                                  "type": "grid"
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
@@ -5167,14 +5140,15 @@
                                       "date": "Apr"
                                     },
                                     {
-                                      "value": 22.0,
-                                      "date": "May"
+                                      "date": "May",
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30.0
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
                                   "type": "chart-legend",
@@ -5184,16 +5158,16 @@
                                       "label": "Current"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
                                   ]
                                 },
                                 {
                                   "edges": [
                                     {
-                                      "from": "a",
-                                      "to": "b"
+                                      "to": "b",
+                                      "from": "a"
                                     },
                                     {
                                       "from": "b",
@@ -5202,19 +5176,18 @@
                                   ],
                                   "width": 400.0,
                                   "type": "graph-view",
-                                  "height": 200.0,
                                   "nodes": [
                                     {
-                                      "label": "Start",
                                       "x": 50.0,
-                                      "id": "a",
-                                      "y": 100.0
+                                      "label": "Start",
+                                      "y": 100.0,
+                                      "id": "a"
                                     },
                                     {
+                                      "id": "b",
                                       "label": "Process",
                                       "y": 50.0,
-                                      "x": 200.0,
-                                      "id": "b"
+                                      "x": 200.0
                                     },
                                     {
                                       "x": 350.0,
@@ -5222,13 +5195,40 @@
                                       "id": "c",
                                       "y": 100.0
                                     }
-                                  ]
+                                  ],
+                                  "height": 200.0
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "gap": "lg",
+                              "direction": "vertical"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "navItems": [
+                        {
+                          "href": "/employees",
+                          "icon": "users",
+                          "label": "Employees"
+                        },
+                        {
+                          "label": "Onboarding",
+                          "href": "/onboarding",
+                          "icon": "layout-list"
+                        },
+                        {
+                          "icon": "calendar",
+                          "href": "/timeoff",
+                          "label": "Time Off"
+                        },
+                        {
+                          "label": "Org Chart",
+                          "icon": "layout-list",
+                          "href": "/org-chart"
+                        }
+                      ],
+                      "type": "dashboard-layout"
                     }
                   ]
                 ]
@@ -5252,42 +5252,16 @@
                     "render-ui",
                     "main",
                     {
-                      "navItems": [
-                        {
-                          "icon": "users",
-                          "href": "/employees",
-                          "label": "Employees"
-                        },
-                        {
-                          "label": "Onboarding",
-                          "href": "/onboarding",
-                          "icon": "layout-list"
-                        },
-                        {
-                          "href": "/timeoff",
-                          "icon": "calendar",
-                          "label": "Time Off"
-                        },
-                        {
-                          "label": "Org Chart",
-                          "icon": "layout-list",
-                          "href": "/org-chart"
-                        }
-                      ],
-                      "type": "dashboard-layout",
-                      "appName": "HRPortal",
                       "children": [
                         {
                           "children": [
                             {
-                              "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Org Chart"
@@ -5296,42 +5270,40 @@
                                   "type": "breadcrumb"
                                 },
                                 {
+                                  "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
+                                      "type": "stack",
+                                      "gap": "md",
+                                      "direction": "horizontal",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "git-branch"
+                                          "name": "git-branch",
+                                          "type": "icon"
                                         },
                                         {
                                           "content": "Org Chart",
                                           "variant": "h2",
                                           "type": "typography"
                                         }
-                                      ],
-                                      "direction": "horizontal",
-                                      "gap": "md",
-                                      "type": "stack"
+                                      ]
                                     },
                                     {
+                                      "variant": "secondary",
                                       "icon": "refresh-cw",
-                                      "action": "REFRESH",
-                                      "label": "Refresh",
                                       "type": "button",
-                                      "variant": "secondary"
+                                      "action": "REFRESH",
+                                      "label": "Refresh"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "type": "stack",
-                                  "gap": "md",
-                                  "justify": "between"
+                                  "justify": "between",
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
                                       "type": "simple-grid",
@@ -5362,8 +5334,6 @@
                                           "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "OpenPositions",
                                           "value": [
                                             "object/get",
                                             [
@@ -5371,22 +5341,24 @@
                                               "@entity"
                                             ],
                                             "openPositions"
-                                          ]
+                                          ],
+                                          "label": "OpenPositions",
+                                          "type": "stat-display"
                                         },
                                         {
+                                          "type": "card",
                                           "children": [
                                             {
                                               "type": "stack",
-                                              "direction": "vertical",
+                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "content": "AvgTenure",
+                                                  "type": "typography",
                                                   "variant": "caption",
-                                                  "type": "typography"
+                                                  "content": "AvgTenure"
                                                 },
                                                 {
                                                   "variant": "h3",
-                                                  "type": "typography",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -5394,16 +5366,15 @@
                                                       "@entity"
                                                     ],
                                                     "avgTenure"
-                                                  ]
+                                                  ],
+                                                  "type": "typography"
                                                 }
                                               ],
-                                              "gap": "sm"
+                                              "direction": "vertical"
                                             }
-                                          ],
-                                          "type": "card"
+                                          ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Headcount",
                                           "value": [
                                             "object/get",
@@ -5412,19 +5383,19 @@
                                               "@entity"
                                             ],
                                             "headcount"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "gap": "md",
-                                  "cols": 2.0,
                                   "children": [
                                     {
                                       "type": "card",
@@ -5437,42 +5408,45 @@
                                       ]
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "variant": "caption",
                                           "content": "Graph View",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "caption"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
-                                  ]
+                                  ],
+                                  "cols": 2.0,
+                                  "gap": "md",
+                                  "type": "grid"
                                 },
                                 {
                                   "data": [
                                     {
-                                      "value": 12.0,
-                                      "date": "Jan"
+                                      "date": "Jan",
+                                      "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15.0
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
                                       "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22.0
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
                                   ],
                                   "type": "line-chart"
@@ -5481,57 +5455,83 @@
                                   "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
                                   ]
                                 },
                                 {
-                                  "type": "graph-view",
-                                  "height": 200.0,
-                                  "edges": [
-                                    {
-                                      "to": "b",
-                                      "from": "a"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
-                                    }
-                                  ],
                                   "nodes": [
                                     {
-                                      "id": "a",
-                                      "x": 50.0,
                                       "label": "Start",
-                                      "y": 100.0
+                                      "x": 50.0,
+                                      "y": 100.0,
+                                      "id": "a"
                                     },
                                     {
                                       "label": "Process",
+                                      "x": 200.0,
                                       "y": 50.0,
-                                      "id": "b",
-                                      "x": 200.0
+                                      "id": "b"
                                     },
                                     {
-                                      "id": "c",
-                                      "x": 350.0,
                                       "y": 100.0,
-                                      "label": "End"
+                                      "label": "End",
+                                      "id": "c",
+                                      "x": 350.0
                                     }
                                   ],
-                                  "width": 400.0
+                                  "edges": [
+                                    {
+                                      "from": "a",
+                                      "to": "b"
+                                    },
+                                    {
+                                      "to": "c",
+                                      "from": "b"
+                                    }
+                                  ],
+                                  "width": 400.0,
+                                  "height": 200.0,
+                                  "type": "graph-view"
                                 }
                               ],
-                              "type": "stack"
+                              "direction": "vertical",
+                              "type": "stack",
+                              "gap": "lg"
                             }
                           ],
                           "type": "scaled-diagram"
                         }
-                      ]
+                      ],
+                      "type": "dashboard-layout",
+                      "navItems": [
+                        {
+                          "label": "Employees",
+                          "href": "/employees",
+                          "icon": "users"
+                        },
+                        {
+                          "icon": "layout-list",
+                          "href": "/onboarding",
+                          "label": "Onboarding"
+                        },
+                        {
+                          "label": "Time Off",
+                          "icon": "calendar",
+                          "href": "/timeoff"
+                        },
+                        {
+                          "href": "/org-chart",
+                          "icon": "layout-list",
+                          "label": "Org Chart"
+                        }
+                      ],
+                      "appName": "HRPortal"
                     }
                   ]
                 ]
@@ -5546,8 +5546,8 @@
                     "OrgChart",
                     {
                       "emit": {
-                        "failure": "OrgChartLoadFailed",
-                        "success": "OrgChartLoaded"
+                        "success": "OrgChartLoaded",
+                        "failure": "OrgChartLoadFailed"
                       }
                     }
                   ],
@@ -5555,23 +5555,20 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
                       "type": "dashboard-layout",
+                      "appName": "HRPortal",
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
                               "gap": "lg",
-                              "type": "stack",
-                              "direction": "vertical",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Org Chart"
@@ -5579,11 +5576,11 @@
                                   ]
                                 },
                                 {
+                                  "justify": "between",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
-                                      "gap": "md",
+                                      "type": "stack",
                                       "children": [
                                         {
                                           "type": "icon",
@@ -5591,35 +5588,33 @@
                                         },
                                         {
                                           "content": "Org Chart",
-                                          "variant": "h2",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "h2"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md"
                                     },
                                     {
-                                      "type": "button",
                                       "icon": "refresh-cw",
-                                      "label": "Refresh",
                                       "variant": "secondary",
+                                      "label": "Refresh",
+                                      "type": "button",
                                       "action": "REFRESH"
                                     }
                                   ],
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "type": "stack",
-                                  "justify": "between"
+                                  "gap": "md",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
                                       "children": [
                                         {
-                                          "type": "stat-display",
-                                          "label": "TotalEmployees",
                                           "value": [
                                             "object/get",
                                             [
@@ -5627,11 +5622,13 @@
                                               "@entity"
                                             ],
                                             "totalEmployees"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "TotalEmployees"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Departments",
+                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -5642,7 +5639,6 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "OpenPositions",
                                           "value": [
                                             "object/get",
@@ -5651,18 +5647,19 @@
                                               "@entity"
                                             ],
                                             "openPositions"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         },
                                         {
                                           "children": [
                                             {
-                                              "gap": "sm",
                                               "type": "stack",
+                                              "gap": "sm",
                                               "children": [
                                                 {
-                                                  "type": "typography",
+                                                  "content": "AvgTenure",
                                                   "variant": "caption",
-                                                  "content": "AvgTenure"
+                                                  "type": "typography"
                                                 },
                                                 {
                                                   "type": "typography",
@@ -5683,8 +5680,8 @@
                                           "type": "card"
                                         },
                                         {
-                                          "label": "Headcount",
                                           "type": "stat-display",
+                                          "label": "Headcount",
                                           "value": [
                                             "object/get",
                                             [
@@ -5695,43 +5692,44 @@
                                           ]
                                         }
                                       ],
+                                      "type": "simple-grid",
                                       "cols": 3.0
                                     }
                                   ],
-                                  "type": "box",
-                                  "padding": "md"
+                                  "type": "box"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "gap": "md",
                                   "cols": 2.0,
+                                  "type": "grid",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
+                                          "content": "Chart View",
                                           "variant": "caption",
-                                          "content": "Chart View"
+                                          "type": "typography"
                                         }
                                       ]
                                     },
                                     {
                                       "children": [
                                         {
-                                          "variant": "caption",
                                           "content": "Graph View",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "caption"
                                         }
                                       ],
                                       "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md"
                                 },
                                 {
+                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "value": 12.0,
@@ -5750,89 +5748,91 @@
                                       "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",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
                                   ]
                                 },
                                 {
-                                  "width": 400.0,
-                                  "edges": [
-                                    {
-                                      "from": "a",
-                                      "to": "b"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
-                                    }
-                                  ],
-                                  "height": 200.0,
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
+                                      "x": 50.0,
                                       "id": "a",
-                                      "y": 100.0,
                                       "label": "Start",
-                                      "x": 50.0
+                                      "y": 100.0
                                     },
                                     {
                                       "id": "b",
-                                      "y": 50.0,
                                       "x": 200.0,
-                                      "label": "Process"
+                                      "label": "Process",
+                                      "y": 50.0
                                     },
                                     {
-                                      "id": "c",
                                       "y": 100.0,
-                                      "label": "End",
-                                      "x": 350.0
+                                      "x": 350.0,
+                                      "id": "c",
+                                      "label": "End"
                                     }
                                   ],
-                                  "type": "graph-view"
+                                  "edges": [
+                                    {
+                                      "from": "a",
+                                      "to": "b"
+                                    },
+                                    {
+                                      "from": "b",
+                                      "to": "c"
+                                    }
+                                  ],
+                                  "height": 200.0,
+                                  "width": 400.0
                                 }
-                              ]
+                              ],
+                              "direction": "vertical",
+                              "type": "stack"
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
                       ],
                       "navItems": [
                         {
-                          "icon": "users",
+                          "label": "Employees",
                           "href": "/employees",
-                          "label": "Employees"
+                          "icon": "users"
                         },
                         {
-                          "label": "Onboarding",
                           "href": "/onboarding",
+                          "label": "Onboarding",
                           "icon": "layout-list"
                         },
                         {
+                          "label": "Time Off",
                           "href": "/timeoff",
-                          "icon": "calendar",
-                          "label": "Time Off"
+                          "icon": "calendar"
                         },
                         {
-                          "label": "Org Chart",
+                          "icon": "layout-list",
                           "href": "/org-chart",
-                          "icon": "layout-list"
+                          "label": "Org Chart"
                         }
                       ]
                     }
@@ -5858,30 +5858,30 @@
                     "render-ui",
                     "main",
                     {
-                      "appName": "HRPortal",
-                      "type": "dashboard-layout",
                       "navItems": [
                         {
-                          "href": "/employees",
                           "label": "Employees",
-                          "icon": "users"
+                          "icon": "users",
+                          "href": "/employees"
                         },
                         {
-                          "icon": "layout-list",
                           "href": "/onboarding",
+                          "icon": "layout-list",
                           "label": "Onboarding"
                         },
                         {
+                          "icon": "calendar",
                           "href": "/timeoff",
-                          "label": "Time Off",
-                          "icon": "calendar"
+                          "label": "Time Off"
                         },
                         {
                           "label": "Org Chart",
-                          "icon": "layout-list",
-                          "href": "/org-chart"
+                          "href": "/org-chart",
+                          "icon": "layout-list"
                         }
                       ],
+                      "appName": "HRPortal",
+                      "type": "dashboard-layout",
                       "children": [
                         {
                           "type": "scaled-diagram",
@@ -5889,61 +5889,64 @@
                             {
                               "type": "stack",
                               "gap": "lg",
-                              "direction": "vertical",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "href": "/",
-                                      "label": "Home"
+                                      "label": "Home",
+                                      "href": "/"
                                     },
                                     {
                                       "label": "Org Chart"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
                                   "justify": "between",
                                   "type": "stack",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
+                                      "gap": "md",
+                                      "direction": "horizontal",
                                       "children": [
                                         {
                                           "name": "git-branch",
                                           "type": "icon"
                                         },
                                         {
-                                          "content": "Org Chart",
                                           "variant": "h2",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "content": "Org Chart"
                                         }
                                       ],
-                                      "direction": "horizontal",
-                                      "type": "stack",
-                                      "gap": "md"
+                                      "type": "stack"
                                     },
                                     {
-                                      "action": "REFRESH",
-                                      "icon": "refresh-cw",
-                                      "variant": "secondary",
+                                      "type": "button",
                                       "label": "Refresh",
-                                      "type": "button"
+                                      "icon": "refresh-cw",
+                                      "action": "REFRESH",
+                                      "variant": "secondary"
                                     }
                                   ],
-                                  "gap": "md",
-                                  "direction": "horizontal"
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "type": "box",
+                                  "padding": "md",
                                   "children": [
                                     {
-                                      "cols": 3.0,
                                       "type": "simple-grid",
+                                      "cols": 3.0,
                                       "children": [
                                         {
+                                          "type": "stat-display",
+                                          "label": "TotalEmployees",
                                           "value": [
                                             "object/get",
                                             [
@@ -5951,12 +5954,9 @@
                                               "@entity"
                                             ],
                                             "totalEmployees"
-                                          ],
-                                          "type": "stat-display",
-                                          "label": "TotalEmployees"
+                                          ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Departments",
                                           "value": [
                                             "object/get",
@@ -5965,7 +5965,8 @@
                                               "@entity"
                                             ],
                                             "departments"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         },
                                         {
                                           "type": "stat-display",
@@ -5982,15 +5983,18 @@
                                         {
                                           "children": [
                                             {
+                                              "gap": "sm",
+                                              "type": "stack",
                                               "direction": "vertical",
                                               "children": [
                                                 {
-                                                  "type": "typography",
+                                                  "variant": "caption",
                                                   "content": "AvgTenure",
-                                                  "variant": "caption"
+                                                  "type": "typography"
                                                 },
                                                 {
                                                   "type": "typography",
+                                                  "variant": "h3",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -5998,19 +6002,14 @@
                                                       "@entity"
                                                     ],
                                                     "avgTenure"
-                                                  ],
-                                                  "variant": "h3"
+                                                  ]
                                                 }
-                                              ],
-                                              "type": "stack",
-                                              "gap": "sm"
+                                              ]
                                             }
                                           ],
                                           "type": "card"
                                         },
                                         {
-                                          "label": "Headcount",
-                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -6018,43 +6017,43 @@
                                               "@entity"
                                             ],
                                             "headcount"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "Headcount"
                                         }
                                       ]
                                     }
-                                  ],
-                                  "type": "box",
-                                  "padding": "md"
+                                  ]
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "gap": "md",
-                                  "type": "grid",
-                                  "cols": 2.0,
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
+                                          "type": "typography",
                                           "content": "Chart View"
                                         }
                                       ]
                                     },
                                     {
+                                      "type": "card",
                                       "children": [
                                         {
-                                          "content": "Graph View",
                                           "type": "typography",
+                                          "content": "Graph View",
                                           "variant": "caption"
                                         }
-                                      ],
-                                      "type": "card"
+                                      ]
                                     }
-                                  ]
+                                  ],
+                                  "cols": 2.0,
+                                  "gap": "md",
+                                  "type": "grid"
                                 },
                                 {
                                   "data": [
@@ -6075,8 +6074,8 @@
                                       "value": 25.0
                                     },
                                     {
-                                      "value": 22.0,
-                                      "date": "May"
+                                      "date": "May",
+                                      "value": 22.0
                                     },
                                     {
                                       "value": 30.0,
@@ -6086,54 +6085,55 @@
                                   "type": "line-chart"
                                 },
                                 {
+                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "color": "primary",
-                                      "label": "Current"
+                                      "label": "Current",
+                                      "color": "primary"
                                     },
                                     {
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ],
-                                  "type": "chart-legend"
+                                  ]
                                 },
                                 {
+                                  "edges": [
+                                    {
+                                      "from": "a",
+                                      "to": "b"
+                                    },
+                                    {
+                                      "from": "b",
+                                      "to": "c"
+                                    }
+                                  ],
+                                  "width": 400.0,
                                   "height": 200.0,
                                   "nodes": [
                                     {
-                                      "x": 50.0,
-                                      "id": "a",
                                       "y": 100.0,
-                                      "label": "Start"
+                                      "label": "Start",
+                                      "x": 50.0,
+                                      "id": "a"
                                     },
                                     {
-                                      "label": "Process",
-                                      "x": 200.0,
                                       "id": "b",
-                                      "y": 50.0
+                                      "x": 200.0,
+                                      "y": 50.0,
+                                      "label": "Process"
                                     },
                                     {
-                                      "label": "End",
-                                      "x": 350.0,
                                       "y": 100.0,
-                                      "id": "c"
-                                    }
-                                  ],
-                                  "type": "graph-view",
-                                  "edges": [
-                                    {
-                                      "from": "a",
-                                      "to": "b"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
+                                      "id": "c",
+                                      "label": "End",
+                                      "x": 350.0
                                     }
                                   ],
-                                  "width": 400.0
+                                  "type": "graph-view"
                                 }
-                              ]
+                              ],
+                              "direction": "vertical"
                             }
                           ]
                         }
@@ -6163,12 +6163,13 @@
                     {
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
+                              "gap": "lg",
+                              "type": "stack",
+                              "direction": "vertical",
                               "children": [
                                 {
-                                  "type": "breadcrumb",
                                   "items": [
                                     {
                                       "href": "/",
@@ -6177,50 +6178,52 @@
                                     {
                                       "label": "Org Chart"
                                     }
-                                  ]
+                                  ],
+                                  "type": "breadcrumb"
                                 },
                                 {
+                                  "type": "stack",
+                                  "gap": "md",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
-                                      "gap": "md",
+                                      "type": "stack",
                                       "children": [
                                         {
-                                          "type": "icon",
-                                          "name": "git-branch"
+                                          "name": "git-branch",
+                                          "type": "icon"
                                         },
                                         {
+                                          "variant": "h2",
                                           "content": "Org Chart",
-                                          "type": "typography",
-                                          "variant": "h2"
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md"
                                     },
                                     {
                                       "icon": "refresh-cw",
-                                      "variant": "secondary",
                                       "type": "button",
+                                      "variant": "secondary",
                                       "label": "Refresh",
                                       "action": "REFRESH"
                                     }
                                   ],
-                                  "justify": "between",
                                   "direction": "horizontal",
-                                  "gap": "md",
-                                  "type": "stack"
+                                  "justify": "between"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
                                       "cols": 3.0,
                                       "children": [
                                         {
+                                          "type": "stat-display",
+                                          "label": "TotalEmployees",
                                           "value": [
                                             "object/get",
                                             [
@@ -6228,9 +6231,7 @@
                                               "@entity"
                                             ],
                                             "totalEmployees"
-                                          ],
-                                          "type": "stat-display",
-                                          "label": "TotalEmployees"
+                                          ]
                                         },
                                         {
                                           "type": "stat-display",
@@ -6245,7 +6246,6 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "OpenPositions",
                                           "value": [
                                             "object/get",
@@ -6254,14 +6254,15 @@
                                               "@entity"
                                             ],
                                             "openPositions"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         },
                                         {
                                           "type": "card",
                                           "children": [
                                             {
-                                              "direction": "vertical",
                                               "type": "stack",
+                                              "direction": "vertical",
                                               "gap": "sm",
                                               "children": [
                                                 {
@@ -6271,7 +6272,6 @@
                                                 },
                                                 {
                                                   "variant": "h3",
-                                                  "type": "typography",
                                                   "content": [
                                                     "object/get",
                                                     [
@@ -6279,14 +6279,14 @@
                                                       "@entity"
                                                     ],
                                                     "avgTenure"
-                                                  ]
+                                                  ],
+                                                  "type": "typography"
                                                 }
                                               ]
                                             }
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Headcount",
                                           "value": [
                                             "object/get",
@@ -6295,26 +6295,30 @@
                                               "@entity"
                                             ],
                                             "headcount"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         }
                                       ],
                                       "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
+                                  "gap": "md",
+                                  "cols": 2.0,
                                   "type": "grid",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "variant": "caption",
                                           "content": "Chart View",
-                                          "type": "typography"
+                                          "type": "typography",
+                                          "variant": "caption"
                                         }
                                       ]
                                     },
@@ -6322,30 +6326,27 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "type": "typography"
                                         }
                                       ]
                                     }
-                                  ],
-                                  "cols": 2.0,
-                                  "gap": "md"
+                                  ]
                                 },
                                 {
-                                  "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
                                       "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19.0
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
-                                      "value": 15.0,
-                                      "date": "Mar"
+                                      "date": "Mar",
+                                      "value": 15.0
                                     },
                                     {
                                       "date": "Apr",
@@ -6356,10 +6357,11 @@
                                       "date": "May"
                                     },
                                     {
-                                      "value": 30.0,
-                                      "date": "Jun"
+                                      "date": "Jun",
+                                      "value": 30.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "line-chart"
                                 },
                                 {
                                   "type": "chart-legend",
@@ -6369,76 +6371,74 @@
                                       "color": "primary"
                                     },
                                     {
-                                      "color": "muted",
-                                      "label": "Previous"
+                                      "label": "Previous",
+                                      "color": "muted"
                                     }
                                   ]
                                 },
                                 {
-                                  "width": 400.0,
-                                  "height": 200.0,
-                                  "type": "graph-view",
                                   "edges": [
                                     {
                                       "to": "b",
                                       "from": "a"
                                     },
                                     {
-                                      "to": "c",
-                                      "from": "b"
+                                      "from": "b",
+                                      "to": "c"
                                     }
                                   ],
+                                  "height": 200.0,
+                                  "type": "graph-view",
                                   "nodes": [
                                     {
-                                      "label": "Start",
-                                      "y": 100.0,
                                       "id": "a",
+                                      "y": 100.0,
+                                      "label": "Start",
                                       "x": 50.0
                                     },
                                     {
-                                      "id": "b",
                                       "x": 200.0,
                                       "y": 50.0,
+                                      "id": "b",
                                       "label": "Process"
                                     },
                                     {
-                                      "label": "End",
+                                      "y": 100.0,
                                       "id": "c",
-                                      "x": 350.0,
-                                      "y": 100.0
+                                      "label": "End",
+                                      "x": 350.0
                                     }
-                                  ]
+                                  ],
+                                  "width": 400.0
                                 }
-                              ],
-                              "type": "stack",
-                              "direction": "vertical",
-                              "gap": "lg"
+                              ]
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
                       ],
                       "type": "dashboard-layout",
                       "appName": "HRPortal",
                       "navItems": [
                         {
-                          "href": "/employees",
                           "icon": "users",
-                          "label": "Employees"
+                          "label": "Employees",
+                          "href": "/employees"
                         },
                         {
-                          "icon": "layout-list",
+                          "label": "Onboarding",
                           "href": "/onboarding",
-                          "label": "Onboarding"
+                          "icon": "layout-list"
                         },
                         {
-                          "icon": "calendar",
                           "label": "Time Off",
+                          "icon": "calendar",
                           "href": "/timeoff"
                         },
                         {
                           "icon": "layout-list",
-                          "href": "/org-chart",
-                          "label": "Org Chart"
+                          "label": "Org Chart",
+                          "href": "/org-chart"
                         }
                       ]
                     }