Add feature for pagination
Fix with pagination for pages