Update Profile UI
Fix merge