Tweaked comboboxes and views
Merge remote-tracking branch 'upstream/sass' into sass