Added fieldset, improved edit form