Merge branch 'f-use-proper-selects-and-pickers'