Moved menu to Menu class