Added icons and fixed up header