Fixed several menu item issues for form fields