Update for Issue #64 for other pages