Tweak label and order of fields