Pagination bug fixes
Navbar