Worked on menu class, various changes