better masonry setup

Change-Id: I2765b6d143b07edb6ba4b268b7be5b96777efcb3