Better charting

Fixes #486 
Fixes #487 

![image](https://cloud.githubusercontent.com/assets/2522010/5048087/ed88cd2a-6c12-11e4-9f1f-74aede98f31d.png)