Rearrange menu choices