Some improvement for custom pages