Some fixed on the navigation item template