More preview mode tweaks