Fixup grid miss-alignments, add spacing, fix spans

Several pages have been affected, nothing that is visually too crazy
(screenshot wouldn't really help).

![screen shot 2014-07-23 at 2 25 08 pm](https://cloud.githubusercontent.com/assets/34726/3678172/f1d3f460-1297-11e4-985c-b05313330851.png)
![screen shot 2014-07-23 at 2 25 34 pm](https://cloud.githubusercontent.com/assets/34726/3678168/f1d17a96-1297-11e4-963a-eec270cfbaf3.png)
![screen shot 2014-07-23 at 2 25 44 pm](https://cloud.githubusercontent.com/assets/34726/3678167/f1d16f56-1297-11e4-9866-18a742fd1e38.png)
![screen shot 2014-07-23 at 2 25 58 pm](https://cloud.githubusercontent.com/assets/34726/3678169/f1d1be52-1297-11e4-9e30-490658e24c5d.png)
![screen shot 2014-07-23 at 2 26 15 pm](https://cloud.githubusercontent.com/assets/34726/3678170/f1d22f54-1297-11e4-8edb-68e1195971ea.png)
![screen shot 2014-07-23 at 2 26 42 pm](https://cloud.githubusercontent.com/assets/34726/3678171/f1d28c88-1297-11e4-8df6-f56e9a83a1a1.png)