change highlight menu wip
Merge branch 'master' into highlight-nav-48731963
Merge pull request #30 from applidget/highlight-nav-48731963

[fixes #48731963] Highlight nav 48731963