Fixes to customPages component