CRM-12337 - Navigation.tpl - More code cleanup