admin progress refactor