Changed menu order, closes #21

closes #21