Added pagination - need to account for clicking 'Next'