Minor fixes to menus