More dashboard refactoring