Fixes nav issues with #1597 main nav
Merge branch 'scott_dev'