Modify user's profile page and refactoring