Change highlight boxes to pass validation