Navbar updated for full functionality