More ComboButton Changes