moved choices over
fixed merge conflicts in create_survey and app.css