Improved annotations.

My annotation css implementation was messy and arbitrary, so I re-did
the labeling.