Fixed nav tree weirdness