Improve page-view template