fixed editProfile
combined alex and ariel code