merged Fanxing's code committed at around 7pm, 8/11. Added radio button, combo box, text entry