A few more menu tweaks