Further fine-tuning of command menu