refactored dashboard