Added initial/unfinished version of navigation tree.
Simplified more.