fix some bugs and add icons