Update menu entries after feedback from Ewert.
Reformat the menu as a dict, rather than a list of tuples.