Added legend, added missing icons, improved index