rearracnge and relabel some fields
Merge branch 'master' of https://github.com/ploneUN/ploneun.missions