Working on revamped menu system