Clean up for NavBar

- Cleaning up to use the nav bar the correct way