redo menus
reorder menu's
Merge pull request #5 from IOAP/rebase

Rebase