Add icons and fixed js chart