Futher work on ComboBox/Popup