Some fixes in menu.