Further widget deconstruction
Merge branch 'master' of https://github.com/nkurinsky/SurveySim