Minor tweaks to GetNavBar method