Display fixes

This incorporates #219 and fixes several of the display issues within the questionnaire