Better lock/unlock messages
Multi-state menu items