Refactoring and user/profile page