Refactorings for dashboard to function propertly