#152 Modify all custom pages