Nav Tree stuff plus tweaks