Cleaning up pagination templates as part of overhaul
Pagination overhauled to be less cluttered.