Move grid options into separate variables file.
Merge branch 'refs/heads/grid'