Add vertical spacing
Make choices sortable and fix "Submit" button
Add help text to "Choices" and "Required" headers
Merge pull request #4936 from dimagi/custom-data-choices

Misc UAT feedback for custom-data-choices