re #844 - updating page templates to page wrappers