Adjust vertical spacing of various questions and wrap them in wells

Fixes #33
Working on failing tests
Comment out assistance code