Issue #14: refactored menu item / menu / shortcut key enabling