paginitation upgraded and page wrapper