changed some icons and resolved some bugs