Link and image fixes