Minor bug fixes in nav bar