Issue #240 - Add/Fix some page heading displays