changed buttons and questionnaire