Navbar update and buttons correction