Code fixes for pages to successfully Validate