Fix database config so test doesn't clobber dev data
UI work
Merge branch 'poll-choice-form'