Navbar updated and working in the previous commit :P