More minor tweaks to menus