MORTEVIELLE: Some refactoring in Menu