Progress on cleaning up menus