Small changes to the Menu class