AdminMenuControl refactored