Improve ContextMenu example