Complete survey frontend, fixes #2