Added profile page
Fixing merge