Added paging in promotion/affiliate pages
Code cleanup