Fix flash of selected link style
Merge branch 'flash-of-selected-link-fix' into gh-pages