nav tree fixes