fix field order in form template