Added persistent menu system