Adding masonry & other optimizations.