Move NavBar to it's own category