Fixed issue #12 Navigation tree