Navbar Active improved