Updates to builder validations
Fieldset rendering corrected