Integrate masonry
Fix layout