Better choices and form behaviour

Handles form values and serialization better.
Form field is a drop down that is correctly populated.
Handles choices better.