Added icons, cleaned up