frontend for survey completion
merged from master