Now inline with 2.8.0

2.8.0  but with the home menus merged and consolidated and then a 3rd
home menu added.