Adding icons, cleaned up code