Added icons, cleaned up code.