Grid fixes
Merge pull request #2 from lipis/patch-2

Grid fixes