Navbar clean-up & fixed