cleaned up code, and added block display of images.

#fno-21