ENH: Added some tests
Fixed the icon
Renamed some classes and fixed some style issue.