Overhauled menu system