Added icons, improved markup