some clean up

- Removed an unnecessary class
- added an icon
- some code clean up