Added comments to explain code that isn't obvious
Removed some more unnecessary code
Changed SearchComboBox UI a little