Fixed a few bugs with display and overwriting saved images as null