Update to page view
Merge branch 'steve'