added icons, and final polishing