Updated pages to conform to validation