Redesign

![redesign-apr14-before](https://cloud.githubusercontent.com/assets/101022/2749246/121b30dc-c7f5-11e3-9e53-fdf15b192bbf.png)

![redesign-apr14-after](https://cloud.githubusercontent.com/assets/101022/2749245/1215c76e-c7f5-11e3-80d0-111885ded9f4.png)