Changed picker to text field
Changed picker to text field
Merge remote-tracking branch 'origin/master'