Put menu items in a more logical order.

This commit puts menu items in the order that the data is shown.