Refactoring admin area