More context menu finetuning