reorder and new shit
reorder and improve
Merge branch 'master' of https://github.com/Gramps/bro