Began fixes to page labels for 1.8 release