add icons and fix bugs