Adopt clean Masonry

Adopt clean straight-edged Masonry layout.