dashboard refactoring