buildmenu: reorganize menu