Refactor more admin controllers