Pretty big updates to the menu system and rendering