Refactored Dashboard