General cleanup. Fix it so it can actually display images.