Rearrange the way the menus work out of the box