Actually fixed S3 integration and improved views