Add icons and fix some bug