Fixing URLs and adding links