Add UI labels (thanks @fbennett) and remap some special fields