Improve menu structure.