Fixed #1006
Small refactoring for scene grids
Fixed grid initialization in 2D model