please check and merge this
Update view_profile.hbs
Update profile_form.hbs
merge fixes