Refactor Dashboard