Further menu structure changes
Merge branch '4.2-development' of https://github.com/openmips/stbgui into 4.2-development