Updated Pages to fix layout to get ready for production