Iconized and fixed some bugs