refactoring admin area