Visual improvements

![demo](https://cloud.githubusercontent.com/assets/627694/5425180/a69c63e2-82ea-11e4-9feb-389099edd521.png)