Changed type label to editable text field with popup picker