Layout for V2

![V2 config](https://cloud.githubusercontent.com/assets/3117611/5173255/06d596de-73dc-11e4-975f-148aacb5f596.png)
![V1 config](https://cloud.githubusercontent.com/assets/3117611/5173272/1bee3a62-73dc-11e4-8b62-368d7e887d4f.png)

I this the format you get from running format?