Made menu system more object oriented