Updated styling, added S3 support