Pagination improved, created special helper for pagination