Updated the forms to have the combo boxes
More combo boxes