Improve menu item states. Fixes #48, fixes #49.