Merge 626

I've merged the styling from #624 into #626. Proposing to close both #624 and #626 and approve this one.

![image](https://f.cloud.github.com/assets/592335/1230583/15fe3318-27e9-11e3-91c9-61a655af8e44.png)
![image](https://f.cloud.github.com/assets/592335/1230584/1c94b8b4-27e9-11e3-8232-a260272f1bcc.png)