removed not needed icons
* Added more comments
* Removed two obsolete functions
* fixed wrong view update