Update and rename TODO to NavBar