more menu class work

expanded the menu class and integrated it where it had been done by hand