First cut on highlighting usage
Add navigation bar setting

- [x] Add docs
- [x] Allow users to turn the feature on and off
Merge remote-tracking branch 'upstream/master'