Converted to new pagination package
Updated templates