Major Update: Fixed ComboBox, etc