reorder menu items
Merge branch 'enhancements'