Improve menu syntax