Reorganized pagination module