Change links and corect headers