Cleanup to use navTreeRoot instead of navTreeStr