Rearranged menu again.  Feel free to change it if you don't like it