Fix edge caption placement and highlighting
Merge pull request #534 from MDCox/edgeCaptions

Fix edge caption placement and highlighting