Indenting, dammit git.
Adjust grids, grid properties
Merge branch 'master' into gh-pages