UI Changes
Update profile
resolved conflict
Merge pull request #12 from abhidbydx/cr_work

Cr work