Make it a single fieldset and rename as custom