Update forms

* Add a cancel button
* Wrap form groups in a fieldset