#22: Fixing Navbar issues