Fixes nav issues with #1597 main nav