Moved menu to menu class (adoy)