#6: Added rest of needed fields on UI form.