simple changes in Page and Paginator
simple changes in Page and Paginator