Some menu finetuning