fixed the combobox look, refs #601
merged the source
uncrustified the source