Making it pretty.
Merge branch 'highlight' into testing