ContextMenu refact