Merging Gilbert's commits to menus