Proper serialization of element field and label IDs
Per-tree data source options (incomplete). UI cleanup.