Use generics in ComboBox, restore classification
Remove dataSource dependency for preview canvas