ContextMenu refactored