Cleanup & Navbar Updates