ng Admin and Refactoring