updated views and paging MJ-423

All tests passed.