Refactoring views/users/ files