Added check box for form groups