Adding fieldset wrapper, field description changes