Nicer annotations by default

I refactored the annotations code a bit and added defaults that look nicer.
![annotation change](https://f.cloud.github.com/assets/3330878/2040963/faf337f2-89be-11e3-8c0b-e6751712d06d.png)