Fixed more page_class