Further menu structure changes