navigation tree refactoring
nav. tree refactoring
demo build fix