Moved config logic to ContextMenu