Working on the user profile page
Merged and fixed conflicts