Removed fieldset where not used and minor reformats