add class name property, refine icons to better, add data source categories service
change name