ContextMenu minor changes