profile page updates
Merge branch 'profile-updates'