Started to implement the ComboBox widget.
Cleaned up some code.