Changed to improve animation

Improved the way we animate in images, and also keep a lazy-loaded
image from appearing twice in a row.