Refactoring Admin menu #384