Navbar collapse improvements