Revert "Revert "ComboBox and ListBox""

This reverts commit 7afee0e1edd939a8dfe600d937200dd53da60961.