#1019 - Iniital pass at fixing pagination
Merge pull request #1442 from cklosowski/EDD-1019

#1019 - Iniital pass at fixing pagination on single pages