Added icons.
Improved layout.