CRM-12923 - Tweaks to nav tree