refactor to new admin controller
refactor work for admin controller