Clean up some menu options and consistency.

Fixes cases where the & is already used, uses title case consistently,
and moves a couple options around to make the menu shorter and more
organized so related options are near each other.