bug fixes
refactor
Merge branch 'origin/EditProfileFlow'