Checkboxes + tweaks

* Org/Info Consent are checkboxes now
* Fixed some bugs around the extra addy field