Added a fieldset around various options in mapping form