moved a few options to sub-form