Use block grid
Merge pull request #267 from mozilla/use-block-grid

Use block grid