Enhance menu entries