hide buttons on create_survey page
fix merge conflict in _add_choice.erb