modified menu, now valid and without bugs