Added icons, fixed JSON bug