Some fixes and menu