change wording for questions and show only if info
Merge branch 'user_profile'