Fixing some bugs with images and such