Move pagination to layout methods
Merge branch 'fix-persona-pagination' into dev