Issue #20 fixing navigation tree