Add inline editing for custom fields.
Tidy up.