Reworking Navbar Controls