update preview page better
Merge branch 'lifei'