Navigation fixes around getting the hover peak back.
Merge branch 'origin/master'