More scripless refactoring: UserDashboard