dashboard refactor