refacto
fix bug pagination loading
Merge branch 'step-4-2' into step-5