changes to reflect new questionnaire and some ux help
Merge branch 'master' of github.com:MozillaFoundation/plan