Fix strange UI behavior
Do not toggle checkbox on menu item
Rename menu item