ContextMenu refactored

Demo: ContextMenuTest