Improve page/page_class