Restyling, cleaning up and fixing header.