update field list formatting, form display
Merge branch 'JW'