menus more fixes