Use pickername and fix autocomplete URL
Fix margin
Switch to LabeledEnum