Adding some fieldset love