Fixed the way Menus handle non-button entries