Modernize, and add pagination module.