Clean up markup and tweak header