Added pagination on app