Refactoring Admin Application