Added pagination to the required views