complete admin refactoring