Refactored code so only add fields rows to end of table.
Start all fields in same place.  Prevents hiding clicks with last element added.
Match on field_name, rather than datum.