redid s3 setup and added masonry

This reverts commit ae9398f4b68577fe58da8fd7a1df3799b9e0c68b.