Refactor the dashboards