removed unused menu options, fix for pre-checked radio/checkbox fields
merge master