Tweak order of fields

Puts all of the Poedit fields together.