Fix Pagination logic
Merge branch 'bootstrap-3x'