Refactored dashboard