Improve remediation pages and fix preview page