A couple of tweaks to menu