Custom Paging
Commit
Small Hot Fixes