Refactor HomePage dashboards