Fixed Combo Boxes, restored clearing function

In need of reformat.