fix code and add some icons