Refactor Navbar models