Square grid

With these changes, the grid will look like this:

![screen shot 2014-11-08 at 19 56 12](https://cloud.githubusercontent.com/assets/133277/4965192/7b8904a0-6781-11e4-979e-3cf77e042100.png)