dashboard: refactoring