Menu messages fix