Further Tweak to Pagination