Rearrange menus to handle variable-width fonts better.