Adding icon.
Removing icon, minor layout fixes.