Minor changes to menu structure.