Added icons and fixed some bugs