More tweaks for previews