Added icons, clean up