fix bugs and add icons