Move survey creation into a better control