styling on questionnaires
fix more merge fail