Fix nav tree implementation