upgrading most of the menus to automated enumeration