Navbar changes, not complete yet
Navbar not completed