Fix layout and simplify html

This is mainly cosmetic and it simplifies things a little.
Before

![before](https://cloud.githubusercontent.com/assets/3306154/5394065/05bda966-8139-11e4-8ffa-4eb3e7972a38.png)


After

![after](https://cloud.githubusercontent.com/assets/3306154/5394069/0fc6e972-8139-11e4-8f03-e35664599ae9.png)