Begin Modification of XXX List, Changed Menu less clunky