Fix issue with image box classes, clean up a bit of cruft.