- views and pagination flow refactorized