Fix issues with images not showing properly from S3, clean up views a bit more, make sure all json data is referenced properly