Dashboard refactor