[385] Use page_heading helper consistently