Navbar needs a tweak #26