Some fixes in menus