Feature/elbow content

This is a big blob of stuff which has been sitting around for a few days:

Merged in some work from @hourd:
 - Fixes to highlighting tree element
 - Text highlighting fixes

Plus some work of my own:
 - Column titles and padding (this actual real feature from this lot!)
 - Fixed group coloring (per #22)