Grid-update #2

 - Fix grid-modifieres
Merge branch 'topic--grid'