Reinstated pagination logic

Also enabled and disabled button classes
Merge branch 'release/14.0.0'