Refactore Admin feature to be User