Dashboard Refactoring