Added better pagination, includes for nav