Initial work for more flexible menus #6