Changed fieldset functionality - cristi refactor version