Masonry fix, better masonry build