System/esperanza - Add better mainmenu infrastructure