Fixed up custom pages