fix validation and menu selected