added take survey page with routes
fixed merge conflicts