fix bugs, add some icon