Pagination: 2 little fixes when having 6 pages