Fix edge caption placement and highlighting