Fix bug with image display and lay groundwork for diffing.