Further polishing.

Added icons, cleaned up header a bit.