Several fixes on menu edit