Added icons and other minor adjustments.