update questionnaire__question UI
Merge branch 'ljc_whx_dev' into dev