Use block grid

Fixes #235, #257