Add possibility to set page links from nav tree and restructure accordingly