fixed displaying a survey
fixed merge conflict with title on take survey page