added some icons, fixed some bugs