Small tweaks to the navigation_tree based on feedback

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>