Changed menu order, closes #21
Merge pull request #24 from ironjan/i21

Changed menu order, closes #21