Reorganize XBoard menus