Minor improvements in custom pages