Fixed challenges factories and added an upcoming scope for dashboard