minor admin component refactoring