Minor fixes
Improve GemFile for pagination
Add pagination