Updated Paging and views