fixed grid
Merge branch 'master' into norion