fixed grid sizings
Merge branch 'master' of https://github.com/erichexter/TestSwarm