Bug fix with broken links, slow loading gifs