Changed menu order

Changed the menu order to make things read and flow better.