Added pagination to app