Initial layout for questionnaire fixed
Questionnaire orientation fix merged