Improve menu system.