make fields responsive to longer field names
Merge branch 'JW'