Added icons and minor layout changes.