reordered the menu
Merge branch 'master' into testing