Appearance changes
resolved conflicts
Merge branch 'ProfilePage'