Tweak menuitems some more