Improved questionnaire mechanisms
Updated application layout