Dashboard refactored